From 84a02420697b18118dee9988e07005787fa4911f Mon Sep 17 00:00:00 2001 From: zty <1048209592@qq.com> Date: Tue, 6 Aug 2024 11:52:41 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=9E=9A=E4=B8=BE=E7=B1=BB=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=80=9F=E7=AB=A0=EF=BC=88=E6=B3=95=E4=BA=BA=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E3=80=81=E6=B3=95=E4=BA=BA=E7=AB=A0=EF=BC=89=202.?= =?UTF-8?q?=E5=85=AC=E6=96=87=E7=AE=A1=E7=90=86=E5=88=A0=E9=99=A4=E5=AF=B9?= =?UTF-8?q?=E5=A4=96=E4=BA=8B=E5=8A=A1=EF=BC=8C=E6=88=90=E6=9E=9C=E8=AF=84?= =?UTF-8?q?=E4=BB=B7=E5=92=8C=E5=AF=B9=E5=A4=96=E4=BA=8B=E5=8A=A1=E5=90=88?= =?UTF-8?q?=E5=B9=B6=203.=E6=96=B0=E5=A2=9E=E7=9B=96/=E5=80=9F=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6=E4=B8=BA?= =?UTF-8?q?=E6=B3=95=E4=BA=BA=E7=AB=A0(=E5=80=9F)/=E6=B3=95=E4=BA=BA?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E8=B5=B0borrowMethod=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=9B=BE=204.=E6=96=B0=E5=A2=9EborrowMethod=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=9B=BE=205.=E5=85=AC=E5=85=B1=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E5=99=A8=EF=BC=8C=E5=88=86=E7=AE=A1=E9=A2=86=E5=AF=BC:?= =?UTF-8?q?=E5=85=AC=E6=96=87=E7=AE=A1(=E6=94=B6=E6=96=87=E6=AC=BE?= =?UTF-8?q?=E9=87=8C)=20=E5=88=86=E7=AE=A1=E9=A2=86=E5=AF=BC=E4=B8=BA?= =?UTF-8?q?=E5=89=AF=E6=89=80=E9=95=BF=EF=BC=8C=E6=AD=A4=E5=A4=84=E5=B9=B6?= =?UTF-8?q?=E6=9C=AA=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8F=AA=E6=98=AF=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=BA=86=E6=89=80=E9=95=BF=E8=8A=82=E7=82=B9=206.?= =?UTF-8?q?=E5=85=AC=E5=85=B1=E7=9B=91=E6=8E=A7=E5=99=A8=EF=BC=8C=E5=88=86?= =?UTF-8?q?=E7=AE=A1=E9=A2=86=E5=AF=BCpostDocumentHywbf=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=9B=BE=E4=B8=9A=E5=8A=A1=E6=94=B9=E4=B8=BA=E5=89=AF=E6=89=80?= =?UTF-8?q?=E9=95=BF=207.=E5=AF=B9=E5=A4=96=E4=BA=8B=E5=8A=A1=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=9B=BE=E5=88=A0=E9=99=A4=208.=E6=94=B6=E6=96=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86received=EF=BC=8C=E6=89=80=E9=95=BF=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E6=94=B9=E4=B8=BA=E5=89=AF=E6=89=80=E9=95=BF=209.Work?= =?UTF-8?q?FlowsService=E7=9A=84=E8=8E=B7=E5=8F=96=E5=90=8C=E8=A1=8C?= =?UTF-8?q?=E4=BA=BA=E6=96=B9=E6=B3=95=EF=BC=8C=E5=A2=9E=E5=8A=A0case=20bo?= =?UTF-8?q?rrowMethod=E4=B8=8E=E9=BB=98=E8=AE=A4borrow=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AdminDocumentManagementController.java | 6 +- .../action/AdminSealManagementController.java | 44 ++++--- .../kehui/flows/util/MyTaskListener.java | 89 +++++++------- .../kehui/flows/util/WorkFlowsService.java | 2 + .../xqopen/kehui/flows/util/activitiEnum.java | 4 +- .../resources/processes/borrowMethod.bpmn | 105 +++++++++++++++++ .../resources/processes/postDocumentDysw.bpmn | 87 -------------- src/main/resources/processes/received.bpmn | 109 ++++++++---------- 8 files changed, 236 insertions(+), 210 deletions(-) create mode 100644 src/main/resources/processes/borrowMethod.bpmn delete mode 100644 src/main/resources/processes/postDocumentDysw.bpmn diff --git a/src/main/java/com/xqopen/kehui/admin/action/AdminDocumentManagementController.java b/src/main/java/com/xqopen/kehui/admin/action/AdminDocumentManagementController.java index c5cc74c..6cf2adf 100644 --- a/src/main/java/com/xqopen/kehui/admin/action/AdminDocumentManagementController.java +++ b/src/main/java/com/xqopen/kehui/admin/action/AdminDocumentManagementController.java @@ -160,14 +160,12 @@ public class AdminDocumentManagementController implements AdminDocumentManagemen if (managementReq.getDocumentType() == 2) { //发文 /** * 流程修改2022-02-27 - * 增加一级判断，分类判断，若为成果评价类型，则按新流程 + * 增加一级判断，分类判断，若为成果评价类型，则按新流程 （成果评价和对外事务流程合并 （！新）） */ - if(ext.get("contentClass").equals("cgPj")){ + if(ext.get("contentClass").equals("cgPj") || "foreignAffairs".equals(ext.get("contentClass"))){ activitiApi.startWorkflow(userId, management.getId(), activitiEnum.activitiType.postDocumentCgPj, isSigned ? activitiEnum.activitiClass.signedDocument : activitiEnum.activitiClass.postDocumentCgPj); }else if(ext.get("contentClass").equals("djKy")){ activitiApi.startWorkflow(userId, management.getId(), activitiEnum.activitiType.postDocumentDjKy, isSigned ? activitiEnum.activitiClass.signedDocument : activitiEnum.activitiClass.postDocumentDjKy); - }else if(ext.get("contentClass").equals("foreignAffairs")){//对外事务，新增流程图 - activitiApi.startWorkflow(userId, management.getId(), activitiEnum.activitiType.postDocumentDysw, isSigned ? activitiEnum.activitiClass.signedDocument : activitiEnum.activitiClass.postDocumentDysw); } else{ /*鄂技协\鄂技协纪要发文*/ diff --git a/src/main/java/com/xqopen/kehui/admin/action/AdminSealManagementController.java b/src/main/java/com/xqopen/kehui/admin/action/AdminSealManagementController.java index e3f3d39..a82177d 100644 --- a/src/main/java/com/xqopen/kehui/admin/action/AdminSealManagementController.java +++ b/src/main/java/com/xqopen/kehui/admin/action/AdminSealManagementController.java @@ -139,30 +139,48 @@ public class AdminSealManagementController implements AdminSealManagementApi { //根据印章选择不同的流程 activitiEnum.activitiType type = null; if (req.getGoOut()) { - if(crossStatus.equals("1") || crossStatus.equals("2")){ + if(!StringUtils.isEmpty(crossStatus)){ + if (crossStatus.equals("1") || crossStatus.equals("2")) { + JSONObject ext = req.getSealBody(); + List sealType = ext.containsKey("sealType") ? ext + .getObject("sealType", List.class) : null; + if (sealType != null && sealType.size() > 0) { + Integer stampType = sealType.get(0); + switch (stampType) { + case 21: + case 22: + case 23: + case 25: + case 30: + case 31: + case 32: + case 33: + type = activitiEnum.activitiType.borrowXh; + break; + default: + type = activitiEnum.activitiType.borrow; + break; + } + } + } + } + else { JSONObject ext = req.getSealBody(); List sealType = ext.containsKey("sealType") ? ext .getObject("sealType", List.class) : null; if (sealType != null && sealType.size() > 0) { Integer stampType = sealType.get(0); switch (stampType) { - case 21: - case 22: - case 23: - case 25: - case 30: - case 31: - case 32: - case 33: - type = activitiEnum.activitiType.borrowXh; + case 18: //法人章(借) + case 28: //法人身份证 + type= activitiEnum.activitiType.borrowMethod; break; default: type = activitiEnum.activitiType.borrow; break; } } - }else{ - type = activitiEnum.activitiType.borrow; +// type = activitiEnum.activitiType.borrow; } } else { JSONObject ext = req.getSealBody(); @@ -207,7 +225,7 @@ public class AdminSealManagementController implements AdminSealManagementApi { switch (chapterClass) { case 16: case 36: - if(crossStatus.equals("1") || crossStatus.equals("2")){ + if (crossStatus.equals("1") || crossStatus.equals("2")) { type = activitiEnum.activitiType.standardBusinessXhStamp; } break; diff --git a/src/main/java/com/xqopen/kehui/flows/util/MyTaskListener.java b/src/main/java/com/xqopen/kehui/flows/util/MyTaskListener.java index 91006ae..f77e55e 100644 --- a/src/main/java/com/xqopen/kehui/flows/util/MyTaskListener.java +++ b/src/main/java/com/xqopen/kehui/flows/util/MyTaskListener.java @@ -116,7 +116,6 @@ public class MyTaskListener implements TaskListener { String processInstanceId = task.getProcessInstanceId(); List flowsConfiguration = null; SystemUserLogin systemUserLogin = null; - ; ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).active().singleResult(); // String businessKey = processInstance.getBusinessKey(); Wrapper flowsWrapper = new EntityWrapper<>(); @@ -422,7 +421,7 @@ public class MyTaskListener implements TaskListener { return "depDirector"; case postDocumentDysw: //公文管理(发文管理)->对外事务->删除部门主任节点，且分管领导为副所长 return "depDirector"; - case receivedDocument: + case receivedDocument://公文管(收文款里) 分管领导为副所长，此处并未修改，只是删除了所长节点 return "depDirector"; /*case postDocument: if (management != null) { @@ -446,48 +445,50 @@ public class MyTaskListener implements TaskListener { } } break;*/ - case postDocumentHywbf://当文号为之前黄主任终审的时候增加分管领导为张所长终审 - if (management != null) { - JSONObject ext = management.getExt(); - if (ext != null && ext.containsKey("CategoryID")) { - Long CategoryID = ext.getLong("CategoryID"); - SystemTerm term = termService.selectById(CategoryID); - if (term != null) { - switch (term.getTermName()) { - case "鄂技交函": - case "鄂技交业": - case "鄂技交办": -// case "鄂技交发": - case "无文号": - return "depDirector"; - default: - if (management != null) { - JSONObject ext1 = management.getExt(); - if (ext1 != null && ext1.containsKey("draftDeptName")) { - String deptNameSource = ext1.getString("draftDeptName"); - String deptName = deptNameSource.substring(0, deptNameSource.indexOf(">")); - String dept = deptNameSource.substring((deptName.length() + 1), deptNameSource.length()); - if (StringNotNull.isNotEmpty(dept)) {//根据部门判断分管领导终审 - switch (dept) { - case "网络技术部": - case "市场发展部": - case "服务产品部": - return "director"; - case "战略规划部": - case "办公室": - case "人财中心": - case "财务中心": - return "depDirector"; - } - } - } - } - break; - } - } - } - } - break; + case postDocumentHywbf://发文管理，所有分管领导全改为副所长 + return "depDirector"; +//当文号为之前黄主任终审的时候增加分管领导为张所长终审 +// if (management != null) { +// JSONObject ext = management.getExt(); +// if (ext != null && ext.containsKey("CategoryID")) { +// Long CategoryID = ext.getLong("CategoryID"); +// SystemTerm term = termService.selectById(CategoryID); +// if (term != null) { +// switch (term.getTermName()) { +// case "鄂技交函": +// case "鄂技交业": +// case "鄂技交办": +//// case "鄂技交发": +// case "无文号": +// return "depDirector"; +// default: +// if (management != null) { +// JSONObject ext1 = management.getExt(); +// if (ext1 != null && ext1.containsKey("draftDeptName")) { +// String deptNameSource = ext1.getString("draftDeptName"); +// String deptName = deptNameSource.substring(0, deptNameSource.indexOf(">")); +// String dept = deptNameSource.substring((deptName.length() + 1), deptNameSource.length()); +// if (StringNotNull.isNotEmpty(dept)) {//根据部门判断分管领导终审 +// switch (dept) { +// case "网络技术部": +// case "市场发展部": +// case "服务产品部": +// return "director"; +// case "战略规划部": +// case "办公室": +// case "人财中心": +// case "财务中心": +// return "depDirector"; +// } +// } +// } +// } +// break; +// } +// } +// } +// } +// break; case borrowChapter: case stamp: AdminSealManagement sealManagement = sealManagementService.selectById(id); diff --git a/src/main/java/com/xqopen/kehui/flows/util/WorkFlowsService.java b/src/main/java/com/xqopen/kehui/flows/util/WorkFlowsService.java index 0bc73a7..8599681 100644 --- a/src/main/java/com/xqopen/kehui/flows/util/WorkFlowsService.java +++ b/src/main/java/com/xqopen/kehui/flows/util/WorkFlowsService.java @@ -412,6 +412,7 @@ public class WorkFlowsService { public String getPartner(activitiEnum.activitiType aType, Long businessId) { String partner = ""; switch (aType) { + case borrowMethod://借章法人章、法人身份证 case borrow: AdminSealManagement sealManagement = sealManagementService.selectById(businessId); if (sealManagement != null && sealManagement.getPeerPeoples() != null) { @@ -573,6 +574,7 @@ public class WorkFlowsService { break;*/ case postDocument: case postDocumentHywbf: + case postDocumentDysw: case postDocumentXh: case postDocumentGong://发文 case postDocumentDang: case postDocumentDZZJY: diff --git a/src/main/java/com/xqopen/kehui/flows/util/activitiEnum.java b/src/main/java/com/xqopen/kehui/flows/util/activitiEnum.java index 65d0dfe..d5be6a0 100644 --- a/src/main/java/com/xqopen/kehui/flows/util/activitiEnum.java +++ b/src/main/java/com/xqopen/kehui/flows/util/activitiEnum.java @@ -79,7 +79,9 @@ public class activitiEnum { //申请人-》同行人-》部门主任-》办公室主任-》所长 @ApiModelProperty("借章、借证") borrow("外借流程审批"), - + //申请人-同行人-办公室主任-所长 + @ApiModelProperty("借证") + borrowMethod("借章（法人身份证、法人章）"), //申请人-》相关人员-》部门主任-》办公室主任 @ApiModelProperty("任务审批") task("任务流程审批"), diff --git a/src/main/resources/processes/borrowMethod.bpmn b/src/main/resources/processes/borrowMethod.bpmn new file mode 100644 index 0000000..9d8e3b0 --- /dev/null +++ b/src/main/resources/processes/borrowMethod.bpmn @@ -0,0 +1,105 @@ + + + + + + + + ${nrOfCompletedInstances/nrOfInstances >= 1 } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/processes/postDocumentDysw.bpmn b/src/main/resources/processes/postDocumentDysw.bpmn deleted file mode 100644 index 5359e58..0000000 --- a/src/main/resources/processes/postDocumentDysw.bpmn +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - _12 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/processes/received.bpmn b/src/main/resources/processes/received.bpmn index 2707824..ea31702 100644 --- a/src/main/resources/processes/received.bpmn +++ b/src/main/resources/processes/received.bpmn @@ -1,98 +1,85 @@ - - - - - - + + + + + + - + + Flow_0jjkhjd - + + Flow_1y6f1el - - - + + + - + + Flow_0jjkhjd + Flow_1y6f1el - - - - - - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + + - - - - - - - - + - - - + + + - + - - - - - - + + + - - - - - - + + +