WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
cuijiaming
2023-04-01 11:04:55 +08:00
parent ffe55f2954
commit 509c6e91d9
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+17 -10
View File
@@ -3250,19 +3250,22 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
//截止时间 //截止时间
// SimpleDateFormat sd = new SimpleDateFormat(); // SimpleDateFormat sd = new SimpleDateFormat();
// String endTimeStr = sd.format(endTime); // String endTimeStr = sd.format(endTime);
if(StringUtils.isNotBlank(endTime)){
flag = dateVerify(projectCertificationInventoryEO, errorMsg, endTime,msgList,"截止日期","Due Date"); flag = dateVerify(projectCertificationInventoryEO, errorMsg, endTime,msgList,"截止日期","Due Date");
if(flag){ if(flag){
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
Date date = null; Date date = null;
try { try {
date = sd.parse(endTime); if(!endTime.contains("-")){
} catch (ParseException e) { endTime = DateUtils.coverDate(endTime);
e.printStackTrace();
} }
projectCertificationInventoryEO.setEndTime(date); date = sd.parse(endTime);
} catch (ParseException e) {
e.printStackTrace();
} }
projectCertificationInventoryEO.setEndTime(date);
} }
//报告编号 //报告编号
if(StringUtils.isNotBlank(reportNumber)){ if(StringUtils.isNotBlank(reportNumber)){
if(reportNumber.length() > 200){ if(reportNumber.length() > 200){
@@ -3343,9 +3346,13 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date now = new Date(); Date now = new Date();
String nowStr = sdf.format(now); String nowStr = sdf.format(now);
// String fieldStr = sdf.format(field);
Date now1 = null; Date now1 = null;
Date field1 = null; Date field1 = null;
try { try {
if(!field.contains("-")){
field = DateUtils.coverDate(field);
}
now1 = sdf.parse(nowStr); now1 = sdf.parse(nowStr);
field1 = sdf.parse(field); field1 = sdf.parse(field);
long day = now1.getTime()-field1.getTime(); long day = now1.getTime()-field1.getTime();