From d513650be4b7feeed97baeeda3b49d125d477185 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 19 Jan 2024 14:12:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E7=AB=8B=E9=A1=B9?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E5=A2=9E=E5=8A=A0=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessEsInitChangeServiceImpl.java   | 10 +++++++++-
 .../laws/enterprise/job/ESPlanProjectStatusJob.java    |  3 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
index bae9b410..c6519602 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
@@ -14,6 +14,7 @@ import com.jero.modules.activiti.process.common.enums.ProcessType;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange;
 import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPApplicationCategoryEnum;
+import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectStatus;
 import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectType;
 import com.jero.modules.activiti.process.esInitChange.entity.vo.InitChangeDataVO;
 import com.jero.modules.activiti.process.esInitChange.service.ProcessEsInitChangeService;
@@ -340,7 +341,14 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
             if (esplist == null || esplist.size() != espIdSet.size()) {
                 throw new JeroBootException(ResultCommon.INVALID_ESP);
             }
-
+            // 如果是责任部门变更，需要判断计划是否已经逾期
+            if (ESPProjectType.RESPONSIBLE_DEPT_CHANGE.getValue().equals(initChange.getProjectType())) {
+                for (EnterpriseStandardPlan esp : esplist) {
+                    if (esp.getProjectStatus().equals(ESPProjectStatus.OVERDUE.getValue())) {
+                        throw new JeroBootException(ResultCommon.INVALID_ESP);
+                    }
+                }
+            }
             // 如果是变更流程，则需要撤回制修订流程
             List<String> espIdList = initChangeData.getDataList().stream().map(ProcessEsInitChange::getEspId).collect(Collectors.toList());
             LambdaQueryWrapper<ProcessEsRevision> lambdaQueryWrapper = new LambdaQueryWrapper<>();
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESPlanProjectStatusJob.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESPlanProjectStatusJob.java
index ce3b48a1..c522fa5a 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESPlanProjectStatusJob.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESPlanProjectStatusJob.java
@@ -27,6 +27,7 @@ public class ESPlanProjectStatusJob implements Job {
         // 每天执行定时任务 判断所有进行中的计划是否逾期 逾期则修改项目状态为逾期
         LambdaQueryWrapper<EnterpriseStandardPlan> espWrapper = new LambdaQueryWrapper<>();
         espWrapper.eq(EnterpriseStandardPlan::getProjectStatus, ESPProjectStatus.IN_PROGRESS.getValue());
+        espWrapper.eq(EnterpriseStandardPlan::getProjectStatus, ESPProjectStatus.OVERDUE.getValue());
         espWrapper.eq(EnterpriseStandardPlan::getDelFlag, YesOrNoEnum.NO.getValue());
         List<EnterpriseStandardPlan> list = espService.list(espWrapper);
         Date curDate = new Date();
@@ -35,6 +36,8 @@ public class ESPlanProjectStatusJob implements Job {
                     curDate.after(p.getSolicitationDraftPlanCompleteDate()) ||
                     curDate.after(p.getPlanApprovalDate())) {
                 p.setProjectStatus(ESPProjectStatus.OVERDUE.getValue());
+            } else {
+                p.setProjectStatus(ESPProjectStatus.IN_PROGRESS.getValue());
             }
         });
         espService.updateBatchById(list);