From 509c6e91d9cf35ea4f32476ef27cfa78e5eeaffc Mon Sep 17 00:00:00 2001
From: cuijiaming <1410452759@qq.com>
Date: Sat, 1 Apr 2023 11:04:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5-=E6=97=A5=E6=9C=9F=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationInventoryEOServiceImpl.java | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 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 9aa4bbe37..8521a21db 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
@@ -3250,19 +3250,22 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			//截止时间
 //			SimpleDateFormat sd = new SimpleDateFormat();
 //			String endTimeStr = sd.format(endTime);
-			if(StringUtils.isNotBlank(endTime)){
-				flag = dateVerify(projectCertificationInventoryEO, errorMsg, endTime,msgList,"截止日期","Due Date");
-				if(flag){
-					SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
-					Date date = null;
-					try {
-						date = sd.parse(endTime);
-					} catch (ParseException e) {
-						e.printStackTrace();
+
+			flag = dateVerify(projectCertificationInventoryEO, errorMsg, endTime,msgList,"截止日期","Due Date");
+			if(flag){
+				SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
+				Date date = null;
+				try {
+					if(!endTime.contains("-")){
+						endTime = DateUtils.coverDate(endTime);
 					}
-					projectCertificationInventoryEO.setEndTime(date);
+					date = sd.parse(endTime);
+				} catch (ParseException e) {
+					e.printStackTrace();
 				}
+				projectCertificationInventoryEO.setEndTime(date);
 			}
+
 			//报告编号
 			if(StringUtils.isNotBlank(reportNumber)){
 				if(reportNumber.length() > 200){
@@ -3343,9 +3346,13 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 				Date now = new Date();
 				String nowStr = sdf.format(now);
+//				String fieldStr = sdf.format(field);
 				Date now1 = null;
 				Date field1 = null;
 				try {
+					if(!field.contains("-")){
+						field = DateUtils.coverDate(field);
+					}
 					now1 = sdf.parse(nowStr);
 					field1 = sdf.parse(field);
 					long day = now1.getTime()-field1.getTime();