From ae48c884065b54ee660d22eb086c5920512c809f Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 30 Oct 2023 16:54:31 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B5=81=E7=A8=8B=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/activiti/entity/ProcessAll.java | 1 + .../activiti/enums/ProcessTypeEnum.java | 18 +++++++++++------- .../common/service/ActFlowCommonService.java | 6 +++--- .../impl/ProcessEsAbolishServiceImpl.java | 12 +++++------- .../impl/ProcessEsAnnualInitServiceImpl.java | 4 +++- .../impl/ProcessEsAnnualReportServiceImpl.java | 4 +++- .../impl/ProcessEsArchiveServiceImpl.java | 9 +++++---- .../impl/ProcessEsInitChangeServiceImpl.java | 9 +++++---- 8 files changed, 36 insertions(+), 27 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessAll.java b/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessAll.java index c3fb714a..0c973f49 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessAll.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessAll.java @@ -59,6 +59,7 @@ public class ProcessAll { /** * 流程类型 */ + @Dict(dicCode = "prc_type") @ApiModelProperty(value="流程类型") private Integer prcType; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java b/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java index 9c67ca36..d843185f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java @@ -11,14 +11,18 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum ProcessTypeEnum { - /** - * A - */ + + + ES_INIT_CHANGE("企标立项/变更计划",7, "com.jero.modules.activiti.process.esInitChange.service.impl.ProcessEsInitChangeServiceImpl"), + ES_ANNUAL_REPORT("年度制修订计划审批流程(各部门主动上报)",8, "com.jero.modules.activiti.process.esAbolish.service.impl.ProcessEsAbolishServiceImpl"), + ES_ANNUAL_INIT("年度制修订计划审批流程(标准化发起)",9, "com.jero.modules.activiti.process.esAnnualReport.service.impl.ProcessEsAnnualReportServiceImpl"), //TODO 企标制修订的implClass不对 - A("企标制修订流程", 1, "com.jero.modules.activiti.process.esInitChange.service.impl.ProcessEsInitChangeServiceImpl"), - B("企标立项变更流程",2, "com.jero.modules.activiti.process.esInitChange.service.impl.ProcessEsInitChangeServiceImpl"), - C("年度制修订-各部门主动上报",3, "com.jero.modules.activiti.process.esAnnualReport.service.impl.ProcessEsAnnualReportChangeServiceImpl"), - D("年度制修订-标准化发起",4, "com.jero.modules.activiti.process.esAnnualInit.service.impl.ProcessEsAnnualInitServiceImpl"), + ES_ENACT_MODIFY("企标制修订流程(草案编写/征求意见/报批)", 10, "com.jero.modules.activiti.process.esInitChange.service.impl.ProcessEsInitChangeServiceImpl"), + ES_CHANGE("企标更改流程",11, "com.jero.modules.activiti.process.esChange.service.impl.ProcessEsChangeServiceImpl"), + ES_RECHECK("企标复审流程",12, "com.jero.modules.activiti.process.esRecheck.service.impl.ProcessEsRecheckServiceImpl"), + ES_ABOLISH("企标废止流程",13, "com.jero.modules.activiti.process.esAbolish.service.impl.ProcessEsAbolishServiceImpl"), + ES_ARCHIVE("企标封存流程",14, "com.jero.modules.activiti.process.esArchive.service.impl.ProcessEsArchiveServiceImpl"), + ES_ENABLE("已封存企标启用流程",15, "com.jero.modules.activiti.process.esEnable.service.impl.ProcessEsEnableServiceImpl"), ; private String name; 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 0b99db8b..6b3d10fc 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,12 +1,10 @@ package com.jero.modules.activiti.process.common.service; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.modules.activiti.entity.ProcessAll; import com.jero.modules.activiti.entity.ProcessApprovalRecord; -import com.jero.modules.activiti.entity.ProcessNode; import com.jero.modules.activiti.enums.CommitFlagEnum; import com.jero.modules.activiti.enums.FinishFlagEnum; import com.jero.modules.activiti.mapper.ProcessNodeMapper; @@ -261,14 +259,16 @@ public class ActFlowCommonService { * @param userId * @param prcName * @param prcMes + * @param prcType * @param dueTime */ - public void updateProcessAll(String processInstanceId, String userId, String prcName, String prcMes, Date dueTime) { + public void updateProcessAll(String processInstanceId, String userId, String prcName, String prcMes, Integer prcType, Date dueTime) { ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId); process.setCreateUserId(userId); process.setPrcName(prcName); process.setPrcMes(prcMes); process.setDueTime(dueTime); + process.setPrcType(prcType); processAllService.updateById(process); } } \ No newline at end of file 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 33e53acc..d7de9199 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 @@ -19,12 +19,9 @@ import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishDataVO; import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishFlowUserVO; import com.jero.modules.activiti.process.esAbolish.service.ProcessEsAbolishService; import com.jero.modules.activiti.process.esAbolish.mapper.ProcessEsAbolishMapper; -import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange; -import com.jero.modules.activiti.process.esInitChange.entity.vo.InitChangeFlowUserVO; import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessNodeLinkService; import com.jero.modules.activiti.service.ProcessNodeService; -import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil; import com.jero.modules.sys.utils.UserUtils; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.RuntimeService; @@ -98,7 +95,8 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl setVariables(ESAbolishFlowUserVO flowUser) { @@ -138,13 +136,13 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl draftWrapper = new LambdaUpdateWrapper<>(); if (StrUtil.isBlank(taskId)) { // 第一个节点点击保存没有taskId - draftWrapper.eq(ProcessDraft::getPrcType, ProcessTypeEnum.B.getValue()); + draftWrapper.eq(ProcessDraft::getPrcType, ProcessTypeEnum.ES_ABOLISH.getValue()); draftWrapper.eq(ProcessDraft::getCreateBy, UserUtils.getUserId()); processDraftService.remove(draftWrapper); List draftList = new ArrayList<>(); ProcessDraft draft = new ProcessDraft(); draft.setProjectId(esAbolish.getId()); - draft.setPrcType(ProcessTypeEnum.B.getValue()); + draft.setPrcType(ProcessTypeEnum.ES_ABOLISH.getValue()); draftList.add(draft); processDraftService.saveBatch(draftList); } else { @@ -156,7 +154,7 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl setVariables(ESArchiveFlowUserVO flowUser) { @@ -135,13 +136,13 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl draftWrapper = new LambdaUpdateWrapper<>(); if (StrUtil.isBlank(taskId)) { // 第一个节点点击保存没有taskId - draftWrapper.eq(ProcessDraft::getPrcType, ProcessTypeEnum.B.getValue()); + draftWrapper.eq(ProcessDraft::getPrcType, ProcessTypeEnum.ES_ARCHIVE.getValue()); draftWrapper.eq(ProcessDraft::getCreateBy, UserUtils.getUserId()); processDraftService.remove(draftWrapper); List draftList = new ArrayList<>(); ProcessDraft draft = new ProcessDraft(); draft.setProjectId(esArchive.getId()); - draft.setPrcType(ProcessTypeEnum.B.getValue()); + draft.setPrcType(ProcessTypeEnum.ES_ARCHIVE.getValue()); draftList.add(draft); processDraftService.saveBatch(draftList); } else { @@ -153,7 +154,7 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl setVariables(InitChangeDataVO initChangeData) { @@ -225,14 +226,14 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl draftWrapper = new LambdaUpdateWrapper<>(); if (StrUtil.isBlank(taskId)) { // 第一个节点点击保存没有taskId - draftWrapper.eq(ProcessDraft::getPrcType, ProcessTypeEnum.B.getValue()); + draftWrapper.eq(ProcessDraft::getPrcType, ProcessTypeEnum.ES_INIT_CHANGE.getValue()); draftWrapper.eq(ProcessDraft::getCreateBy, UserUtils.getUserId()); processDraftService.remove(draftWrapper); List draftList = new ArrayList<>(); for (ProcessEsInitChange esInitChangeItem : esInitChange) { ProcessDraft draft = new ProcessDraft(); draft.setProjectId(esInitChangeItem.getId()); - draft.setPrcType(ProcessTypeEnum.B.getValue()); + draft.setPrcType(ProcessTypeEnum.ES_INIT_CHANGE.getValue()); draftList.add(draft); } processDraftService.saveBatch(draftList); @@ -246,7 +247,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl