gx

@@ -27,6 +27,13 @@ use Illuminate\Support\Facades\DB;
  */
 class Extension2205ModuleController extends BaseController
 {
+    /**
+     * @remark :
+     * @name   :get2205List
+     * @author :lyh
+     * @method :post
+     * @time   :2024/9/4 16:28
+     */
     public function get2205List(){
         $this->request->validate([
             'uuid'=>'required',
@@ -74,15 +81,6 @@ class Extension2205ModuleController extends BaseController
             $data[$v] = $number;
             $number++;
         }
-        $valuesModel = new ExtensionModuleValue();
-        if(isset($this->param['uuid'])){
-            $valuesInfo = $valuesModel->read(['uuid'=>$this->param['uuid'],'field_id'=>12]);//获取以前的数据
-            if($valuesInfo !== false && !empty($valuesInfo['value'])){
-                if($data[$valuesInfo['value']] > $data[$this->param['status']]){
-                    $this->fail('流程控制只能往下选择');
-                }
-            }
-        }
         $log2205Model = new Extension2205ModuleValueLog();
         $log2205Info = $log2205Model->read(['module_id'=>$this->param['module_id'],'uuid'=>$this->param['uuid'],'status'=>$this->param['status']]);
         if($log2205Info == false){
@@ -91,12 +89,14 @@ class Extension2205ModuleController extends BaseController
                 'uuid'=>$this->param['uuid'],
                 'status'=>$this->param['status'],
                 'date'=>$this->param['date'],
+                'remark'=>$this->param['remark'] ?? ''
             ];
            $id = $log2205Model->addReturnId($data);
         }else{
             $id = $log2205Info['id'];
             $data = [
                 'date'=>$this->param['date'],
+                'remark'=>$this->param['remark'] ?? ''
             ];
             $log2205Model->edit($data,['id'=>$log2205Info['id']]);
         }

@@ -192,12 +192,29 @@ class ExtensionModuleController extends BaseController
                 ];
                 $moduleValueModel->addReturnId($data);
             }else{
+                if($this->user['project_id'] == 2205 && $this->param['module_id'] == 1){
+                    if($v['field_id'] == 12 && (!empty($v['value']) && !empty($info['value']))){//下拉框数据
+                        $filedModel = new ExtensionModuleField();
+                        $fileInfo = $filedModel->read(['id'=>12]);//获取当前下拉框的数据
+                        $statusData = json_decode($fileInfo['data'],true);
+                        $status_data = [];
+                        $number = 1;
+                        foreach ($statusData as $v){
+                            $status_data[$v] = $number;
+                            $number++;
+                        }
+                        if($status_data[$info['value']] > $status_data($v['value'])){
+                            $this->fail('流程控制只能往下选择');
+                        }
+                    }
+                }
                 $moduleValueModel->edit(['value'=>$v['value'] ?? ''],['id'=>$info['id']]);
             }
         }
         $this->response('success',Code::SUCCESS,['uuid'=>$this->param['uuid']]);
     }
 
+
     /**
      * @remark :新增數據
      * @name   :addModuleValue