From b3556337e472286303921f2bad356d4e6f0d55de Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Mon, 17 Apr 2023 22:38:04 +0800
Subject: [PATCH] =?UTF-8?q?68381=20=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=B7=A5=E7=A8=8B=E5=B8=88=E9=80=80=E5=9B=9E?=
 =?UTF-8?q?=E6=88=96studio=E6=92=A4=E5=9B=9E=EF=BC=8C=E9=A3=9E=E4=B9=A6?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectCertificationInventoryEOServiceImpl.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index b2d97dc70..8aea66520 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -2212,7 +2212,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 
 				if(StringUtils.isNotEmpty(thirdId)){
 					// 根据结束时间进行排序，获取最近的时间，发消息时使用。
-					Collections.sort(projectCertificationInventoryEOList, new Comparator<ProjectCertificationInventoryEO>() {
+					/*Collections.sort(projectCertificationInventoryEOList, new Comparator<ProjectCertificationInventoryEO>() {
 						@Override
 						public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) {
 							if(p1.getEndTime() != null && p2.getEndTime() != null){
@@ -2221,7 +2221,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 							return 1;
 						}
 					});
-					Date endTime = projectCertificationInventoryEOList.get(0).getEndTime();
+					Date endTime = projectCertificationInventoryEOList.get(0).getEndTime();*/
+					this.certificationInventoryEOListSortByInventoryVerifyEndTimeAsc(projectCertificationInventoryEOList);
+					Date endTime = projectCertificationInventoryEOList.get(0).getInventoryVerifyEndTime();
 
 					JSONObject larkMesJson = new JSONObject();
 					larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE3.getValue());
@@ -2561,6 +2563,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 
 							JSONObject larkMesJson = new JSONObject();
 							if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_WITHDRAW.getValue())){
+								this.certificationInventoryEOListSortByInventoryVerifyEndTimeAsc(projectCertificationInventoryEOList);
+								endTime = projectCertificationInventoryEOList.get(0).getInventoryVerifyEndTime();
 								larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE4.getValue());
 							}else if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_RESET.getValue())){
 								larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE5.getValue());