认证清单导入-日期的问题修改

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();