diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java index 3a7239bf..01a2c3ef 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java @@ -503,7 +503,9 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { link.setUserId(userId); linkList.add(link); }); - processNodeLinkService.saveBatch(linkList, linkList.size()); + if (!linkList.isEmpty()){ + processNodeLinkService.saveBatch(linkList, linkList.size()); + } } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java index 64a4e687..961784ac 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java @@ -8,7 +8,9 @@ public class ProcessProjectAssessCommon { public static final String STANDARDS_ENGINEER = "standardsEngineer"; public static final String MANAGER_LEADER_LIST = "managerLeaderList"; public static final String MODULE_OWNER_LIST = "moduleOwnerList"; + public static final String MODULE_OWNER_LIST_SIZE = "moduleOwnerListSize"; public static final String DESIGN_ENGINEER_LIST = "designEngineerList"; + public static final String DESIGN_ENGINEER_LIST_SIZE = "designEngineerListSize"; public static final String PASS = "pass"; public static final String EXECUTION_ID = "executionId"; //法规工程师发起 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java index 3b979363..19f34822 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java @@ -225,6 +225,7 @@ public class ProcessProjectAssessService extends ServiceImpl variables = new HashMap<>(); variables.put(ProcessProjectAssessCommon.PASS, pass); taskService.complete(taskId, variables); @@ -510,9 +510,6 @@ public class ProcessProjectAssessService extends ServiceImpl variables = new HashMap<>(); variables.put(ProcessProjectAssessCommon.MODULE_OWNER_LIST, moduleOwnerIds); + variables.put(ProcessProjectAssessCommon.MODULE_OWNER_LIST_SIZE, moduleOwnerIds.size()); taskService.complete(taskId, variables); } @@ -585,9 +583,6 @@ public class ProcessProjectAssessService extends ServiceImpl variables = new HashMap<>(); variables.put(ProcessProjectAssessCommon.DESIGN_ENGINEER_LIST, designEngineerIds); + variables.put(ProcessProjectAssessCommon.DESIGN_ENGINEER_LIST_SIZE, designEngineerIds.size()); taskService.complete(taskId, variables); } @@ -620,9 +616,6 @@ public class ProcessProjectAssessService extends ServiceImpl getByStandardsEngineer(String assessmentId) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProcessProjectAssessTerm::getAssessmentId,assessmentId); - wrapper.eq(ProcessProjectAssessTerm::getCanAssignFlag, YesOrNoEnum.NO.getInteger()); + //wrapper.eq(ProcessProjectAssessTerm::getCanAssignFlag, YesOrNoEnum.YES.getInteger()); List list = this.list(wrapper); return list; } diff --git a/laws-modules/src/main/resources/bpmn/项目合规评估流程 - 副本.bpmn b/laws-modules/src/main/resources/bpmn/项目合规评估流程 - 副本.bpmn index ff8379da..fb74ff46 100644 --- a/laws-modules/src/main/resources/bpmn/项目合规评估流程 - 副本.bpmn +++ b/laws-modules/src/main/resources/bpmn/项目合规评估流程 - 副本.bpmn @@ -22,11 +22,11 @@ Flow_1g6zc95 - Flow_168zkyq + Flow_01dzmhe - - - Flow_168zkyq + + + Flow_0ql7uu4 Flow_1o0npc9 ${nrOfInstances == nrOfCompletedInstances} @@ -34,13 +34,6 @@ Flow_0xb4gtd - - - - - Flow_0xb4gtd - Flow_1d18hwv - @@ -53,7 +46,9 @@ ${nrOfInstances == nrOfCompletedInstances} - + + ${moduleOwnerListSize > 0} + @@ -77,6 +72,25 @@ ${!pass} + + Flow_0cx9yoz + Flow_1g6f2ww + Flow_1d18hwv + + + + Flow_1g6f2ww + + + ${moduleOwnerListSize == 0} + + + + + + Flow_0xb4gtd + Flow_0cx9yoz + Flow_1o0npc9 @@ -102,14 +116,29 @@ - - + + Flow_11i64js Flow_0mpm9av ${nrOfInstances == nrOfCompletedInstances} + + Flow_01dzmhe + Flow_0ql7uu4 + Flow_15xpnyd + + + + ${moduleOwnerListSize > 0} + + + Flow_15xpnyd + + + ${moduleOwnerListSize == 0} + Flow_0w3nr57 @@ -129,8 +158,15 @@ + + + + + + + - + @@ -139,8 +175,28 @@ + + + + + + + + + + + + + + + + + + + - + + @@ -161,13 +217,23 @@ + + + + + + - - + + + + + + @@ -193,61 +259,66 @@ - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + - - - + + + - - - + + + - + - - - + + + - + - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - @@ -257,12 +328,12 @@ - - + + - - + + diff --git a/laws-modules/src/main/resources/bpmn/项目合规评估流程.bpmn b/laws-modules/src/main/resources/bpmn/项目合规评估流程.bpmn index 42a9749a..27e6761b 100644 --- a/laws-modules/src/main/resources/bpmn/项目合规评估流程.bpmn +++ b/laws-modules/src/main/resources/bpmn/项目合规评估流程.bpmn @@ -22,11 +22,11 @@ Flow_1g6zc95 - Flow_168zkyq + Flow_01dzmhe - - - Flow_168zkyq + + + Flow_0ql7uu4 Flow_1o0npc9 ${nrOfInstances == nrOfCompletedInstances} @@ -34,13 +34,6 @@ Flow_0xb4gtd - - - - - Flow_0xb4gtd - Flow_1d18hwv - @@ -53,7 +46,9 @@ ${nrOfInstances == nrOfCompletedInstances} - + + ${moduleOwnerList.size > 0} + @@ -77,6 +72,25 @@ ${!pass} + + Flow_0cx9yoz + Flow_1g6f2ww + Flow_1d18hwv + + + + Flow_1g6f2ww + + + ${moduleOwnerList.size == 0} + + + + + + Flow_0xb4gtd + Flow_0cx9yoz + Flow_1o0npc9 @@ -102,14 +116,29 @@ - - + + Flow_11i64js Flow_0mpm9av ${nrOfInstances == nrOfCompletedInstances} + + Flow_01dzmhe + Flow_0ql7uu4 + Flow_15xpnyd + + + + ${moduleOwnerList.size > 0} + + + Flow_15xpnyd + + + ${moduleOwnerList.size == 0} + Flow_0w3nr57 @@ -129,8 +158,15 @@ + + + + + + + - + @@ -139,8 +175,28 @@ + + + + + + + + + + + + + + + + + + + - + + @@ -161,13 +217,23 @@ + + + + + + - - + + + + + + @@ -193,61 +259,66 @@ - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + - - - + + + - - - + + + - + - - - + + + - + - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - @@ -257,12 +328,12 @@ - - + + - - + +