From 130b3c353867a5436ec8aa86946b276d2d89a9ea Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 30 Oct 2023 18:21:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=AC=AC=E4=B8=80=E4=B8=AA=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E9=80=9A=E7=94=A8=E4=BF=A1=E6=81=AF=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/common/service/ActFlowCommonService.java | 8 +++++--- .../service/impl/ProcessEsAbolishServiceImpl.java | 10 ++++++---- .../service/impl/ProcessEsAnnualInitServiceImpl.java | 11 +++++++---- .../impl/ProcessEsAnnualReportServiceImpl.java | 11 +++++++---- .../service/impl/ProcessEsArchiveServiceImpl.java | 11 ++++++----- .../service/impl/ProcessEsInitChangeServiceImpl.java | 10 ++++++---- 6 files changed, 37 insertions(+), 24 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java index 6b3d10fc..25b2a63f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java @@ -213,7 +213,7 @@ public class ActFlowCommonService { return processDefinition.getKey(); } - public void autoCompleteFirstTask(String userId, String processInstanceId, String processDefinitionId) { + public void autoCompleteFirstTask(String userId, String processInstanceId, String processDefinitionId, CommonVO commonVO) { // 自动完成第一个任务 List> taskList = this.myTaskList(userId); if (!CollectionUtils.isEmpty(taskList)) { @@ -224,8 +224,10 @@ public class ActFlowCommonService { log.info("当前用户ID：{}，相关联的流程定义ID：{}", userId, map.get("processDefinitionId").toString()); log.info("匹配到的任务ID：{}", map.get("taskId").toString()); - - this.completeTask(map.get("taskId").toString(), userId); + String taskId = map.get("taskId").toString(); + // 更新审批表为完成，填充数据 + this.updateApprovalInfo(commonVO, taskId, true); + this.completeTask(taskId, userId); break; } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java index fbb53a3a..5455446e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java @@ -72,6 +72,8 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl annualReportList = annualInitData.getDataList(); + // 通用数据 + CommonVO commonVO = annualInitData.getCommonVO(); // 当前用户Id String userId = UserUtils.getUserId(); // 设置流程变量 @@ -101,7 +104,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl annualReport.setProcessInstanceId(processInstanceId)); // 保存到业务流程表 @@ -109,9 +112,9 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl annualReportList = annualReportData.getDataList(); + // 通用数据 + CommonVO commonVO = annualReportData.getCommonVO(); // 当前用户Id String userId = UserUtils.getUserId(); // 设置流程变量 @@ -98,15 +101,15 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl annualReport.setProcessInstanceId(processInstanceId)); // 保存选人信息 processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(variables)); // 根据流程实例id更新流程总表 - String prcName = annualReportData.getCommonVO().getPrcName(); - String prcMes = annualReportData.getCommonVO().getPrcMes(); - Date dueTime = annualReportData.getCommonVO().getDueTime(); + String prcName = commonVO.getPrcName(); + String prcMes = commonVO.getPrcMes(); + Date dueTime = commonVO.getDueTime(); Integer prcType = ProcessTypeEnum.ES_ANNUAL_REPORT.getValue(); actFlowCommonService.updateProcessAll(processInstanceId, userId, prcName, prcMes, prcType, dueTime); // 执行流程发起前的操作 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java index 3b105a12..901b8df7 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java @@ -14,7 +14,6 @@ import com.jero.modules.activiti.process.common.entity.ProcessDraft; import com.jero.modules.activiti.process.common.enums.ProcessType; import com.jero.modules.activiti.process.common.service.ActFlowCommonService; import com.jero.modules.activiti.process.common.service.ProcessDraftService; -import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishFlowUserVO; import com.jero.modules.activiti.process.esArchive.entity.ProcessEsArchive; import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO; import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveFlowUserVO; @@ -73,6 +72,8 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl esInitChangeList = initChangeData.getDataList(); + // 通用数据 + CommonVO commonVO = initChangeData.getCommonVO(); // 设置流程变量 Map variables = this.setVariables(initChangeData); // 启动流程 @@ -88,7 +90,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl e.setProcessInstanceId(processInstanceId)); // 保存到业务流程表 @@ -96,9 +98,9 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl