合并分支 'lyh-server' 到 'master'

变更数据



查看合并请求 !3332

@@ -85,10 +85,15 @@ class GeoQuestionLogic extends BaseLogic
     public function saveGeoQuestion(){
     public function saveGeoQuestion(){
         //处理数据
         //处理数据
         $count = count($this->param['question']);
         $count = count($this->param['question']);
+        $sum = $this->model->where('proejct_id',$this->param['project_id'])->sum('question_num') ?? 0;
+        if($sum >= 200 || $count >= 200){
+            $this->fail('当前问题数量大于最大数量200个问题，不允许保存');
+        }
         $question = $this->param['question'];
         $question = $this->param['question'];
         $this->param['url'] = json_encode($this->param['url'] ?? [],true);
         $this->param['url'] = json_encode($this->param['url'] ?? [],true);
         $this->param['keywords'] = json_encode($this->param['keywords'] ?? [],true);
         $this->param['keywords'] = json_encode($this->param['keywords'] ?? [],true);
         if($count <= 20){
         if($count <= 20){
+            $this->param['question_num'] = $count;
             if(isset($this->param['id']) && !empty($this->param['id'])){
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 $id = $this->param['id'];
                 $id = $this->param['id'];
                 $this->model->edit($this->param,['id'=>$id]);
                 $this->model->edit($this->param,['id'=>$id]);
@@ -101,6 +106,7 @@ class GeoQuestionLogic extends BaseLogic
             $chunks = array_chunk($question, 20);
             $chunks = array_chunk($question, 20);
             if(isset($this->param['id']) && !empty($this->param['id'])){
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 foreach ($chunks as $index => $chunk) {
                 foreach ($chunks as $index => $chunk) {
+                    $this->param['question_num'] = count($chunk);
                     $this->param['question'] = json_encode($chunk ?? [],true);
                     $this->param['question'] = json_encode($chunk ?? [],true);
                     if($index == 0){
                     if($index == 0){
                         $id = $this->param['id'];
                         $id = $this->param['id'];

@@ -656,6 +656,9 @@ Route::middleware(['bloginauth'])->group(function () {
         //2205项目单独处理
         //2205项目单独处理
         Route::any('2205/get2205List', [\App\Http\Controllers\Bside\ExtensionModule\Extension2205ModuleController::class, 'get2205List'])->name('extension_module_get2205List');
         Route::any('2205/get2205List', [\App\Http\Controllers\Bside\ExtensionModule\Extension2205ModuleController::class, 'get2205List'])->name('extension_module_get2205List');
         Route::any('2205/save2205Status', [\App\Http\Controllers\Bside\ExtensionModule\Extension2205ModuleController::class, 'save2205Status'])->name('extension_module_save2205Status');
         Route::any('2205/save2205Status', [\App\Http\Controllers\Bside\ExtensionModule\Extension2205ModuleController::class, 'save2205Status'])->name('extension_module_save2205Status');
+        //3915项目处理
+        Route::any('3915/lists', [\App\Http\Controllers\Bside\ExtensionModule\Extension3915ModuleController::class, 'lists'])->name('extension_module_3915_lists');
+        Route::any('3915/importData', [\App\Http\Controllers\Bside\ExtensionModule\Extension3915ModuleController::class, 'importData'])->name('extension_module_3915_importData');
     });
     });
 
 
     //自定义小语种文本信息
     //自定义小语种文本信息