feat(流程): 完善

laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java

@@ -23,7 +23,10 @@ public enum ProcessType {
     ES_INSPECT_PLAN("企标稽查计划", "16", "inspect_plan", "ProcessEsInspectPlanServiceImpl"),
     ES_INSPECT("企标稽查流程", "17", "inspect_process", "ProcessEsInspectServiceImpl"),
     ES_INSPECT_DELAY_APPLY("稽查延期申请流程", "18", "inspect_delay_apply_process", "ProcessEsInspectDelayApplyServiceImpl"),
-    ES_INSPECT_REPORT("企标稽查整改", "19", "inspect_report", "ProcessEsInspectReportServiceImpl")
+    ES_INSPECT_REPORT("企标稽查整改", "19", "inspect_report", "ProcessEsInspectReportServiceImpl"),
+    PERMISSION_APPLY_PROCESS("权限申请流程", "20", "permission_apply_process", "ProcessEsPermissionApplyServiceImpl"),
+    STANDARD_DECLARE("标准宣贯流程", "21", "standard_declare", "ProcessEsDeclareServiceImpl"),
+    MEETING_MANAGE("会后管理流程", "22", "meeting_manage", "ProcessMeetingManageServiceImpl")
     ;
 
     private final String name;

laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/common/EsDeclareCommon.java

@@ -9,6 +9,20 @@ package com.jero.modules.activiti.process.esdeclare.common;
  **/
 public class EsDeclareCommon {
     private EsDeclareCommon(){
-
     }
+
+    /**
+     * 标准宣贯流程key
+     */
+    public static final String KEY = "standard_declare";
+
+    /**
+     * 标准宣贯流程name
+     */
+    public static final String NAME = "标准宣贯流程";
+
+    /**
+     * 标准宣贯流程节点: 1:发起人发起
+     */
+    public static final String PROCESS_NODE_1 = "initiator_start";
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/controller/ProcessEsDeclareController.java

@@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -178,17 +177,4 @@ public class ProcessEsDeclareController extends JeroController<ProcessEsDeclare,
     public ModelAndView exportXls(HttpServletRequest request, ProcessEsDeclare processEsDeclare) {
         return super.exportXls(request, processEsDeclare, ProcessEsDeclare.class, "标准宣贯业务表");
     }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<ProcessEsDeclare> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, ProcessEsDeclare.class);
-    }
-
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java

@@ -11,11 +11,11 @@ import com.jero.modules.activiti.enums.FinishFlagEnum;
 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.ProcessDraftService;
+import com.jero.modules.activiti.process.esdeclare.common.EsDeclareCommon;
 import com.jero.modules.activiti.process.esdeclare.entity.ProcessEsDeclare;
 import com.jero.modules.activiti.process.esdeclare.service.IEsDeclareFlowService;
 import com.jero.modules.activiti.process.esdeclare.service.IProcessEsDeclareService;
 import com.jero.modules.activiti.process.esdeclare.vo.EsDeclareFlowVO;
-import com.jero.modules.activiti.process.esinspect.common.EsInspectCommon;
 import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.ProcessApprovalRecordService;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
@@ -88,14 +88,14 @@ public class EsDeclareFlowServiceImpl implements IEsDeclareFlowService {
 
         // 根据流程key启动流程 同时 设置审批人员参数
         ProcessInstance processInstance = runtimeService
-                .startProcessInstanceByKey(EsInspectCommon.KEY, map);
+                .startProcessInstanceByKey(EsDeclareCommon.KEY, map);
 
         // 再次设置map
         runtimeService.setVariables(processInstance.getId(), map);
 
         // 更新流程总表信息
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        processAll.setPrcType(Integer.valueOf(ProcessType.ES_INSPECT.getValue()));
+        processAll.setPrcType(Integer.valueOf(ProcessType.STANDARD_DECLARE.getValue()));
         processAll.setCreateUserId(loginUser.getId());
         processAllService.update(processAll,
                 new LambdaUpdateWrapper<ProcessAll>()

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/ProcessEsInspectController.java

@@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -169,17 +168,4 @@ public class ProcessEsInspectController extends JeroController<ProcessEsInspect,
     public ModelAndView exportXls(HttpServletRequest request, ProcessEsInspect processEsInspect) {
         return super.exportXls(request, processEsInspect, ProcessEsInspect.class, "企标稽查流程业务表");
     }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<ProcessEsInspect> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, ProcessEsInspect.class);
-    }
-
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/common/EsInspectPlanCommon.java

@@ -1,7 +1,7 @@
 package com.jero.modules.activiti.process.esinspectplan.common;
 
 /**
- * @ClassName: EsInspectPlanCpmmon
+ * @ClassName: EsInspectPlanCommon
  * @Description:
  * @Author: yjz
  * @Date: 2023-11-09 13:47

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanOpinionController.java

@@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
 
@@ -178,17 +177,4 @@ public class ProcessEsInspectPlanOpinionController extends JeroController<Proces
     public ModelAndView exportXls(HttpServletRequest request, ProcessEsInspectPlanOpinion processEsInspectPlanOpinion) {
         return super.exportXls(request, processEsInspectPlanOpinion, ProcessEsInspectPlanOpinion.class, "企标稽查计划业务_意见表");
     }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<ProcessEsInspectPlanOpinion> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, ProcessEsInspectPlanOpinion.class);
-    }
-
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/common/ProcessEsPermissionApplyCommon.java

@@ -9,6 +9,27 @@ package com.jero.modules.activiti.process.espermissionapply.common;
  **/
 public class ProcessEsPermissionApplyCommon {
     private ProcessEsPermissionApplyCommon(){
-
     }
+    /**
+     * 权限申请流程key
+     */
+    public static final String KEY = "permission_apply_process";
+
+    /**
+     * 权限申请流程name
+     */
+    public static final String NAME = "权限申请流程";
+
+    /**
+     * 权限申请流程节点: 1:发起人申请,2:发起人领导审批,3:标准化审批
+     */
+    public static final String PROCESS_NODE_1 = "initiator_start";
+    /**
+     * 权限申请流程节点: 1:发起人申请,2:发起人领导审批,3:标准化审批
+     */
+    public static final String PROCESS_NODE_2 = "leader_approval";
+    /**
+     * 权限申请流程节点: 1:发起人申请,2:发起人领导审批,3:标准化审批
+     */
+    public static final String PROCESS_NODE_3 = "standard_approval";
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/controller/ProcessEsPermissionApplyController.java

@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -179,17 +178,4 @@ public class ProcessEsPermissionApplyController extends JeroController<ProcessEs
     public ModelAndView exportXls(HttpServletRequest request, ProcessEsPermissionApply processEsPermissionApply) {
         return super.exportXls(request, processEsPermissionApply, ProcessEsPermissionApply.class, "权限申请流程业务表");
     }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<ProcessEsPermissionApply> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, ProcessEsPermissionApply.class);
