From 3665b109f5b47fa29b19d4ab8ce626183baf01fa Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Tue, 28 Mar 2023 09:14:43 +0800
Subject: [PATCH] update

---
 .../impl/ProjectCertificationInventoryEOServiceImpl.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 cc1ad52c3..3c130b781 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
@@ -804,6 +804,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			// projectCertificationInventoryEO.setEndTime(DateUtils.str2Date(endTime,DateUtils.date_sdf.get()));
 		}
 
+		this.certificationInventoryEOListSortByEndTimeAsc(projectCertificationInventoryEOList);
+		Date endTime = projectCertificationInventoryEOList.get(0).getEndTime();
+
 		String projectLibraryId = json.getString("projectLibraryId");
 		// 获取项目信息，获取认证工程师，给认证工程师分配待办任务
 		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
@@ -866,7 +869,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					templateVariableMap.put("projectNameCn",PRN_CN);
 					templateVariableMap.put("projectNameEn",PRN_EN);
 					templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName());
-					templateVariableMap.put("endTime","");
+					templateVariableMap.put("endTime",DateUtils.formatDate(endTime));
 					templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
 					templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);