From 099a64809c332024a9c786aaf0dce26c7a53f077 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Tue, 23 Jan 2024 15:37:14 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5?= =?UTF-8?q?=E6=95=B4=E6=94=B9):=2079731?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EsInspectRectifyFlowServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java index fc1b0b00..cbf671a8 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java @@ -263,11 +263,13 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer Date parse = dateFormat.parse(dateFormat.format(date)); // 是否申请延期 if (EsInspectRectifyCommon.OPERATION_TYPE_2.equals(processEsInspectReportVO.getOperationType())){ - // 更新整改计划完成日期 + // 更新整改计划完成日期为申请延期日期，整改实际完成时间置空，整改状态为整改中 enterpriseStandardInspectRectifyPlanService.update( new LambdaUpdateWrapper() .eq(EnterpriseStandardInspectRectifyPlan::getId, processEsInspectReportVO.getInspectRectifyPlanId()) - .set(EnterpriseStandardInspectRectifyPlan::getPlanCompleteDate, processEsInspectReportVO.getApplyDelayDate())); + .set(EnterpriseStandardInspectRectifyPlan::getPlanCompleteDate, processEsInspectReportVO.getApplyDelayDate()) + .set(EnterpriseStandardInspectRectifyPlan::getActualCompleteDate, null) + .set(EnterpriseStandardInspectRectifyPlan::getRectifyStatus, EsInspectRectifyCommon.INSPECT_RECTIFY_STATUS_1)); // 申请延期日期 <= 当前日期 立即生成新流程 if (processEsInspectReportVO.getApplyDelayDate().before(parse)