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

bug53409虚拟清单log内容修改

Browse Source
This commit is contained in:
xiejunyu
2022-05-31 15:27:50 +08:00
parent fc9f96e77c
commit 04b9e8a7cf
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+10 -2
View File
@@ -717,19 +717,25 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}else { }else {
dummyInventoryInfoEO.setVerifyDuty("空"); dummyInventoryInfoEO.setVerifyDuty("空");
} }
//文件 //文件
List<String> deliverableList = new ArrayList<>(); List<String> deliverableList = new ArrayList<>();
//设计符合性确认交付物模板 //设计符合性确认交付物模板
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableTemplate())){ if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getDesignDeliverableTemplate().split(","))); deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getDesignDeliverableTemplate().split(",")));
}else {
dummyInventoryInfoEO.setDesignDeliverableTemplateName("空");
} }
// Prehomo确认交付物模板 // Prehomo确认交付物模板
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableTemplate())){ if(StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getPrehomoDeliverableTemplate().split(","))); deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getPrehomoDeliverableTemplate().split(",")));
}else {
dummyInventoryInfoEO.setPrehomoDeliverableTemplateName("空");
} }
// 验证符合性确认交付物模板 // 验证符合性确认交付物模板
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableTemplate())){ if(StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getVerifyDeliverableTemplate().split(","))); deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getVerifyDeliverableTemplate().split(",")));
}else {
dummyInventoryInfoEO.setVerifyDeliverableTemplateName("空");
} }
List<OSSFile> fileInfos = new ArrayList<>(); List<OSSFile> fileInfos = new ArrayList<>();
if(deliverableList.size() != 0){ if(deliverableList.size() != 0){
@@ -763,7 +769,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for (String s : deliverableTemplate.split(",")) { for (String s : deliverableTemplate.split(",")) {
List<OSSFile> collect = fileInfos.stream().filter(e -> s.equals(e.getId())).collect(Collectors.toList()); List<OSSFile> collect = fileInfos.stream().filter(e -> s.equals(e.getId())).collect(Collectors.toList());
sb.append(collect.get(0).getFileName() + ","); if (CollectionUtils.isNotEmpty(collect)) {
sb.append(collect.get(0).getFileName() + ",");
}
} }
String sbStr = ""; String sbStr = "";
if(org.apache.commons.lang3.StringUtils.isNotBlank(sb)){ if(org.apache.commons.lang3.StringUtils.isNotBlank(sb)){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+6
View File
@@ -2082,14 +2082,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//设计符合性确认交付物模板 //设计符合性确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){ if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getDesignDeliverableTemplate().split(","))); deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getDesignDeliverableTemplate().split(",")));
}else {
projectLawsInventoryEO.setDesignDeliverableTemplateName("空");
} }
// Prehomo确认交付物模板 // Prehomo确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){ if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableTemplate().split(","))); deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableTemplate().split(",")));
}else {
projectLawsInventoryEO.setPrehomoDeliverableTemplateName("空");
} }
// 验证符合性确认交付物模板 // 验证符合性确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){ if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableTemplate().split(","))); deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableTemplate().split(",")));
}else {
projectLawsInventoryEO.setVerifyDeliverableTemplateName("空");
} }
List<OSSFile> fileInfos = new ArrayList<>(); List<OSSFile> fileInfos = new ArrayList<>();
if(deliverableList.size() != 0){ if(deliverableList.size() != 0){