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)