فهرست منبع

feat: 编辑计划 1

shc 8 ماه پیش
والد
کامیت
01fe950676
1فایلهای تغییر یافته به همراه15 افزوده شده و 3 حذف شده
  1. 15 3
      hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/SysImplementPlanManager.java

+ 15 - 3
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/SysImplementPlanManager.java

@@ -1366,9 +1366,10 @@ public class SysImplementPlanManager {
 
 
         SysImplementPlan plan = implementPlanService.getById(resource.getPlanId());
         SysImplementPlan plan = implementPlanService.getById(resource.getPlanId());
 
 
-        if (UpmsState.ImplementPlanState.PASSED.equals(plan.getPlanState())) {
-            throw new BizException("当前执行计划已经审核通过了,不能修改");
-        }
+        // if (UpmsState.ImplementPlanState.PASSED.equals(plan.getPlanState())) {
+        //     throw new BizException("当前执行计划已经审核通过了,不能修改");
+        // }
+
 
 
         boolean dump = implementPlanService.dupName(resource.getPlanName(), user.getDeptId(), Collections.singletonList(resource.getPlanId()));
         boolean dump = implementPlanService.dupName(resource.getPlanName(), user.getDeptId(), Collections.singletonList(resource.getPlanId()));
 
 
@@ -1377,6 +1378,17 @@ public class SysImplementPlanManager {
         }
         }
 
 
         SysImplementPlan updated = BeanUtil.copyProperties(resource, SysImplementPlan.class);
         SysImplementPlan updated = BeanUtil.copyProperties(resource, SysImplementPlan.class);
+        // 当前状态
+        UpmsState.ImplementPlanState currentState = plan.getPlanState();
+
+        UpmsState.ImplementPlanState targetState;
+        if (UpmsState.ImplementPlanState.REJECTED.equals(currentState)) {
+            targetState = UpmsState.ImplementPlanState.INIT;
+        } else {
+            targetState = currentState;
+        }
+
+        updated.setPlanState(targetState);
         updated.setUpdateBy(user.getUsername());
         updated.setUpdateBy(user.getUsername());
         updated.setUpdateTime(LocalDateTime.now());
         updated.setUpdateTime(LocalDateTime.now());
         return implementPlanService.updatePlan(updated);
         return implementPlanService.updatePlan(updated);