diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/HandleAdviceEnum.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/HandleAdviceEnum.java index 3069849e..30773d91 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/HandleAdviceEnum.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/HandleAdviceEnum.java @@ -6,6 +6,7 @@ import lombok.Getter; * @author: Mzaxd * @Date: 2024/1/28 17:36 */ +@Getter public enum HandleAdviceEnum { /** @@ -24,18 +25,14 @@ public enum HandleAdviceEnum { DISAGREE("不采纳", "3"), ; - private String name; + private final String name; + + private final String value; - private String value; HandleAdviceEnum(String name, String value) { + this.name = name; + this.value = value; } - public String getName() { - return name; - } - - public String getValue() { - return value; - } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java index 5716c6ab..d5b1bd27 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java @@ -560,13 +560,13 @@ public class EsRevisionServiceImpl extends ServiceImpl relatedLeaderList = Arrays.asList(data.getRelatedLeader().split(",")); String chiefEngineer = data.getChiefEngineer(); flowUser = new HashMap<>(); - flowUser.put("otherDraftUserList", proofreaderList); + flowUser.put("otherDraftCheckUserList", proofreaderList); flowUser.put("mainDraftUserLeaderList", approvalUserList); flowUser.put("standardizationUser", approvalUserStandard); flowUser.put("relatedDeptLeaderList", relatedLeaderList); flowUser.put("chiefEngineer", chiefEngineer); taskService.setVariables(taskId, flowUser); - userMap.put("otherDraftUserList", data.getProofreader()); + userMap.put("otherDraftCheckUserList", data.getProofreader()); userMap.put("mainDraftUserLeaderList", data.getApprovalUser()); userMap.put("standardizationUserFinal", approvalUserStandard); userMap.put("relatedDeptLeaderList", data.getRelatedLeader()); diff --git a/laws-modules/src/main/resources/bpmn/企标制修订流程 - 副本.bpmn b/laws-modules/src/main/resources/bpmn/企标制修订流程 - 副本.bpmn deleted file mode 100644 index f441035a..00000000 --- a/laws-modules/src/main/resources/bpmn/企标制修订流程 - 副本.bpmn +++ /dev/null @@ -1,493 +0,0 @@ - - - - - Flow_0ln2zen - - - - Flow_0ln2zen - Flow_1dmfby6 - - - - - Flow_0hkyh3o - Flow_0dlfvoz - Flow_0iw6bki - - - Flow_0iw6bki - Flow_0rw7rph - - - - - - - Flow_1dmfby6 - Flow_0hkyh3o - - ${nrOfInstances== nrOfCompletedInstances} - - - - Flow_0rw7rph - Flow_0dlfvoz - Flow_07x6x68 - - - - ${!pass} - - - ${pass} - - - Flow_07x6x68 - Flow_1gc5b6z - - - Flow_1gc5b6z - Flow_0lxhrf3 - Flow_0s3et9m - - - - Flow_0s3et9m - Flow_1yn3bo0 - Flow_1ts1npj - - - - ${!open} - - - - Flow_02ojuiw - Flow_0lxhrf3 - - - - Flow_0114fp7 - Flow_15vlua6 - - ${nrOfInstances== nrOfCompletedInstances} - - - - Flow_1uaxx7p - Flow_02wh2wo - - ${nrOfInstances== nrOfCompletedInstances} - - - - ${pass} - - - Flow_15vlua6 - Flow_1uaxx7p - Flow_1k4inp1 - - - - ${!pass} - - - Flow_02wh2wo - Flow_0v50urt - Flow_0rkg4il - - - - ${pass} - - - ${!pass} - - - Flow_1cg7p7q - Flow_0jc597n - Flow_03b0vp0 - - - - ${pass} - - - ${!pass} - - - Flow_0jc597n - Flow_093us1v - - ${nrOfInstances== nrOfCompletedInstances} - - - - Flow_0v50urt - Flow_1cg7p7q - - - - Flow_093us1v - Flow_09gf9nd - - - - Flow_09gf9nd - Flow_0r1lb59 - - - Flow_1yn3bo0 - Flow_1k4inp1 - Flow_0rkg4il - Flow_03b0vp0 - Flow_0114fp7 - - - Flow_0r1lb59 - - - - Flow_1ts1npj - Flow_02ojuiw - - ${nrOfInstances== nrOfCompletedInstances} - - - Flow_1stk4cs - - - - Flow_14y4j6o - Flow_1x9nrbh - - ${nrOfInstances== nrOfCompletedInstances} - - - - Flow_1stk4cs - Flow_14y4j6o - - - Flow_1x9nrbh - Flow_0b6hwpr - Flow_1jfhrkk - - - Flow_1jfhrkk - Flow_0n3oqju - - ${nrOfInstances== nrOfCompletedInstances} - - - - Flow_0n3oqju - Flow_0b6hwpr - Flow_0xzqhwi - - - - - ${!pass} - - - - - Flow_0xzqhwi - - - ${pass} - - - - - ${open} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/laws-modules/src/main/resources/bpmn/企标制修订流程.bpmn b/laws-modules/src/main/resources/bpmn/企标制修订流程.bpmn deleted file mode 100644 index e52ad176..00000000 --- a/laws-modules/src/main/resources/bpmn/企标制修订流程.bpmn +++ /dev/null @@ -1,493 +0,0 @@ - - - - - Flow_0ln2zen - - - - Flow_0ln2zen - Flow_1dmfby6 - - - - - Flow_0hkyh3o - Flow_0dlfvoz - Flow_0iw6bki - - - Flow_0iw6bki - Flow_0rw7rph - - - - - - - Flow_1dmfby6 - Flow_0hkyh3o - - ${nrOfInstances== nrOfCompletedInstances} - - - - Flow_0rw7rph - Flow_0dlfvoz - Flow_07x6x68 - - - - ${!pass} - - - ${pass} - - - Flow_07x6x68 - Flow_1gc5b6z - - - Flow_1gc5b6z - Flow_0lxhrf3 - Flow_0s3et9m - - - - Flow_0s3et9m - Flow_1yn3bo0 - Flow_1ts1npj - - - - ${!open} - - - - Flow_02ojuiw - Flow_0lxhrf3 - - - - Flow_0114fp7 - Flow_15vlua6 - - ${nrOfInstances== nrOfCompletedInstances} - - - - Flow_1uaxx7p - Flow_02wh2wo - - ${nrOfInstances== nrOfCompletedInstances} - - - - ${pass} - - - Flow_15vlua6 - Flow_1uaxx7p - Flow_1k4inp1 - - - - ${!pass} - - - Flow_02wh2wo - Flow_0v50urt - Flow_0rkg4il - - - - ${pass} - - - ${!pass} - - - Flow_1cg7p7q - Flow_0jc597n - Flow_03b0vp0 - - - - ${pass} - - - ${!pass} - - - Flow_0jc597n - Flow_093us1v - - ${nrOfInstances== nrOfCompletedInstances} - - - - Flow_0v50urt - Flow_1cg7p7q - - - - Flow_093us1v - Flow_09gf9nd - - - - Flow_09gf9nd - Flow_0r1lb59 - - - Flow_1yn3bo0 - Flow_1k4inp1 - Flow_0rkg4il - Flow_03b0vp0 - Flow_0114fp7 - - - Flow_0r1lb59 - - - - Flow_1ts1npj - Flow_02ojuiw - - ${nrOfInstances== nrOfCompletedInstances} - - - Flow_1stk4cs - - - - Flow_14y4j6o - Flow_1x9nrbh - - ${nrOfInstances== nrOfCompletedInstances} - - - - Flow_1stk4cs - Flow_14y4j6o - - - Flow_1x9nrbh - Flow_0b6hwpr - Flow_1jfhrkk - - - Flow_1jfhrkk - Flow_0n3oqju - - ${nrOfInstances== nrOfCompletedInstances} - - - - Flow_0n3oqju - Flow_0b6hwpr - Flow_0xzqhwi - - - - - ${!pass} - - - - - Flow_0xzqhwi - - - ${pass} - - - - - ${open} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/laws-modules/src/main/resources/bpmn/企标制修订流程.bpmn20.xml b/laws-modules/src/main/resources/bpmn/企标制修订流程.bpmn20.xml new file mode 100644 index 00000000..45e7df26 --- /dev/null +++ b/laws-modules/src/main/resources/bpmn/企标制修订流程.bpmn20.xml @@ -0,0 +1,650 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${nrOfCompletedInstances == nrOfInstances} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${!pass} + + + + + + + + + + ${!pass} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${!pass} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${nrOfInstances== nrOfCompletedInstances} + + + + + + + + + + ${nrOfInstances== nrOfCompletedInstances} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${nrOfInstances== nrOfCompletedInstances} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file