diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/job/DelayApplyJob.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/job/DelayApplyJob.java index 238687f5..99dcdf2f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/job/DelayApplyJob.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/job/DelayApplyJob.java @@ -67,6 +67,10 @@ public class DelayApplyJob implements Job { for (ProcessEsInspectRectify processEsInspectRectify : list) { idList.add(processEsInspectRectify.getId()); EsInspectRectifyFlowVO esInspectReportFlowVO = new EsInspectRectifyFlowVO(); + // 整改计划 + EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan = + enterpriseStandardInspectRectifyPlanService.getById(processEsInspectRectify.getInspectRectifyPlanId()); + // 处理流程信息 ProcessAll oldProcessAll = processAllService.getOne( new LambdaQueryWrapper() @@ -74,11 +78,9 @@ public class DelayApplyJob implements Job { ProcessAll processAll = new ProcessAll(); processAll.setProjectId(String.valueOf(SnowflakeUtils.snowflake())); processAll.setPrcName(oldProcessAll.getPrcName()); + processAll.setCreateUserId(enterpriseStandardInspectRectifyPlan.getResponseUser()); esInspectReportFlowVO.setProcessAll(processAll); - // 整改计划 - EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan = enterpriseStandardInspectRectifyPlanService.getById(processEsInspectRectify.getInspectRectifyPlanId()); - // 处理流程审批信息 ProcessApprovalRecord processApprovalRecord = new ProcessApprovalRecord(); processApprovalRecord.setProjectId(processAll.getProjectId()); 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 d70fd7e8..fc1b0b00 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 @@ -105,7 +105,6 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer processAll.setPrcStatus(ProcessStatusEnum.INCOMPLETE.getValue()); DateTime date = DateUtil.date(); processAll.setPrcNum(DateUtil.format(date, DatePattern.PURE_DATETIME_MS_PATTERN)); - processAll.setCreateUserId(loginUser.getId()); processAllService.update(processAll, new LambdaUpdateWrapper() .eq(ProcessAll::getProcessInstanceId, processInstance.getId())); @@ -273,18 +272,18 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer // 申请延期日期 <= 当前日期 立即生成新流程 if (processEsInspectReportVO.getApplyDelayDate().before(parse) || processEsInspectReportVO.getApplyDelayDate().equals(parse)){ + // 整改计划 + EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan = + enterpriseStandardInspectRectifyPlanService.getById(processEsInspectReportVO.getInspectRectifyPlanId()); // 生成新整改流程 EsInspectRectifyFlowVO newEsInspectReportFlowVO = new EsInspectRectifyFlowVO(); // 处理流程信息 ProcessAll newProcessAll = new ProcessAll(); newProcessAll.setProjectId(String.valueOf(SnowflakeUtils.snowflake())); newProcessAll.setPrcName(processAll.getPrcName()); + newProcessAll.setCreateUserId(enterpriseStandardInspectRectifyPlan.getResponseUser()); newEsInspectReportFlowVO.setProcessAll(newProcessAll); - // 整改计划 - EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan = - enterpriseStandardInspectRectifyPlanService.getById(processEsInspectReportVO.getInspectRectifyPlanId()); - // 处理流程审批信息 ProcessApprovalRecord newProcessApprovalRecord = new ProcessApprovalRecord(); newProcessApprovalRecord.setId(String.valueOf(SnowflakeUtils.snowflake()));