From f5013a88b753d2be461d035934f32cb0df235700 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 22 Aug 2024 15:53:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2089160=20=E6=B3=95=E8=A7=84=E7=AC=A6?=
 =?UTF-8?q?=E5=90=88=E6=80=A7=E6=8E=92=E6=9F=A5=E6=B5=81=E7=A8=8B=EF=BC=88?=
 =?UTF-8?q?=E6=B3=95=E8=A7=84=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=8F=91=E8=B5=B7?=
 =?UTF-8?q?=EF=BC=89=20--=E6=89=8B=E5=8A=A8=E6=96=B0=E5=A2=9E=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=8F=90=E7=A4=BA=E6=93=8D=E4=BD=9C=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProcessStandardComplianceCheckDetail.java | 10 +++++++++-
 .../ProcessStandardComplianceCheckServiceImpl.java   | 12 +++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

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<String> 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<Proce
         // 获取第一个任务的taskId
         String taskId = actFlowCommonService.getFirstTaskId(processInstanceId, userId, processDefinitionId);
         processTask.setTaskId(taskId);
-        CompletableFuture.runAsync(() -> {
-            // 保存第一个节点的草稿
-            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<Proce
         runtimeService.setVariable(processInstanceId, CHECK_ID, standardInfo.getId());
         runtimeService.setVariable(processInstanceId, MAIN_INSTANCE_ID, processInstanceId);
         this.startNodeDetailBusProcess(
-                        processInstanceId, standardInfo.getId(), businessInfoDTO.getDetailInfoList());
+                processInstanceId, standardInfo.getId(), businessInfoDTO.getDetailInfoList());
     }
 
     private void startNodeDetailBusProcess(String processInstanceId, String checkId, List<ProcessStandardComplianceCheckDetail> detailInfoList) {