-    }
-
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java

@@ -12,7 +12,7 @@ import com.jero.modules.activiti.enums.FinishFlagEnum;
 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.ProcessDraftService;
-import com.jero.modules.activiti.process.esinspectplan.common.EsInspectPlanCommon;
+import com.jero.modules.activiti.process.espermissionapply.common.ProcessEsPermissionApplyCommon;
 import com.jero.modules.activiti.process.espermissionapply.service.EsPermissionApplyFlowService;
 import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPermissionApplyService;
 import com.jero.modules.activiti.process.espermissionapply.vo.EsPermissionApplyFlowVO;
@@ -87,14 +87,14 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe
 
         // 根据流程key启动流程 同时 设置审批人员参数
         ProcessInstance processInstance = runtimeService
-                .startProcessInstanceByKey(EsInspectPlanCommon.KEY, map);
+                .startProcessInstanceByKey(ProcessEsPermissionApplyCommon.KEY, map);
 
         // 再次设置map
         runtimeService.setVariables(processInstance.getId(), map);
 
         // 更新流程总表信息
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        processAll.setPrcType(Integer.valueOf(ProcessType.ES_INSPECT_PLAN.getValue()));
+        processAll.setPrcType(Integer.valueOf(ProcessType.PERMISSION_APPLY_PROCESS.getValue()));
         processAll.setCreateUserId(loginUser.getId());
         processAllService.update(processAll,
                 new LambdaUpdateWrapper<ProcessAll>()

laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/common/ProcessMeetingManageCommon.java

@@ -0,0 +1,31 @@
+package com.jero.modules.activiti.process.meetingmanage.common;
+
+/**
+ * @ClassName: processMeetingManageCommon
+ * @Description:
+ * @Author: yjz
+ * @Date: 2023-11-30 17:06
+ * @Version: 1.0
+ **/
+public class ProcessMeetingManageCommon {
+    private ProcessMeetingManageCommon(){
+    }
+    /**
+     * 会后管理流程key
+     */
+    public static final String KEY = "meeting_manage";
+
+    /**
+     * 会后管理流程name
+     */
+    public static final String NAME = "会后管理流程";
+
+    /**
+     * 会后管理流程节点: 1:法规工程师发起,2:参会人员上传材料
+     */
+    public static final String PROCESS_NODE_1 = "engineer_start";
+    /**
+     * 会后管理流程节点: 1:法规工程师发起,2:参会人员上传材料
+     */
+    public static final String PROCESS_NODE_2 = "meeting_upload";
+}

laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/common/processMeetingManageCommon.java

@@ -1,14 +0,0 @@
-package com.jero.modules.activiti.process.meetingmanage.common;
-
-/**
- * @ClassName: processMeetingManageCommon
- * @Description:
- * @Author: yjz
- * @Date: 2023-11-30 17:06
- * @Version: 1.0
- **/
-public class processMeetingManageCommon {
-    private processMeetingManageCommon(){
-
-    }
-}

laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java

@@ -12,7 +12,7 @@ import com.jero.modules.activiti.enums.FinishFlagEnum;
 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.ProcessDraftService;
-import com.jero.modules.activiti.process.esinspectplan.common.EsInspectPlanCommon;
+import com.jero.modules.activiti.process.meetingmanage.common.ProcessMeetingManageCommon;
 import com.jero.modules.activiti.process.meetingmanage.entity.ProcessMeetingManage;
 import com.jero.modules.activiti.process.meetingmanage.entity.ProcessMeetingManagePersonnel;
 import com.jero.modules.activiti.process.meetingmanage.service.IMeetingManageFlowService;
@@ -91,7 +91,7 @@ public class MeetingManageFlowServiceImpl implements IMeetingManageFlowService {
 
         // 根据流程key启动流程 同时 设置审批人员参数
         ProcessInstance processInstance = runtimeService
-                .startProcessInstanceByKey(EsInspectPlanCommon.KEY, map);
+                .startProcessInstanceByKey(ProcessMeetingManageCommon.KEY, map);
 
         // 再次设置map
         runtimeService.setVariables(processInstance.getId(), map);
@@ -102,7 +102,7 @@ public class MeetingManageFlowServiceImpl implements IMeetingManageFlowService {
 
         // 更新流程总表信息
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        processAll.setPrcType(Integer.valueOf(ProcessType.ES_INSPECT_PLAN.getValue()));
+        processAll.setPrcType(Integer.valueOf(ProcessType.MEETING_MANAGE.getValue()));
         processAll.setCreateUserId(loginUser.getId());
         processAllService.update(processAll,
                 new LambdaUpdateWrapper<ProcessAll>()