QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 89160 法规符合性排查流程（法规工程师发起） --手动新增生成提示操作失败

Browse Source
This commit is contained in:
mzaxd
2024-08-22 15:53:20 +08:00
parent f0dc8f620c
commit f5013a88b7
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java
+9 -1
View File
@@ -273,7 +273,15 @@ public class ProcessStandardComplianceCheckDetail implements Serializable, Compa
} }
// 如果前面的部分都相等，则按长度比较 // 如果前面的部分都相等，则按长度比较
return Integer.compare(parts1.size(), parts2.size()); int numberComparison = Integer.compare(parts1.size(), parts2.size());
if (numberComparison != 0) {
return numberComparison;
}
// 如果 termNumber 相等，再按 termTitle 排序
String termTitle1 = o1.getTermTitle() == null ? "" : o1.getTermTitle();
String termTitle2 = o2.getTermTitle() == null ? "" : o2.getTermTitle();
return termTitle1.compareTo(termTitle2);
} }
private List<String> splitByNumber(String input) { private List<String> splitByNumber(String input) {
laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
+5 -7
View File
@@ -185,12 +185,10 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
// 获取第一个任务的taskId // 获取第一个任务的taskId
String taskId = actFlowCommonService.getFirstTaskId(processInstanceId, userId, processDefinitionId); String taskId = actFlowCommonService.getFirstTaskId(processInstanceId, userId, processDefinitionId);
processTask.setTaskId(taskId); processTask.setTaskId(taskId);
CompletableFuture.runAsync(() -> { // 保存第一个节点的草稿
// 保存第一个节点的草稿 processHandleService.saveToDraft(processInfoVO, userId);
processHandleService.saveToDraft(processInfoVO, userId); // 保存第一个节点的快照
// 保存第一个节点的快照 processHandleService.saveToSnapshot(processInfoVO, userId);
processHandleService.saveToSnapshot(processInfoVO, userId);
});
// 更新审批表为完成，填充数据 // 更新审批表为完成，填充数据
actFlowCommonService.updateApprovalInfo(processTask, taskId); actFlowCommonService.updateApprovalInfo(processTask, taskId);
// 根据流程实例id更新流程总表 // 根据流程实例id更新流程总表
@@ -223,7 +221,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
runtimeService.setVariable(processInstanceId, CHECK_ID, standardInfo.getId()); runtimeService.setVariable(processInstanceId, CHECK_ID, standardInfo.getId());
runtimeService.setVariable(processInstanceId, MAIN_INSTANCE_ID, processInstanceId); runtimeService.setVariable(processInstanceId, MAIN_INSTANCE_ID, processInstanceId);
this.startNodeDetailBusProcess( this.startNodeDetailBusProcess(
processInstanceId, standardInfo.getId(), businessInfoDTO.getDetailInfoList()); processInstanceId, standardInfo.getId(), businessInfoDTO.getDetailInfoList());
} }
private void startNodeDetailBusProcess(String processInstanceId, String checkId, List<ProcessStandardComplianceCheckDetail> detailInfoList) { private void startNodeDetailBusProcess(String processInstanceId, String checkId, List<ProcessStandardComplianceCheckDetail> detailInfoList) {