diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/common/ProcessStandardComplianceCheckConstants.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/common/ProcessStandardComplianceCheckConstants.java index 7ff9e5e6..a252e2bc 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/common/ProcessStandardComplianceCheckConstants.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/common/ProcessStandardComplianceCheckConstants.java @@ -19,9 +19,9 @@ public class ProcessStandardComplianceCheckConstants { /** 会签人员列表 */ public static final String COUNTERSIGN_USER_LIST = "countersignUserList"; /** 设计工程师科室经理审核 */ - public static final String MANAGER = "manager"; + public static final String MANAGER_LIST = "managerList"; /** 高级经理/技术官 */ - public static final String SENIOR_MANAGER = "seniorManager"; + public static final String SENIOR_MANAGER_LIST = "seniorManagerList"; /** 未分配数量 */ public static final String UNALLOCATED_QUANTITY = "unallocatedQuantity"; /** 主表Id */ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java index 898d4f54..b1dcd914 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java @@ -274,6 +274,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl counterSignUserList = Arrays.asList(standardInfo.getCountersignUser().split(",")); + List managerList = Arrays.asList(standardInfo.getManager().split(",")); + List seniorMangagerList = Arrays.asList(standardInfo.getSeniorManager().split(",")); runtimeService.setVariable(processInstanceId, COUNTERSIGN_USER_LIST, counterSignUserList); - runtimeService.setVariable(processInstanceId, MANAGER, standardInfo.getManager()); - runtimeService.setVariable(processInstanceId, SENIOR_MANAGER, standardInfo.getSeniorManager()); + runtimeService.setVariable(processInstanceId, MANAGER_LIST, managerList); + runtimeService.setVariable(processInstanceId, SENIOR_MANAGER_LIST, seniorMangagerList); // 保存选人信息 userMap.put(COUNTERSIGN_USER_LIST, standardInfo.getCountersignUser()); - userMap.put(MANAGER, standardInfo.getManager()); - userMap.put(SENIOR_MANAGER, standardInfo.getSeniorManager()); + userMap.put(MANAGER_LIST, standardInfo.getManager()); + userMap.put(SENIOR_MANAGER_LIST, standardInfo.getSeniorManager()); processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userMap); // 保存数据 detailInfoList.forEach(detail -> { @@ -339,6 +342,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl scc.setCountersignUser(String.join(",", (List) v)), v -> (List) v); - setStringAttribute(mainInstanceId, MANAGER, scc::setManager, Object::toString); - setStringAttribute(mainInstanceId, SENIOR_MANAGER, scc::setSeniorManager, Object::toString); +// setListAttribute(mainInstanceId, COUNTERSIGN_USER_LIST, v -> scc.setCountersignUser(String.join(",", (List) v)), v -> (List) v); +// setListAttribute(mainInstanceId, MANAGER, scc::setManager, Object::toString); +// setListAttribute(mainInstanceId, SENIOR_MANAGER, scc::setSeniorManager, Object::toString); } private void setListAttribute(String instanceId, String variableName, Consumer> setter, Function> converter) {