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

67785修改。

Browse Source
This commit is contained in:
wangzhijiang
2023-04-06 18:03:24 +08:00
parent 3476d10b25
commit 423be71644
1 changed files with 4 additions and 4 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/ProjectLawsInventoryEOServiceImpl.java
+4 -4
View File
@@ -10251,10 +10251,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
this.lawsInventoryEOListSortByVerifyDueDate(lawsInventoryEOList); this.lawsInventoryEOListSortByVerifyDueDate(lawsInventoryEOList);
Date designDueDate = lawsInventoryEOList.get(0).getDesignDueDate(); Date verifyDueDate = lawsInventoryEOList.get(0).getVerifyDueDate();
String endTime = ""; String endTime = "";
if(designDueDate != null){ if(verifyDueDate != null){
endTime = DateUtils.formatDate(designDueDate); endTime = DateUtils.formatDate(verifyDueDate);
} }
String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(",")); String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(","));
@@ -10367,7 +10367,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
this.lawsInventoryEOListSortByVerifyDueDate(lawsInventoryEOList); this.lawsInventoryEOListSortByVerifyDueDate(lawsInventoryEOList);
Date designDueDate = lawsInventoryEOList.get(0).getVerifyDueDate(); Date designDueDate = lawsInventoryEOList.get(0).getDesignDueDate();
String endTime = ""; String endTime = "";
if(designDueDate != null){ if(designDueDate != null){
endTime = DateUtils.formatDate(designDueDate); endTime = DateUtils.formatDate(designDueDate);