diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index c0da299c1..8f22cf83d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -28,6 +28,8 @@ import com.jero.modules.dummy.service.IDummyInventoryInfoEOService; import com.jero.modules.dummy.service.IDummyReadEOService; import com.jero.modules.dummy.util.ListDiff; import com.jero.modules.feishu.service.IFeishuService; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.entity.SysAnnouncement; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysDictItem; @@ -85,7 +87,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl deliverableList = new ArrayList<>(); + //设计符合性确认交付物模板 + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableTemplate())){ + deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getDesignDeliverableTemplate().split(","))); + } + // Prehomo确认交付物模板 + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableTemplate())){ + deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getPrehomoDeliverableTemplate().split(","))); + } + // 验证符合性确认交付物模板 + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableTemplate())){ + deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getVerifyDeliverableTemplate().split(","))); + } + List fileInfos = new ArrayList<>(); + if(deliverableList.size() != 0){ + fileInfos = iOSSFileService.getFileInfos(org.apache.commons.lang3.StringUtils.join(deliverableList, ",")); + } + //交付物类型模板 + if(fileInfos.size() != 0){ + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableTemplate())){ + String fileName = getFileName(fileInfos,dummyInventoryInfoEO.getDesignDeliverableTemplate()); + if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){ + dummyInventoryInfoEO.setDesignDeliverableTemplateName(fileName); + } + } + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableTemplate())){ + String fileName = getFileName(fileInfos,dummyInventoryInfoEO.getPrehomoDeliverableTemplate()); + if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){ + dummyInventoryInfoEO.setPrehomoDeliverableTemplateName(fileName); + } + } + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableTemplate())){ + String fileName = getFileName(fileInfos,dummyInventoryInfoEO.getVerifyDeliverableTemplate()); + if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){ + dummyInventoryInfoEO.setVerifyDeliverableTemplateName(fileName); + } + } + } } } + private String getFileName(List fileInfos, String deliverableTemplate){ + StringBuilder sb = new StringBuilder(); + for (String s : deliverableTemplate.split(",")) { + List collect = fileInfos.stream().filter(e -> s.equals(e.getId())).collect(Collectors.toList()); + sb.append(collect.get(0).getFileName() + ","); + } + String sbStr = ""; + if(org.apache.commons.lang3.StringUtils.isNotBlank(sb)){ + sbStr = sb.substring(0, sb.length() - 1); + } + return sbStr; + } //翻译成英文名 public void disposeDataToEn(List records) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 9a33095b2..f07834ded 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1736,9 +1736,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DELIVERABLE_TEMPLATE.getValue()); - //设计符合性确认-交付物类型 + //交付物类型 + Set deliverableTypeSet = new HashSet<>(); + List designDeliverableTypeIdList= new ArrayList<>(); + List prehomoDeliverableTypeIdList = new ArrayList<>(); + List verifyDeliverableTypeIdList = new ArrayList<>(); if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableType())) { - String designDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getDesignDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - projectLawsInventoryEO.setDesignDeliverableType(designDeliverableTypeName); - }else { - projectLawsInventoryEO.setDesignDeliverableType("空"); + designDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getDesignDeliverableType().split(",")); + deliverableTypeSet.addAll(designDeliverableTypeIdList); + } + if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) { + prehomoDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableType().split(",")); + deliverableTypeSet.addAll(prehomoDeliverableTypeIdList); + } + if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) { + verifyDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableType().split(",")); + deliverableTypeSet.addAll(verifyDeliverableTypeIdList); + } + //树形结构 + List deliverableTypeList = new ArrayList<>(); + if (deliverableTypeSet.size() != 0) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SysCategory::getId, deliverableTypeSet); + deliverableTypeList = sysCategoryService.list(wrapper); + } + + //设计符合性确认-交付物类型 + if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableType())) { + StringBuilder designBuilder = new StringBuilder(); + for(String id : designDeliverableTypeIdList){ + List designList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); + if (designList.size() != 0) { + designBuilder.append(designList.get(0).getName() + ","); + } + } + String designName = null; + if (StringUtils.isNotBlank(designBuilder)) { + designName = designBuilder.substring(0, designBuilder.length() - 1); + } + projectLawsInventoryEO.setDesignDeliverableTypeName(designName); + } else { + projectLawsInventoryEO.setDesignDeliverableTypeName("空"); } //prehomo确认-交付物类型 - if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) { - String prehomoDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getPrehomoDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - projectLawsInventoryEO.setPrehomoDeliverableType(prehomoDeliverableTypeName); - }else { - projectLawsInventoryEO.setPrehomoDeliverableType("空"); + if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) { + StringBuilder prehomoBuilder = new StringBuilder(); + for(String id : prehomoDeliverableTypeIdList){ + List prehomoList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); + if (prehomoList.size() != 0) { + prehomoBuilder.append(prehomoList.get(0).getName() + ","); + } + } + String prehomoName = null; + if (StringUtils.isNotBlank(prehomoBuilder )) { + prehomoName = prehomoBuilder .substring(0, prehomoBuilder .length() - 1); + } + projectLawsInventoryEO.setPrehomoDeliverableTypeName(prehomoName); + + } else { + projectLawsInventoryEO.setPrehomoDeliverableTypeName("空"); } //验证符合性确认-交付物类型 - if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) { - String verifyDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getVerifyDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - projectLawsInventoryEO.setVerifyDeliverableType(verifyDeliverableTypeName); - }else { - projectLawsInventoryEO.setVerifyDeliverableType("空"); + if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) { + StringBuilder verifyBuilder = new StringBuilder(); + for(String id : verifyDeliverableTypeIdList){ + List verifyList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); + + if (verifyList.size() != 0) { + verifyBuilder.append(verifyList.get(0).getName() + ","); + } + } + String verifyName = null; + if (StringUtils.isNotBlank(verifyBuilder)) { + verifyName = verifyBuilder.substring(0, verifyBuilder.length() - 1); + } + projectLawsInventoryEO.setVerifyDeliverableTypeName(verifyName); + } else { + projectLawsInventoryEO.setVerifyDeliverableTypeName("空"); } @@ -2000,6 +2054,48 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl deliverableList = new ArrayList<>(); + //设计符合性确认交付物模板 + if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){ + deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getDesignDeliverableTemplate().split(","))); + } + // Prehomo确认交付物模板 + if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){ + deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableTemplate().split(","))); + } + // 验证符合性确认交付物模板 + if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){ + deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableTemplate().split(","))); + } + List fileInfos = new ArrayList<>(); + if(deliverableList.size() != 0){ + fileInfos = iOSSFileService.getFileInfos(org.apache.commons.lang3.StringUtils.join(deliverableList, ",")); + } + //交付物类型模板 + if(fileInfos.size() != 0){ + if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){ + String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getDesignDeliverableTemplate()); + if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){ + projectLawsInventoryEO.setDesignDeliverableTemplateName(fileName); + } + } + if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){ + String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getPrehomoDeliverableTemplate()); + if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){ + projectLawsInventoryEO.setPrehomoDeliverableTemplateName(fileName); + } + } + if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){ + String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getVerifyDeliverableTemplate()); + if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){ + projectLawsInventoryEO.setVerifyDeliverableTemplateName(fileName); + + } + } + } } } @@ -2100,27 +2196,82 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DELIVERABLE_TEMPLATE.getValue()); - //设计符合性确认-交付物类型 + //交付物类型 + Set deliverableTypeSet = new HashSet<>(); + List designDeliverableTypeIdList= new ArrayList<>(); + List prehomoDeliverableTypeIdList = new ArrayList<>(); + List verifyDeliverableTypeIdList = new ArrayList<>(); if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableType())) { - String designDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getDesignDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - projectLawsInventoryEO.setDesignDeliverableType(designDeliverableTypeName); - }else { - projectLawsInventoryEO.setDesignDeliverableType("null"); + designDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getDesignDeliverableType().split(",")); + deliverableTypeSet.addAll(designDeliverableTypeIdList); + } + if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) { + prehomoDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableType().split(",")); + deliverableTypeSet.addAll(prehomoDeliverableTypeIdList); + } + if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) { + verifyDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableType().split(",")); + deliverableTypeSet.addAll(verifyDeliverableTypeIdList); + } + //树形结构 + List deliverableTypeList = new ArrayList<>(); + if (deliverableTypeSet.size() != 0) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SysCategory::getId, deliverableTypeSet); + deliverableTypeList = sysCategoryService.list(wrapper); + } + + //设计符合性确认-交付物类型 + if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableType())) { + StringBuilder designBuilder = new StringBuilder(); + for(String id : designDeliverableTypeIdList){ + List designList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); + if (designList.size() != 0) { + designBuilder.append(designList.get(0).getEnName() + ","); + } + } + String designEnName = null; + if (StringUtils.isNotBlank(designBuilder)) { + designEnName = designBuilder.substring(0, designBuilder.length() - 1); + } + projectLawsInventoryEO.setDesignDeliverableTypeName(designEnName); + } else { + projectLawsInventoryEO.setDesignDeliverableTypeName("null"); } //prehomo确认-交付物类型 - if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) { - String prehomoDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getPrehomoDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - projectLawsInventoryEO.setPrehomoDeliverableType(prehomoDeliverableTypeName); - }else { - projectLawsInventoryEO.setPrehomoDeliverableType("null"); + if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) { + StringBuilder prehomoBuilder = new StringBuilder(); + for(String id : prehomoDeliverableTypeIdList){ + List prehomoList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); + if (prehomoList.size() != 0) { + prehomoBuilder.append(prehomoList.get(0).getEnName() + ","); + } + } + String prehomoEnName = null; + if (StringUtils.isNotBlank(prehomoBuilder )) { + prehomoEnName = prehomoBuilder .substring(0, prehomoBuilder .length() - 1); + } + projectLawsInventoryEO.setPrehomoDeliverableTypeName(prehomoEnName); + } else { + projectLawsInventoryEO.setPrehomoDeliverableTypeName("null"); } //验证符合性确认-交付物类型 - if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) { - String verifyDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getVerifyDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - projectLawsInventoryEO.setVerifyDeliverableType(verifyDeliverableTypeName); - }else { - projectLawsInventoryEO.setVerifyDeliverableType("null"); + if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) { + StringBuilder verifyBuilder = new StringBuilder(); + for(String id : verifyDeliverableTypeIdList){ + List verifyList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); + + if (verifyList.size() != 0) { + verifyBuilder.append(verifyList.get(0).getEnName() + ","); + } + } + String verifyEnName = null; + if (StringUtils.isNotBlank(verifyBuilder)) { + verifyEnName = verifyBuilder.substring(0, verifyBuilder.length() - 1); + } + projectLawsInventoryEO.setVerifyDeliverableTypeName(verifyEnName); + } else { + projectLawsInventoryEO.setVerifyDeliverableTypeName("null"); } @@ -2259,6 +2410,47 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl deliverableList = new ArrayList<>(); + //设计符合性确认交付物模板 + if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){ + deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getDesignDeliverableTemplate().split(","))); + } + // Prehomo确认交付物模板 + if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){ + deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableTemplate().split(","))); + } + // 验证符合性确认交付物模板 + if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){ + deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableTemplate().split(","))); + } + List fileInfos = new ArrayList<>(); + if(deliverableList.size() != 0){ + fileInfos = iOSSFileService.getFileInfos(org.apache.commons.lang3.StringUtils.join(deliverableList, ",")); + } + //交付物类型模板 + if(fileInfos.size() != 0){ + if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){ + String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getDesignDeliverableTemplate()); + if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){ + projectLawsInventoryEO.setDesignDeliverableTemplateName(fileName); + } + } + if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){ + String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getPrehomoDeliverableTemplate()); + if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){ + projectLawsInventoryEO.setPrehomoDeliverableTemplateName(fileName); + } + } + if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){ + String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getVerifyDeliverableTemplate()); + if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){ + projectLawsInventoryEO.setVerifyDeliverableTemplateName(fileName); + + } + } + } } } @@ -4283,13 +4475,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("designDeliverableType").split(",")); + if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTypeName"))) { + List list = Arrays.asList(infoDiff.get("designDeliverableTypeName").split("\\|")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; - List listEn = Arrays.asList(infoDiffEn.get("designDeliverableType").split(",")); + List listEn = Arrays.asList(infoDiffEn.get("designDeliverableTypeName").split("\\|")); String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; @@ -4343,13 +4535,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("prehomoDeliverableType").split(",")); + if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTypeName"))) { + List list = Arrays.asList(infoDiff.get("prehomoDeliverableTypeName").split("\\|")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; - List listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableType").split(",")); + List listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTypeName").split("\\|")); String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; @@ -4404,13 +4596,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("verifyDeliverableType").split(",")); + if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTypeName"))) { + List list = Arrays.asList(infoDiff.get("verifyDeliverableTypeName").split("\\|")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; - List listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableType").split(",")); + List listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTypeName").split("\\|")); String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; @@ -4463,15 +4655,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl