67785修改。

This commit is contained in:
wangzhijiang
2023-04-06 18:03:24 +08:00
parent 3476d10b25
commit 423be71644
@@ -10251,10 +10251,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
this.lawsInventoryEOListSortByVerifyDueDate(lawsInventoryEOList);
Date designDueDate = lawsInventoryEOList.get(0).getDesignDueDate();
Date verifyDueDate = lawsInventoryEOList.get(0).getVerifyDueDate();
String endTime = "";
if(designDueDate != null){
endTime = DateUtils.formatDate(designDueDate);
if(verifyDueDate != null){
endTime = DateUtils.formatDate(verifyDueDate);
}
String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(","));
@@ -10367,7 +10367,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
this.lawsInventoryEOListSortByVerifyDueDate(lawsInventoryEOList);
Date designDueDate = lawsInventoryEOList.get(0).getVerifyDueDate();
Date designDueDate = lawsInventoryEOList.get(0).getDesignDueDate();
String endTime = "";
if(designDueDate != null){
endTime = DateUtils.formatDate(designDueDate);