From 22a7491add5c9fea62e52f0219c5ca5432a2980f Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Mon, 30 May 2022 11:31:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95log?= =?UTF-8?q?=E4=BA=A4=E4=BB=98=E7=89=A9=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dummy/entity/DummyInventoryInfoEO.java | 6 +- .../enums/DummyInventoryBaseFieldEnum.java | 2 +- .../impl/DummyInventoryBaseEOServiceImpl.java | 204 ++++++++++++++---- .../impl/DummyInventoryInfoEOServiceImpl.java | 12 +- .../com/jero/modules/dummy/util/ListDiff.java | 7 +- 5 files changed, 173 insertions(+), 58 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java index a1620bacd..99073f97a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java @@ -174,7 +174,7 @@ public class DummyInventoryInfoEO implements Serializable { /**设计符合性确认-交付物类型*/ @Excel(name = "设计-交付物类型", width = 15,dicCode ="deliverable_template") @ApiModelProperty(value = "设计符合性确认-交付物类型") - @Dict(dicCode ="deliverable_template") +// @Dict(dicCode ="deliverable_template") private java.lang.String designDeliverableType; @TableField(exist = false) @@ -204,7 +204,7 @@ public class DummyInventoryInfoEO implements Serializable { /**prehomo确认-交付物类型*/ @Excel(name = "Prehomo-交付物类型", width = 15,dicCode ="deliverable_template") @ApiModelProperty(value = "prehomo确认-交付物类型") - @Dict(dicCode ="deliverable_template") +// @Dict(dicCode ="deliverable_template") private java.lang.String prehomoDeliverableType; @TableField(exist = false) private java.lang.String prehomoDeliverableTypeName; @@ -233,7 +233,7 @@ public class DummyInventoryInfoEO implements Serializable { /**验证符合性确认-交付物类型*/ @Excel(name = "验证-交付物类型", width = 15,dicCode ="deliverable_template") @ApiModelProperty(value = "验证符合性确认-交付物类型") - @Dict(dicCode ="deliverable_template") +// @Dict(dicCode ="deliverable_template") private java.lang.String verifyDeliverableType; @TableField(exist = false) private java.lang.String verifyDeliverableTypeName; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/DummyInventoryBaseFieldEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/DummyInventoryBaseFieldEnum.java index 3648bda4a..5ca0f8ac1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/DummyInventoryBaseFieldEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/DummyInventoryBaseFieldEnum.java @@ -17,7 +17,7 @@ public enum DummyInventoryBaseFieldEnum { APPLICABLE_SUPPLEMENT("适用增补件", "applicable_supplement","Applicable Supplement"), REMARK("备注", "remark","Comments"), - DELIVERABLE_TEMPLATE("交付物类型", "deliverable_template","Type of deliverables"), + DELIVERABLE_TEMPLATE("交付物类型", "jiao1_fu4_wu4_lei4_xing2","Type of deliverables"), FA1_QI3_REN2("发起人", "fa1_qi3_ren2","Initiator"), ZE2_REN2_REN2("责任人", "ze2_ren4_ren2","Assignee"), 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 3fd76daeb..c0da299c1 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 @@ -426,8 +426,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl e.getSerialNumber()).collect(Collectors.joining(",")); iDummyContentChangeEOService.saveBatch(list); sendMsg(null,dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId(), null, addSerialNumber,null,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut()); - // private void sendMsg(Map baseDiff, String idTemp,List> infoDiffList, - // String addSerialNumber,String deleteSerialNumber,String state,String cut) { + // private void sendMsg(Map baseDiff, String idTemp,List> infoDiffList, + // String addSerialNumber,String deleteSerialNumber,String state,String cut) { }else { if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) { throw new JeroBootException("维护清单为空,发布失败"); @@ -448,7 +448,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl records) { - Set technologyTerritorySet = new HashSet<>(); + for (DummyInventoryInfoEO dummyInventoryInfoEO : records) { //子标题 if (StringUtils.isBlank(dummyInventoryInfoEO.getSubtitle())) { @@ -467,6 +467,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl technologyTerritorySet = new HashSet<>(); if (StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())) { List list = Arrays.asList(dummyInventoryInfoEO.getTechnologyTerritory().split(",")); technologyTerritorySet.addAll(list); @@ -587,29 +588,85 @@ public class DummyInventoryBaseEOServiceImpl 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(dummyInventoryInfoEO.getDesignDeliverableType())) { - String designDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setDesignDeliverableType(designDeliverableTypeName); - }else { - dummyInventoryInfoEO.setDesignDeliverableType("空"); + designDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getDesignDeliverableType().split(",")); + deliverableTypeSet.addAll(designDeliverableTypeIdList); + } + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) { + prehomoDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getPrehomoDeliverableType().split(",")); + deliverableTypeSet.addAll(prehomoDeliverableTypeIdList); + } + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) { + verifyDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.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(dummyInventoryInfoEO.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); + } + dummyInventoryInfoEO.setDesignDeliverableTypeName(designName); + } else { + dummyInventoryInfoEO.setDesignDeliverableTypeName("空"); } //prehomo确认-交付物类型 - if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) { - String prehomoDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getPrehomoDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setPrehomoDeliverableType(prehomoDeliverableTypeName); - }else { - dummyInventoryInfoEO.setPrehomoDeliverableType("空"); + if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.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); + } + dummyInventoryInfoEO.setPrehomoDeliverableTypeName(prehomoName); + + } else { + dummyInventoryInfoEO.setPrehomoDeliverableTypeName("空"); } //验证符合性确认-交付物类型 - if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) { - String verifyDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getVerifyDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setVerifyDeliverableType(verifyDeliverableTypeName); - }else { - dummyInventoryInfoEO.setVerifyDeliverableType("空"); + if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.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); + } + dummyInventoryInfoEO.setVerifyDeliverableTypeName(verifyName); + } else { + dummyInventoryInfoEO.setVerifyDeliverableTypeName("空"); } + //发起人 List fa1_qi3_ren2 = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.FA1_QI3_REN2.getValue()); //设计符合性确认-发起人 @@ -662,7 +719,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl records) { - Set technologyTerritorySet = new HashSet<>(); + for (DummyInventoryInfoEO dummyInventoryInfoEO : records) { //子标题 if (StringUtils.isBlank(dummyInventoryInfoEO.getSubtitle())) { @@ -681,6 +738,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl technologyTerritorySet = new HashSet<>(); if (StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())) { List list = Arrays.asList(dummyInventoryInfoEO.getTechnologyTerritory().split(",")); technologyTerritorySet.addAll(list); @@ -799,27 +857,81 @@ public class DummyInventoryBaseEOServiceImpl 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(dummyInventoryInfoEO.getDesignDeliverableType())) { - String designDeliverableTypeEnName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignDeliverableType())).map(f -> f.getEnName()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setDesignDeliverableType(designDeliverableTypeEnName); - }else { - dummyInventoryInfoEO.setDesignDeliverableType("null"); + designDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getDesignDeliverableType().split(",")); + deliverableTypeSet.addAll(designDeliverableTypeIdList); + } + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) { + prehomoDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getPrehomoDeliverableType().split(",")); + deliverableTypeSet.addAll(prehomoDeliverableTypeIdList); + } + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) { + verifyDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.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(dummyInventoryInfoEO.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); + } + dummyInventoryInfoEO.setDesignDeliverableTypeName(designEnName); + } else { + dummyInventoryInfoEO.setDesignDeliverableTypeName("null"); } //prehomo确认-交付物类型 - if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) { - String prehomoDeliverableTypeEnName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getPrehomoDeliverableType())).map(f -> f.getEnName()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setPrehomoDeliverableType(prehomoDeliverableTypeEnName); - }else { - dummyInventoryInfoEO.setPrehomoDeliverableType("null"); + if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.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); + } + dummyInventoryInfoEO.setPrehomoDeliverableTypeName(prehomoEnName); + } else { + dummyInventoryInfoEO.setPrehomoDeliverableTypeName("null"); } //验证符合性确认-交付物类型 - if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) { - String verifyDeliverableTypeEnName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getVerifyDeliverableType())).map(f -> f.getEnName()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setVerifyDeliverableType(verifyDeliverableTypeEnName); - }else { - dummyInventoryInfoEO.setVerifyDeliverableType("null"); + if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.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); + } + dummyInventoryInfoEO.setVerifyDeliverableTypeName(verifyEnName); + } else { + dummyInventoryInfoEO.setVerifyDeliverableTypeName("null"); } //发起人 @@ -956,7 +1068,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl infoDiff : infoDiffList) { if (infoDiff.size() > 1) { contentInfo += row + ". The Number " + infoDiff.get("serialNumber") + " has been updated as follows : " + "\r\n"; - contentInfo = setInfoDiffListContent(contentInfo,infoDiffList,contentLog); + contentInfo = setInfoDiffListContent(contentInfo,infoDiffList,contentLog); } } } @@ -974,10 +1086,10 @@ public class DummyInventoryBaseEOServiceImpl 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)"; + String infoDiffNew = list.get(1); if (StringUtils.isBlank(contentLog)) { contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ","; @@ -1196,8 +1308,8 @@ public class DummyInventoryBaseEOServiceImpl 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); if (StringUtils.isBlank(contentLog)) { @@ -1244,8 +1356,8 @@ public class DummyInventoryBaseEOServiceImpl 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); if (StringUtils.isBlank(contentLog)) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index bd3ace02d..2498df41f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -206,14 +206,14 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl> infoDiffListEn = new ArrayList<>(); infoDiffListEn.add(infoDiffEn); + if(infoDiff.size()>1) { + contentLog = dummyInventoryBaseEOService.setInfoDiffListContent(null, infoDiffList, contentLog); + enContentLog = dummyInventoryBaseEOService.setInfoDiffListContent(enContentLog, infoDiffListEn, null); - contentLog = dummyInventoryBaseEOService.setInfoDiffListContent(null,infoDiffList,contentLog); - enContentLog=dummyInventoryBaseEOService.setInfoDiffListContent(enContentLog,infoDiffListEn,null); - - dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.CN.getValue()); - dummyLogEOService.updateLog(enContentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.EN.getValue()); + dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.CN.getValue()); + dummyLogEOService.updateLog(enContentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.EN.getValue()); + } } - /** * 通过id删除 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/util/ListDiff.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/util/ListDiff.java index 08ed0849e..3fd0a22b0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/util/ListDiff.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/util/ListDiff.java @@ -29,7 +29,8 @@ public class ListDiff { && !f.getName().equals("implementTime") && !f.getName().equals("xin1Che1Xing2Shi2Shi1Ri4Qi1") && !f.getName().equals("implementTime") && !f.getName().equals("inventoryAffirmStatusName") && !f.getName().equals("taskAffirmStatusName") && !f.getName().equals("roleCode") - && !f.getName().equals("roleName") + && !f.getName().equals("roleName") && !f.getName().equals("verifyDeliverableType")&& !f.getName().equals("designDeliverableType") + && !f.getName().equals("prehomoDeliverableType") ){ StringBuilder v1String= new StringBuilder(String.valueOf(v1)); @@ -42,7 +43,9 @@ public class ListDiff { // } if(f.getName().contains("erritory") || f.getName().contains("emplate") || f.getName().equals(("shi4Yong4Fan4Wei2")) || f.getName().equals("region") - || f.getName().equals("applyScope")){ + || f.getName().equals("applyScope") || f.getName().contains("DeliverableType") + + ){ result.put(f.getName(), v1String.append("|").append(v2String).toString()); }else { //