feat: 流程类型字段

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;
 

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"),
+    ES_ENACT_MODIFY("企标制修订流程(草案编写/征求意见/报批)", 10, "com.jero.modules.activiti.process.esInitChange.service.impl.ProcessEsInitChangeServiceImpl"),
-    B("企标立项变更流程",2, "com.jero.modules.activiti.process.esInitChange.service.impl.ProcessEsInitChangeServiceImpl"),
+    ES_CHANGE("企标更改流程",11, "com.jero.modules.activiti.process.esChange.service.impl.ProcessEsChangeServiceImpl"),
-    C("年度制修订-各部门主动上报",3, "com.jero.modules.activiti.process.esAnnualReport.service.impl.ProcessEsAnnualReportChangeServiceImpl"),
+    ES_RECHECK("企标复审流程",12, "com.jero.modules.activiti.process.esRecheck.service.impl.ProcessEsRecheckServiceImpl"),
-    D("年度制修订-标准化发起",4, "com.jero.modules.activiti.process.esAnnualInit.service.impl.ProcessEsAnnualInitServiceImpl"),
+    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;

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);
     }
 }

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<ProcessEsAbolishMap
         String prcName = abolishData.getCommon().getPrcName();
         String prcMes = abolishData.getCommon().getPrcMes();
         Date dueTime = abolishData.getCommon().getDueTime();
-        actFlowCommonService.updateProcessAll(processInstanceId, userId, prcName, prcMes, dueTime);
+        Integer prcType = ProcessTypeEnum.ES_ABOLISH.getValue();
+        actFlowCommonService.updateProcessAll(processInstanceId, userId, prcName, prcMes, prcType, dueTime);
     }
 
     public Map<String, Object> setVariables(ESAbolishFlowUserVO flowUser) {
@@ -138,13 +136,13 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
         LambdaUpdateWrapper<ProcessDraft> 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<ProcessDraft> 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<ProcessEsAbolishMap
             draft.setProjectId(esAbolish.getId());
             draft.setProcessInstanceId(processInstanceId);
             draft.setPrcName(commonVO.getPrcName());
-            draft.setPrcType(ProcessTypeEnum.B.getValue());
+            draft.setPrcType(ProcessTypeEnum.ES_ABOLISH.getValue());
             draftList.add(draft);
             processDraftService.saveBatch(draftList);
         }

laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java

@@ -9,6 +9,7 @@ import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.vo.SysDictItemCore;
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessNode;
+import com.jero.modules.activiti.enums.ProcessTypeEnum;
 import com.jero.modules.activiti.process.common.entity.CommonVO;
 import com.jero.modules.activiti.process.common.enums.ProcessType;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
@@ -111,7 +112,8 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         String prcName = annualInitData.getCommonVO().getPrcName();
         String prcMes = annualInitData.getCommonVO().getPrcMes();
         Date dueTime = annualInitData.getCommonVO().getDueTime();
-        actFlowCommonService.updateProcessAll(processInstanceId, userId, prcName, prcMes, dueTime);
+        Integer prcType = ProcessTypeEnum.ES_ANNUAL_INIT.getValue();
+        actFlowCommonService.updateProcessAll(processInstanceId, userId, prcName, prcMes, prcType, dueTime);
 
     }
 

laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java

@@ -9,6 +9,7 @@ import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.vo.SysDictItemCore;
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessNode;
+import com.jero.modules.activiti.enums.ProcessTypeEnum;
 import com.jero.modules.activiti.process.common.entity.CommonVO;
 import com.jero.modules.activiti.process.common.enums.ProcessType;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
@@ -106,7 +107,8 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
         String prcName = annualReportData.getCommonVO().getPrcName();
         String prcMes = annualReportData.getCommonVO().getPrcMes();
         Date dueTime = annualReportData.getCommonVO().getDueTime();
-        actFlowCommonService.updateProcessAll(processInstanceId, userId, prcName, prcMes, dueTime);
+        Integer prcType = ProcessTypeEnum.ES_ANNUAL_REPORT.getValue();
+        actFlowCommonService.updateProcessAll(processInstanceId, userId, prcName, prcMes, prcType, dueTime);
         // 执行流程发起前的操作
         this.startRunTask(annualReportData);
     }

laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java

@@ -95,7 +95,8 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
         String prcName = archiveData.getCommon().getPrcName();
         String prcMes = archiveData.getCommon().getPrcMes();
         Date dueTime = archiveData.getCommon().getDueTime();
-        actFlowCommonService.updateProcessAll(processInstanceId, userId, prcName, prcMes, dueTime);
+        Integer prcType = ProcessTypeEnum.ES_ARCHIVE.getValue();
+        actFlowCommonService.updateProcessAll(processInstanceId, userId, prcName, prcMes, prcType, dueTime);
     }
 
     public Map<String, Object> setVariables(ESArchiveFlowUserVO flowUser) {
@@ -135,13 +136,13 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
         LambdaUpdateWrapper<ProcessDraft> 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<ProcessDraft> 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<ProcessEsArchiveMap
             draft.setProjectId(esArchive.getId());
             draft.setProcessInstanceId(processInstanceId);
             draft.setPrcName(commonVO.getPrcName());
-            draft.setPrcType(ProcessTypeEnum.B.getValue());
+            draft.setPrcType(ProcessTypeEnum.ES_ARCHIVE.getValue());
             draftList.add(draft);
             processDraftService.saveBatch(draftList);
         }

laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java

@@ -99,7 +99,8 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         String prcName = initChangeData.getCommonVO().getPrcName();
         String prcMes = initChangeData.getCommonVO().getPrcMes();
         Date dueTime = initChangeData.getCommonVO().getDueTime();
-        actFlowCommonService.updateProcessAll(processInstanceId, userId, prcName, prcMes, dueTime);
+        Integer prcType = ProcessTypeEnum.ES_INIT_CHANGE.getValue();
+        actFlowCommonService.updateProcessAll(processInstanceId, userId, prcName, prcMes, prcType, dueTime);
     }
 
     public Map<String, Object> setVariables(InitChangeDataVO initChangeData) {
@@ -225,14 +226,14 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         LambdaUpdateWrapper<ProcessDraft> 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<ProcessDraft> 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<ProcessEsInitCha
                 draft.setProjectId(esInitChangeItem.getId());
                 draft.setProcessInstanceId(processInstanceId);
                 draft.setPrcName(commonVO.getPrcName());
-                draft.setPrcType(ProcessTypeEnum.B.getValue());
+                draft.setPrcType(ProcessTypeEnum.ES_INIT_CHANGE.getValue());
                 draftList.add(draft);
             }
             processDraftService.saveBatch(draftList);