ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 80950 【阻塞】企标立项/变更计划--发起人主管级领导审批节点没有待办

Browse Source
This commit is contained in:
mzaxd
2024-01-17 16:43:48 +08:00
parent 292d7a7a71
commit 98aa93590a
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/EsInitChangeConstant.java
+2 -2
View File
@@ -9,8 +9,8 @@ public class EsInitChangeConstant {
public static final String MAIN_DRAFT_USER_INIT = "主起草人发起"; public static final String MAIN_DRAFT_USER_INIT = "主起草人发起";
public static final String CONTACT_USER_CHECK = "部所联络人校对"; public static final String CONTACT_USER_CHECK = "部所联络人校对";
public static final String EXPERT_CHECK = "专家审批"; public static final String EXPERT_CHECK = "专家审批";
public static final String MAIN_DRAFT_USER_LEADER = "主起草人主管级领导审批"; public static final String MAIN_DRAFT_USER_LEADER = "主管级领导审批";
public static final String MAIN_DRAFT_USER_LEADER_LEADER = "主起草人主管级上一级领导审批"; public static final String MAIN_DRAFT_USER_LEADER_LEADER = "主管级上一级领导审批";
public static final String STANDARDIZATION_CHECK = "标准化审批"; public static final String STANDARDIZATION_CHECK = "标准化审批";
public static final String NEW_MAIN_DRAFT_LEADER_LEADER = "新起草部门主管级上一级领导下发"; public static final String NEW_MAIN_DRAFT_LEADER_LEADER = "新起草部门主管级上一级领导下发";
public static final String NEW_MAIN_DRAFT_LEADER = "新起草部门主管级领导确认"; public static final String NEW_MAIN_DRAFT_LEADER = "新起草部门主管级领导确认";
laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java
+14 -3
View File
@@ -144,14 +144,13 @@ public class ProcessNodeService extends ServiceImpl<ProcessNodeMapper, ProcessNo
} }
private void specialProcessEsInitChange(List<ProcessNode> processNodeList, String processInstanceId) { private void specialProcessEsInitChange(List<ProcessNode> processNodeList, String processInstanceId) {
// 如果是变更分支 则需要删掉专家审批节点 并将两个节点改名
LambdaQueryWrapper<ProcessEsInitChange> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProcessEsInitChange> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ProcessEsInitChange::getProcessInstanceId, processInstanceId); wrapper.eq(ProcessEsInitChange::getProcessInstanceId, processInstanceId);
List<ProcessEsInitChange> processEsInitChanges = esInitChangeService.list(wrapper); List<ProcessEsInitChange> processEsInitChanges = esInitChangeService.list(wrapper);
if (CollectionUtils.isNotEmpty(processEsInitChanges)) { if (CollectionUtils.isNotEmpty(processEsInitChanges)) {
ProcessEsInitChange processEsInitChange = processEsInitChanges.get(0); ProcessEsInitChange processEsInitChange = processEsInitChanges.get(0);
if (Objects.equals(processEsInitChange.getApplicationCategory(), ESPApplicationCategoryEnum.CHANGE.getValue())) { if (Objects.equals(processEsInitChange.getApplicationCategory(), ESPApplicationCategoryEnum.INITIATION.getValue())) {
processNodeList.removeIf(processNode -> Objects.equals(processNode.getNodeName(), EsInitChangeConstant.EXPERT_CHECK)); // 将两个节点改名
processNodeList.forEach(processNode -> { processNodeList.forEach(processNode -> {
if (Objects.equals(processNode.getNodeName(), EsInitChangeConstant.MAIN_DRAFT_USER_LEADER)) { if (Objects.equals(processNode.getNodeName(), EsInitChangeConstant.MAIN_DRAFT_USER_LEADER)) {
processNode.setNodeName("发起人主管级领导审批"); processNode.setNodeName("发起人主管级领导审批");
@@ -161,6 +160,18 @@ public class ProcessNodeService extends ServiceImpl<ProcessNodeMapper, ProcessNo
} }
}); });
} }
// 将两个节点改名
if (Objects.equals(processEsInitChange.getApplicationCategory(), ESPApplicationCategoryEnum.CHANGE.getValue())) {
processNodeList.removeIf(processNode -> Objects.equals(processNode.getNodeName(), EsInitChangeConstant.EXPERT_CHECK));
processNodeList.forEach(processNode -> {
if (Objects.equals(processNode.getNodeName(), EsInitChangeConstant.MAIN_DRAFT_USER_LEADER)) {
processNode.setNodeName("主起草人主管级领导审批");
}
if (Objects.equals(processNode.getNodeName(), EsInitChangeConstant.MAIN_DRAFT_USER_LEADER_LEADER)) {
processNode.setNodeName("主起草人主管级上一级领导审批");
}
});
}
} }
} }