From 965e617579f6e35fac18dedb465413be90e8f59a Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 12 Jan 2024 18:10:16 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E4=B9=9D=E4=B8=AA?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=BC=BA=E5=88=B6=E6=92=A4=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/ActFlowCommonService.java | 37 +++++++++++++++++++ .../impl/ProcessEsAbolishServiceImpl.java | 3 ++ .../impl/ProcessEsAnnualInitServiceImpl.java | 10 +++++ .../ProcessEsAnnualReportServiceImpl.java | 3 ++ .../impl/ProcessEsArchiveServiceImpl.java | 6 +++ .../impl/ProcessEsChangeServiceImpl.java | 3 ++ .../impl/ProcessEsEnableServiceImpl.java | 3 ++ .../impl/ProcessEsInitChangeServiceImpl.java | 3 ++ .../impl/ProcessEsRecheckServiceImpl.java | 6 +++ .../service/impl/EsRevisionServiceImpl.java | 10 +++++ 10 files changed, 84 insertions(+) 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 a489038e..ce759de9 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 @@ -1,6 +1,7 @@ package com.jero.modules.activiti.process.common.service; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.jero.common.exception.JeroBootException; @@ -10,9 +11,15 @@ import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.enums.CommitFlagEnum; import com.jero.modules.activiti.enums.FinishFlagEnum; import com.jero.modules.activiti.enums.ProcessTypeEnum; +import com.jero.modules.activiti.process.common.common.DraftCommon; import com.jero.modules.activiti.process.common.entity.CommonVO; import com.jero.modules.activiti.process.common.entity.ProcessDraft; import com.jero.modules.activiti.process.common.entity.StandTypeVO; +import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO; +import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO; +import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO; +import com.jero.modules.activiti.process.fb.service.IProcessHandleService; +import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessApprovalRecordService; import com.jero.modules.laws.common.util.CurrentUserUtil; @@ -66,6 +73,9 @@ public class ActFlowCommonService { @Resource private ProcessDraftService processDraftService; + @Resource + private IProcessHandleService processHandleService; + /** * 启动流程实例 */ @@ -435,6 +445,7 @@ public class ActFlowCommonService { LambdaQueryWrapper draftWrapper = new LambdaQueryWrapper<>(); draftWrapper.eq(ProcessDraft::getUserId, userId); draftWrapper.eq(ProcessDraft::getTaskId, taskId); + draftWrapper.ne(ProcessDraft::getSaveSource, DraftCommon.INITIAL_SOURCE); draftWrapper.eq(StrUtil.isNotBlank(processInstanceId), ProcessDraft::getProcessInstanceId, processInstanceId); processDraftService.remove(draftWrapper); } @@ -504,4 +515,30 @@ public class ActFlowCommonService { ProcessApprovalRecord approvalRecord = processApprovalRecordService.getToDoByTaskId(taskId); return approvalRecord.getOriginUserId(); } + + /** + * 强制撤回流程-保存草稿 + * @param common + * @param processTypeEnum + * @param data + */ + public void saveFirstNodeDraft(CommonVO common, ProcessTypeEnum processTypeEnum, Object data) { + // 将archiveData转为Json + String dataJson = JSON.toJSONString(data); + ProcessInfoVO processInfoVO = new ProcessInfoVO<>(); + processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE); + BasicTaskInfoDTO basicTaskInfoDTO = new BasicTaskInfoDTO(); + basicTaskInfoDTO.setHandleFile(common.getCommitFile()); + basicTaskInfoDTO.setHandleText(common.getCommitText()); + BasicProcessInfoDTO basicProcessInfoDTO = new BasicProcessInfoDTO(); + basicProcessInfoDTO.setProcessName(common.getPrcName()); + basicProcessInfoDTO.setProcessDescription(common.getPrcMes()); + basicProcessInfoDTO.setProcessType(processTypeEnum.getValue()); + basicProcessInfoDTO.setProcessDueDate(common.getDueTime()); + basicProcessInfoDTO.setProcessInstanceId(common.getProcessInstanceId()); + processInfoVO.setInfoJsonStr(dataJson); + processInfoVO.setBasicTaskInfoDTO(basicTaskInfoDTO); + processInfoVO.setBasicProcessInfoDTO(basicProcessInfoDTO); + processHandleService.saveToDraft(processInfoVO); + } } 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 df23e299..3cfb4d0a 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 @@ -99,6 +99,9 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl setVariables(Map flowUser) { diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java index 88d39394..060ecb71 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java @@ -132,6 +132,9 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl setVariables(AnnualReportDataVO annualReportData) { 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 19b57111..0f725156 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 @@ -1,12 +1,14 @@ package com.jero.modules.activiti.process.esArchive.service.impl; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.vo.ResultCommon; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; import com.jero.modules.activiti.enums.ProcessTypeEnum; +import com.jero.modules.activiti.process.common.common.DraftCommon; import com.jero.modules.activiti.process.common.entity.CommonVO; import com.jero.modules.activiti.process.common.entity.CounterSignNodeNameConstants; import com.jero.modules.activiti.process.common.entity.ProcessDraft; @@ -19,6 +21,7 @@ import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO; import com.jero.modules.activiti.process.esArchive.service.ProcessEsArchiveService; import com.jero.modules.activiti.process.esArchive.mapper.ProcessEsArchiveMapper; import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO; +import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO; import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import com.jero.modules.activiti.service.ProcessNodeLinkService; @@ -99,6 +102,9 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl setVariables(Map flowUser) { diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java index 7d83bfb0..7661765a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java @@ -119,6 +119,9 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl setVariables(Map flowUser) { diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java index ce78d8cf..aa6de2a0 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java @@ -99,6 +99,9 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl setVariables(Map flowUser) { 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 b7f3b39e..9912b5cb 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 @@ -115,6 +115,9 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl setVariables(InitChangeDataVO initChangeData) { diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java index 61241f4a..a0e03f28 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java @@ -100,6 +100,9 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl setVariables(Map flowUser) { diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java index d445ac36..af0bd045 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java @@ -119,6 +119,9 @@ public class EsRevisionServiceImpl extends ServiceImpl setVariables(ESRevisionDataVO revisionData) { @@ -210,6 +213,13 @@ public class EsRevisionServiceImpl extends ServiceImpl