Browse Source

fix: 创建季度计划补充审核信息

shc 9 months ago
parent
commit
545350d289

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

@@ -46,7 +46,6 @@ import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
 import com.qunzhixinxi.hnqz.common.core.exception.BizException;
 import com.qunzhixinxi.hnqz.common.core.exception.BizException;
 import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
-import com.sun.org.apache.bcel.internal.generic.NEW;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -116,7 +115,19 @@ public class SysImplementPlanManager {
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime now = LocalDateTime.now();
         SysImplementPlan plan = BeanUtil.copyProperties(resource, SysImplementPlan.class);
         SysImplementPlan plan = BeanUtil.copyProperties(resource, SysImplementPlan.class);
         UpmsType.ImplementPlanType planType = resource.getPlanType();
         UpmsType.ImplementPlanType planType = resource.getPlanType();
-        plan.setPlanState(UpmsType.ImplementPlanType.QRT.equals(planType) ? UpmsState.ImplementPlanState.PASSED : UpmsState.ImplementPlanState.INIT);
+
+        UpmsState.ImplementPlanState state;
+        if (UpmsType.ImplementPlanType.QRT.equals(planType)){
+            state = UpmsState.ImplementPlanState.PASSED;
+            plan.setCheckResult(true);
+            plan.setCheckMessage("通过(审批流程,季度计划自动通过,不需要上级审批)");
+            plan.setCheckTime(now);
+            plan.setChecker(username);
+        } else{
+            state = UpmsState.ImplementPlanState.INIT;
+        }
+
+        plan.setPlanState(state);
         plan.setConsignorId(operator.getDeptId());
         plan.setConsignorId(operator.getDeptId());
         plan.setCreateBy(username);
         plan.setCreateBy(username);
         plan.setUpdateBy(username);
         plan.setUpdateBy(username);
@@ -804,7 +815,6 @@ public class SysImplementPlanManager {
                 UpmsType.ImplementPlanType pt = "年度".equals(item.getPlanType()) ? UpmsType.ImplementPlanType.ANN : UpmsType.ImplementPlanType.QRT;
                 UpmsType.ImplementPlanType pt = "年度".equals(item.getPlanType()) ? UpmsType.ImplementPlanType.ANN : UpmsType.ImplementPlanType.QRT;
                 plan.setPlanType(pt);
                 plan.setPlanType(pt);
                 plan.setParentId(0);
                 plan.setParentId(0);
-                plan.setPlanState(UpmsState.ImplementPlanState.INIT);
                 Long score = Long.valueOf(item.getPlanScore());
                 Long score = Long.valueOf(item.getPlanScore());
                 plan.setAvailScore(score);
                 plan.setAvailScore(score);
                 plan.setPlanScore(score);
                 plan.setPlanScore(score);
@@ -817,16 +827,24 @@ public class SysImplementPlanManager {
                 LocalDate issue;
                 LocalDate issue;
                 LocalDate expiry;
                 LocalDate expiry;
 
 
+                UpmsState.ImplementPlanState state;
                 if (UpmsType.ImplementPlanType.ANN.equals(pt)) {
                 if (UpmsType.ImplementPlanType.ANN.equals(pt)) {
                     issue = LocalDate.of(Integer.parseInt(item.getYear()), 1, 1);
                     issue = LocalDate.of(Integer.parseInt(item.getYear()), 1, 1);
                     expiry = issue.plusYears(1).minusDays(1);
                     expiry = issue.plusYears(1).minusDays(1);
+                    state = UpmsState.ImplementPlanState.INIT;
                 } else {
                 } else {
                     int qtr = Integer.parseInt(item.getQuarter());
                     int qtr = Integer.parseInt(item.getQuarter());
                     int month = qtr * 3 - 2;
                     int month = qtr * 3 - 2;
                     issue = LocalDate.of(Integer.parseInt(item.getYear()), month, 1);
                     issue = LocalDate.of(Integer.parseInt(item.getYear()), month, 1);
                     expiry = issue.plusMonths(3).minusDays(1);
                     expiry = issue.plusMonths(3).minusDays(1);
+                    state = UpmsState.ImplementPlanState.PASSED;
+                    plan.setCheckResult(true);
+                    plan.setCheckMessage("通过(审批流程,季度计划自动通过,不需要上级审批)");
+                    plan.setCheckTime(now);
+                    plan.setChecker(username);
                 }
                 }
 
 
+                plan.setPlanState(state);
                 plan.setPlanIssue(issue);
                 plan.setPlanIssue(issue);
                 plan.setPlanExpiry(expiry);
                 plan.setPlanExpiry(expiry);