Browse Source

修改判断合同编号

zhanglinxin 1 year ago
parent
commit
0f115fae06

+ 1 - 0
application/common/service/ApproveInfoService.php

@@ -112,6 +112,7 @@ class ApproveInfoService
             'start_time' => $module == CommonConstant::MODULE_6 ? $params['start_time'] . ' ' . $params['start_am'] : $params['start_time'],
             'end_time' => $module == CommonConstant::MODULE_6 ? $params['end_time'] . ' ' . $params['end_am'] : $params['end_time'],
             'apply_id' => $params['apply_id'],
+            'maintain_user_id' => 0,
         ];
 
         Db::startTrans();

+ 14 - 9
application/common/service/ApproveService.php

@@ -504,20 +504,25 @@ class ApproveService
      **/
     public static function edit($approve, $info, $params)
     {
+        $data = [
+            'reason' => $params['reason'],
+            'type' => $params['type'],
+            'desc' => $params['desc'],
+            'start_time' => $params['module'] == CommonConstant::MODULE_6 ? $params['start_time'].' '.$params['start_am'] : $params['start_time'],
+            'end_time' => $params['module'] == CommonConstant::MODULE_6 ? $params['end_time'].' '.$params['end_am'] : $params['end_time'],
+            'apply_id' => $params['apply_id'],
+        ];
+
         Db::startTrans();
         try {
             // 编辑对应模块
-            $result = ApproveInfoService::create_module($params['module'], $params, $info->id, $info, 'update');
+            $module = $params['module'];
+            $result = ApproveInfoService::create_module($module, $params, $info->id, $info, 'update');
 
-            $data = [
-                'reason' => $params['reason'],
-                'type' => $params['type'],
-                'desc' => $params['desc'],
-                'start_time' => $params['module'] == CommonConstant::MODULE_6 ? $params['start_time'].' '.$params['start_am'] : $params['start_time'],
-                'end_time' => $params['module'] == CommonConstant::MODULE_6 ? $params['end_time'].' '.$params['end_am'] : $params['end_time'],
-                'apply_id' => $params['apply_id'],
-            ];
             // 编辑审批申请
+            if ($module == CommonConstant::MODULE_9) {
+                unset($data['reason']);
+            }
             $info->save($data);
 
             // 保存修改记录