From aaaa8e571d08e7860d7fe278b07ee9219f8d2cf5 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Fri, 1 Dec 2023 09:31:52 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=B5=81=E7=A8=8B):=20=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/common/enums/ProcessType.java | 5 ++- .../esdeclare/common/EsDeclareCommon.java | 16 +++++++++- .../ProcessEsDeclareController.java | 14 --------- .../impl/EsDeclareFlowServiceImpl.java | 6 ++-- .../ProcessEsInspectController.java | 14 --------- .../common/EsInspectPlanCommon.java | 2 +- ...ProcessEsInspectPlanOpinionController.java | 14 --------- .../ProcessEsPermissionApplyCommon.java | 23 +++++++++++++- .../ProcessEsPermissionApplyController.java | 14 --------- .../EsPermissionApplyFlowServiceImpl.java | 6 ++-- .../common/ProcessMeetingManageCommon.java | 31 +++++++++++++++++++ .../common/processMeetingManageCommon.java | 14 --------- .../impl/MeetingManageFlowServiceImpl.java | 6 ++-- 13 files changed, 82 insertions(+), 83 deletions(-) create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/common/ProcessMeetingManageCommon.java delete mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/common/processMeetingManageCommon.java diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java index ca56bce6..375e5c7e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java +++ b/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; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/common/EsDeclareCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/common/EsDeclareCommon.java index 5735dd70..0e994d2c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/common/EsDeclareCommon.java +++ b/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"; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/controller/ProcessEsDeclareController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/controller/ProcessEsDeclareController.java index a2231391..446cbb31 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/controller/ProcessEsDeclareController.java +++ b/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 importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, ProcessEsDeclare.class); - } - } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java index 97b69eeb..4d940d97 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java +++ b/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() diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/ProcessEsInspectController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/ProcessEsInspectController.java index 442ce89d..b58f4a26 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/ProcessEsInspectController.java +++ b/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 importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, ProcessEsInspect.class); - } - } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/common/EsInspectPlanCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/common/EsInspectPlanCommon.java index f1ffbe84..1754855c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/common/EsInspectPlanCommon.java +++ b/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 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanOpinionController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanOpinionController.java index c4800ee3..bd422cdd 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/controller/ProcessEsInspectPlanOpinionController.java +++ b/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 importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, ProcessEsInspectPlanOpinion.class); - } - } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/common/ProcessEsPermissionApplyCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/common/ProcessEsPermissionApplyCommon.java index 834449b4..d30fd229 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/common/ProcessEsPermissionApplyCommon.java +++ b/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"; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/controller/ProcessEsPermissionApplyController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/controller/ProcessEsPermissionApplyController.java index c6d080cd..054180ae 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/controller/ProcessEsPermissionApplyController.java +++ b/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 importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, ProcessEsPermissionApply.class); - } - } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java index 6c9b2460..ba93af3e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java +++ b/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() diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/common/ProcessMeetingManageCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/common/ProcessMeetingManageCommon.java new file mode 100644 index 00000000..b3bed621 --- /dev/null +++ b/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"; +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/common/processMeetingManageCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/common/processMeetingManageCommon.java deleted file mode 100644 index 8c8195bf..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/common/processMeetingManageCommon.java +++ /dev/null @@ -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(){ - - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java index 844b5ea9..01f895ed 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java +++ b/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()