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

Lyh server



查看合并请求 !3336

@@ -112,16 +112,8 @@ class Extension3915ModuleController extends BaseController
         if(empty($filedList)){
         if(empty($filedList)){
             $this->response('请先设置字段，再添加数据',Code::SUCCESS);
             $this->response('请先设置字段，再添加数据',Code::SUCCESS);
         }
         }
-//        $data = $this->param['data'];
-        $data = [
-            ["Customer Code", "PO. No.", "WD PI No.", "Customer Part Number", "WD Part Number", "Order q'ty", "PI Delivery Date", "Shipped Q'ty", "Order Status", "Invoice No.", "Delivery Date"],
-            ["1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1"],
-            ["2", "2", "2", "2", "2", "2", "2", "2", "2", "2", "2"],
-            ["3", "3", "3", "3", "3", "3", "3", "3", "3", "3", "3"],
-            ["4", "4", "4", "4", "4", "4", "4", "4", "4", "4", "4"]
-        ];
+        $data = $this->param['data'];
         $moduleValueModel = new ExtensionModuleValue();
         $moduleValueModel = new ExtensionModuleValue();
-
         $key_filedId = [];
         $key_filedId = [];
         $resultData = [];
         $resultData = [];
         foreach ($data as $k => $v){
         foreach ($data as $k => $v){
@@ -134,7 +126,7 @@ class Extension3915ModuleController extends BaseController
                 }
                 }
                 $resultData[] = [
                 $resultData[] = [
                     'uuid'=>$k + 1,
                     'uuid'=>$k + 1,
-                    'modile_id'=>$this->param['module_id'],
+                    'module_id'=>$this->param['module_id'],
                     'field_id'=>$key_filedId[$k1],
                     'field_id'=>$key_filedId[$k1],
                     'value'=>$v1 ?? '',
                     'value'=>$v1 ?? '',
                 ];
                 ];

@@ -85,7 +85,7 @@ 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;
+        $sum = $this->model->where('project_id',$this->param['project_id'])->sum('question_num') ?? 0;
         if($sum >= 200 || $count >= 200){
         if($sum >= 200 || $count >= 200){
             $this->fail('当前问题数量大于最大数量200个问题，不允许保存');
             $this->fail('当前问题数量大于最大数量200个问题，不允许保存');
         }
         }