From 4fb810c623211839bc666cd220471e4bd9640954 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 22 Feb 2024 15:52:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2081947=20=E5=9C=A8=E7=BA=BF=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91--=E7=AD=BE=E7=AB=A0=E9=A1=B5=E7=9A=84=E7=AD=BE?=
 =?UTF-8?q?=E7=AB=A0=E5=9C=A8=E9=A9=B3=E5=9B=9E=E5=88=B0=E4=B8=BB=E8=B5=B7?=
 =?UTF-8?q?=E8=8D=89=E4=BA=BA=E4=B8=8A=E4=BC=A0=E4=BC=9A=E8=AE=AE=E7=BA=AA?=
 =?UTF-8?q?=E8=A6=81=E8=8A=82=E7=82=B9=E5=90=8E=EF=BC=8C=E6=8D=A2=E4=BA=BA?=
 =?UTF-8?q?=E3=80=81=E8=BD=AC=E5=8A=9E=E7=AD=89=E6=93=8D=E4=BD=9C=EF=BC=8C?=
 =?UTF-8?q?=E7=AD=BE=E7=AB=A0=E4=BF=A1=E6=81=AF=E6=9C=AA=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activiti/process/esRevision/entity/SignInfo.java     | 1 -
 .../esRevision/service/impl/EsRevisionServiceImpl.java   | 9 ++++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/SignInfo.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/SignInfo.java
index 342e2ac8..62a9e8be 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/SignInfo.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/SignInfo.java
@@ -1,7 +1,6 @@
 package com.jero.modules.activiti.process.esRevision.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
index 100f205b..2842cba3 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
@@ -703,7 +703,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         SignInfo singInfo;
 
         // 获取主起草用户
-        processApprovalRecords = parMap.get(MAIN_DRAFT_USER_DISTRIBUTE);
+        processApprovalRecords = parMap.get(MAIN_DRAFT_USER_UPLOAD);
+        processApprovalRecords.sort(Comparator.comparing(ProcessApprovalRecord::getEndTime).reversed());
         singInfo = this.getSingInfo(processApprovalRecords.get(0));
         result.put("起草签署", Collections.singletonList(singInfo));
 
@@ -726,11 +727,15 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
 
         // 获取主管级领导审核用户
         processApprovalRecords = parMap.get(LEADER_APPROVAL);
+        // 将processApprovalRecords按照EndTime倒序排序
+        processApprovalRecords.sort(Comparator.comparing(ProcessApprovalRecord::getEndTime).reversed());
         singInfo = this.getSingInfo(processApprovalRecords.get(0));
         result.put("审核签署", Collections.singletonList(singInfo));
 
         // 获取标准化签署+标准化审核用户
         processApprovalRecords = parMap.get(STANDARDIZATION_APPROVAL);
+        // 将processApprovalRecords按照EndTime倒序排序
+        processApprovalRecords.sort(Comparator.comparing(ProcessApprovalRecord::getEndTime).reversed());
         singInfo = this.getSingInfo(processApprovalRecords.get(0));
         result.put("标准化签署", Collections.singletonList(singInfo));
 
@@ -752,6 +757,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
 
         // 获取批准签署+总工程师用户姓名
         processApprovalRecords = parMap.get(CHIEF_ENGINEER_APPROVAL);
+        // 将processApprovalRecords按照EndTime倒序排序
+        processApprovalRecords.sort(Comparator.comparing(ProcessApprovalRecord::getEndTime).reversed());
         singInfo = this.getSingInfo(processApprovalRecords.get(0));
         result.put("批准签署", Collections.singletonList(singInfo));