diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java index f25df9b3..bab30ede 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java @@ -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 splitByNumber(String input) { 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 8bb518c2..6bebb991 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 @@ -185,12 +185,10 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl { - // 保存第一个节点的草稿 - processHandleService.saveToDraft(processInfoVO, userId); - // 保存第一个节点的快照 - processHandleService.saveToSnapshot(processInfoVO, userId); - }); + // 保存第一个节点的草稿 + processHandleService.saveToDraft(processInfoVO, userId); + // 保存第一个节点的快照 + processHandleService.saveToSnapshot(processInfoVO, userId); // 更新审批表为完成,填充数据 actFlowCommonService.updateApprovalInfo(processTask, taskId); // 根据流程实例id更新流程总表 @@ -223,7 +221,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl detailInfoList) {