优化计划暂停/作废审核逻辑

snws-gps/snws-gps-boot/src/main/java/com/tofly/gpsboot/service/audit/impl/AuditPlanDisuseServerImpl.java

@@ -1,11 +1,13 @@
 package com.tofly.gpsboot.service.audit.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.tofly.api.UserTaskClient;
 import com.tofly.common.oauth.util.SecurityUtils;
 import com.tofly.gpsboot.common.Constant;
 import com.tofly.gpsboot.common.system.*;
 import com.tofly.pojo.message.Usertask;
+import com.tofly.pojo.plan.Planchild;
 import com.tofly.pojo.plan.dto.ReportAuditDto;
 import com.tofly.gpsboot.exception.BusinessException;
 import com.tofly.gpsboot.service.audit.IAuditPlanDisuseServer;
@@ -76,13 +78,16 @@ public class AuditPlanDisuseServerImpl implements IAuditPlanDisuseServer {
         // 同意 当前任务状态修改为计划已作废
         if(AuditSateEnum.AUDIT_YES.getCode().equals(auditResult)){
             plan.setPlanState(PlanStateEnum.PLAN_STATE_PLAN_DISUSE.getCode());
-            planService.updateById(plan);
+
         }else {
             // 审核不通过,上报状态再设置为 待上报
             info.setIsSubmit(ReportSateEnum.REPORT_UNCOMMITTED.getCode());
+            // 任务状态还原成 已开始未执行
+            plan.setPlanState(PlanStateEnum.PLAN_STATE_EXECUTION_NOT_STARTED.getCode());
 
-        }
 
+        }
+        planService.updateById(plan);
         plancancleService.updateById(info);
         // 存入当前计划审批历史信息
         checkhistoryService.recordHis(AuditTypeEnum.AUDIT_TYPE_PLAN_DISUSE.getCode(), id, auditResult, auditNotes, auditId, date);

snws-gps/snws-gps-boot/src/main/java/com/tofly/gpsboot/service/audit/impl/AuditPlanStopServerImpl.java

@@ -2,11 +2,13 @@ package com.tofly.gpsboot.service.audit.impl;
 
 import com.alibaba.fastjson.JSON;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.tofly.api.UserTaskClient;
 import com.tofly.common.oauth.util.SecurityUtils;
 import com.tofly.gpsboot.common.Constant;
 import com.tofly.gpsboot.common.system.*;
 import com.tofly.pojo.message.Usertask;
+import com.tofly.pojo.plan.Planchild;
 import com.tofly.pojo.plan.dto.ReportAuditDto;
 import com.tofly.gpsboot.exception.BusinessException;
 import com.tofly.gpsboot.service.audit.IAuditPlanStopServer;
@@ -78,6 +80,10 @@ public class AuditPlanStopServerImpl implements IAuditPlanStopServer {
         }else {
             // 审核不通过,上报状态再设置为 待上报
             info.setIsSubmit(ReportSateEnum.REPORT_UNCOMMITTED.getCode());
+            // 任务状态还原成 已开始未执行
+            plan.setPlanState(PlanStateEnum.PLAN_STATE_EXECUTION_NOT_STARTED.getCode());
+            // 子计划状态修改  -1  未执行
+            planService.updateById(plan);
         }
         // 待办事项处理状态置为完成
         // 待办事项处理