From 22a7491add5c9fea62e52f0219c5ca5432a2980f Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Mon, 30 May 2022 11:31:08 +0800 Subject: [PATCH 01/23] =?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 { // From 812cdc8fed12ff995e8a5954075e481a392e2ee8 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Mon, 30 May 2022 11:44:03 +0800 Subject: [PATCH 02/23] =?UTF-8?q?[update]=20=E6=B8=85=E5=8D=95=E7=BC=96?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/TaskParameterCollection.vue | 4 +- .../dialog/ParameterTemplateAdd.vue | 79 ++++++++----------- 4 files changed, 39 insertions(+), 46 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 0b3cf876b..98745f306 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -708,6 +708,7 @@ module.exports = { uploadTime: 'Upload time', enclosure: 'Enclosure', // 认证 + changeTheTitle: 'Title already exists, please change the title', resetPassword: 'reset Password', departmentAllocation: 'department Allocation', ListTitle: 'List Title', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 420dcdeae..e515d0a82 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -718,6 +718,7 @@ module.exports = { uploadTime: '上传时间', enclosure: '附件', // 认证 + changeTheTitle: '标题已存在，请更换标题', resetPassword: '重置密码', departmentAllocation: '部门配置', ListTitle: '清单标题', diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 765e61e09..5f2b632eb 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -76,8 +76,7 @@ - @@ -357,6 +356,7 @@ pageNo: this.pageNo, ...this.queryParam } + console.log(query,'projectIdprojectIdbainji ') getAction(this.url.list, query).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue index 55014ce84..a2a2930e7 100644 --- a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue +++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue @@ -11,10 +11,10 @@ > - + + v-model='formData.title' /> @@ -55,7 +55,7 @@ :pagination='false' :loading='loading' :scroll='{x: 600}' - :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}' + :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, getCheckboxProps: onGetCheckboxProps}' @change='handleTableChange'>
@@ -116,7 +116,7 @@ export default { form: {}, formData: {}, rules: { - templatetitle: [ + title: [ { required: true, message: this.$t('enterTitle'), trigger: 'blur' } ] }, @@ -124,28 +124,12 @@ export default { flag: false, //表单提交标识 spinLoading: false, confirmLoading: false, - templatetitle: '', selectedRowKeys: [], pageNo: 1, pageSize: 10 } }, props: { - templateTitle: { - type: String, - default: '', - required: false - }, - selectedRowKeyS: { - type: Array, - default: '', - required: false - }, - rowId: { - type: String, - default: '', - required: false - }, version: { type: Number, default: '', @@ -201,11 +185,27 @@ export default { handleCancel() { this.$emit('areaVisible', false) }, + onGetCheckboxProps(val,value) { + console.log(val) + return({ + props: { + + // console.log(value,'value') + // // 全部默认禁止选中 + // // disabled: true, + // // 某几项默认禁止选中(R: 当state等于1时) + disabled: val.id === 'ce879dab56a243fd99119553d3899e62' + // // 某几项默认选中(R: 当state等于1时) + // // defaultChecked: record.state == 1, + } + }) + }, onSelectChange(selectedRowKeys, selectedRowKeysDate) { this.selectedRowKeysDate = selectedRowKeysDate this.selectedRowKeys = selectedRowKeys }, handleTableChange(val) { + console.log(',,,') }, showModal() { this.title = this.$t('add') @@ -213,18 +213,9 @@ export default { this.form = {} }, editData(edit) { - let query = { - id: edit.id - } - getAction(this.url.queryById, query).then((res) => { - if (res.success) { - this.formData.templatetitle = res.result.title - this.selectedRowKeys = res.result.paramsTemplateId.split(',') - // this.rowId = res.result.id - // this.version = res.result.paramsTemplatePublishVersion - } else { - } - }) + + this.formData = {...edit} + this.selectedRowKeys = edit.paramsTemplateId.split(',') }, //新增 handleSubmit() { @@ -239,18 +230,21 @@ export default { this.spinLoading = true // 新增編輯之前 判断 标题唯一 getAction(`params/manifest/verifyTitle?projectId=${this.$route.query.id} - &title=${this.formData.templatetitle}`, {}) + &title=${this.formData.title}`, {}) .then(res => { - if (res.success) { + if (res.result) { let postDate = { - title: this.formData.templatetitle, - paramsTemplateId: this.rowId || this.selectedRowKeysDate[0].id, - paramsTemplatePublishVersion: this.version || this.selectedRowKeysDate[0].version, + title: this.formData.title, + paramsTemplateId: this.paramsTemplateId || this.selectedRowKeys[0], + paramsTemplatePublishVersion: this.version, projectId: this.projectId } - if (this.rowId) { - console.log('编辑') + if (this.formData.id) { //编辑 + postDate = { + id : this.formData.id, + ...postDate + } postAction(`params/manifest/edit`, postDate).then(res => { if (res.success) { this.newVisible = false @@ -266,7 +260,6 @@ export default { this.newVisible = false }) } else { - console.log('新增') //新增 postAction(`params/manifest/add`, postDate).then(res => { if (res.success) { @@ -284,7 +277,8 @@ export default { }) } } else { - this.$message.warning(res.message) + this.$message.warning(this.$t('changeTheTitle')) + this.spinLoading = false } }).finally(() => { this.loading = false @@ -328,9 +322,6 @@ export default { // 编辑 }, watch: { - templateTitle(val) { - this.formData.templatetitle = val - }, selectedRowKeyS(val) { this.selectedRowKeys = val } From d50fdb6b0c0ca75da72a293be00f83db17861b0a Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Mon, 30 May 2022 12:05:07 +0800 Subject: [PATCH 03/23] =?UTF-8?q?bug53107=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) 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 5fb91d7d2..9a33095b2 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 @@ -1558,12 +1558,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl idList = Arrays.asList(projectLawsInventoryEO.getIds().split(",")); - QueryWrapper queryWrapper = new QueryWrapper<>(); - List infoList = list(queryWrapper.in("id", idList)); - String projectLibraryId = infoList.get(0).getProjectLibraryId(); - List projectLawsInventoryEOList = new ArrayList<>(); for (String id : projectLawsInventoryEO.getIds().split(",")) { ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO(); @@ -1584,6 +1578,18 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl idList = Arrays.asList(projectLawsInventoryEO.getIds().split(",")); + QueryWrapper queryWrapper = new QueryWrapper<>(); + List infoList = list(queryWrapper.in("id", idList)); + String projectLibraryId = infoList.get(0).getProjectLibraryId(); //更新log LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String username = sysUser.getUsername(); @@ -1725,9 +1736,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Mon, 30 May 2022 13:34:53 +0800 Subject: [PATCH 04/23] =?UTF-8?q?people-=E5=90=8C=E6=AD=A5=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsCollectManifestEOServiceImpl.java | 2 +- .../com/jero/modules/system/entity/PPEmployee.java | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index cc2e8edd3..9ea023013 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -785,7 +785,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl list = list(queryWrapper); int collectFinishNumber = (int) list.stream().filter(e->CollectManifestStateEnum.SYNC_REPORT.getValue().equals(e.getState())).count(); - if (collectFinishNumber == list.size()) { + if (collectFinishNumber == list.size() && list.size() > 0) { map.put("finish", true); map.put("time", list.get(0).getUpdateTime()); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java index 54538a10a..0890cb30b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java @@ -73,4 +73,17 @@ public class PPEmployee { private String phone_device_type; // Mobile/Landline private String formatted_phone_number; + public void setCreation_time(Date creation_time) { + long timeStamp = creation_time.getTime(); + long longTimeStamp = new Long(timeStamp * 1000); // 精确到毫秒的时间戳 + Date time = new Date(longTimeStamp); + this.creation_time = time; + } + + public void setUpdate_time(Date update_time) { + long timeStamp = update_time.getTime(); + long longTimeStamp = new Long(timeStamp * 1000); // 精确到毫秒的时间戳 + Date time = new Date(longTimeStamp); + this.update_time = time; + } } From 615397b32af0ee8d0c84ead292f5f179014e6954 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Mon, 30 May 2022 14:19:46 +0800 Subject: [PATCH 05/23] =?UTF-8?q?bug53131=E6=B3=95=E8=A7=84=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E7=BC=96=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DummyInventoryBaseEOServiceImpl.java | 56 +++- .../ProjectLawsInventoryEOServiceImpl.java | 289 +++++++++++++++--- 2 files changed, 295 insertions(+), 50 deletions(-) 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 Date: Mon, 30 May 2022 14:22:46 +0800 Subject: [PATCH 06/23] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=8A=A8=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 111 ++++++++++-------- 1 file changed, 62 insertions(+), 49 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 2f3131edc..6e2bdc06f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -2455,11 +2455,66 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); List fileFieldList = onlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); + StringBuilder sbTemp = new StringBuilder(); + StringBuilder sbContent = new StringBuilder(); + StringBuilder sbContentInfo = new StringBuilder(); + StringBuilder sbField = new StringBuilder(); + StringBuilder sbNew = new StringBuilder(); + dataList.get(0).entrySet().forEach(entry -> { + String keyTemp = entry.getKey(); + if(fileFieldList.contains(keyTemp)) { + String valueTemp = (String) entry.getValue(); + List fields = fieldList.stream().filter(e -> e.getDbFieldName().equals(keyTemp)).collect(Collectors.toList()); + List fileInfosTemp = iOSSFileService.getFileInfos(valueTemp); + //之前的文件 + List fileNameList = fileInfosTemp.stream().map(OSSFile::getFileName).collect(Collectors.toList()); + String value = (String) map.get(keyTemp); + List fileInfosTempNew = iOSSFileService.getFileInfos(value); + //现在的文件 + List fileNameListNew = fileInfosTempNew.stream().map(OSSFile::getFileName).collect(Collectors.toList()); + boolean checkDiffrent = checkDiffrent(fileNameList, fileNameListNew); + if (!checkDiffrent && fileNameListNew.size() != 0) { + //消息 + sbField.append(fields.get(0).getDbFieldEnName() + ","); + + for (String s : fileNameListNew) { + if (!fileNameList.contains(s)) { + //消息详情 + sbNew.append(fields.get(0).getDbFieldEnName() + " " + s + ","); + } + } + if (StringUtils.isNotBlank(sbField)) { + String substring = sbField.substring(0, sbField.length() - 1); + String content = substring; + } + if (StringUtils.isNotBlank(sbNew)) { + String substring = sbNew.substring(0, sbNew.length() - 1); + //Standard GB 7258 Uploaded Supplement File AA.dox, Release File BB.dox + String dbFieldEnName = fields.get(0).getDbFieldEnName(); + String contentInfo = dbFieldEnName + " " + fileNameList + ","; + } + } + } + }); - //编辑时处理首页文档动态 1. 标准XXXX的状态改为 2. 标准XXXX的适用车型改为 3. 标准XXXX删除了XXXX文件 4. 标准XXXX上传了XXXX文件 String href = "" + serialNumber + "" + " " + titleEn; + String contentFile = ""; + String contentInfoFile = ""; + if(StringUtils.isNotBlank(sbField)){ + String substring = sbField.substring(0, sbField.length() - 1); + contentFile = category + " " + serialNumber + " " + titleEn + " uploaded " + substring; + } + if(StringUtils.isNotBlank(sbNew)){ + String substring = sbNew.substring(0, sbNew.length() - 1); + contentInfoFile = category + " " + href + " uploaded " + substring; + } + + //编辑时处理首页文档动态 1. 标准XXXX的状态改为 2. 标准XXXX的适用车型改为 3. 标准XXXX删除了XXXX文件 4. 标准XXXX上传了XXXX文件 +// String href = "" + serialNumber + "" + " " + titleEn; StringBuilder msgContentSb = new StringBuilder(); StringBuilder msgContentInfoSb = new StringBuilder(); @@ -2480,46 +2535,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fileIdLIst = new ArrayList<>(); - for (Map.Entry entry : map.entrySet()) { - String key = entry.getKey(); - String value = String.valueOf(entry.getValue()); - //文件 - if(fileFieldList.contains(key) && !"null".equals(value) && StringUtils.isNotBlank(value)){ - fileIdLIst.addAll(Arrays.asList(value.split(","))); - } - } - //之前的文件 - List fileListTemp = new ArrayList<>(); - if(fileIdLIstTemp.size() != 0){ - fileListTemp = iOSSFileService.getFileInfoAll(StringUtils.join(fileIdLIstTemp,",")); - } - List fileNameListTemp = fileListTemp.stream().map(OSSFile::getFileName).collect(Collectors.toList()); - - - //编辑的文件 - List fileList = new ArrayList<>(); - if(fileIdLIst.size() != 0){ - fileList = iOSSFileService.getFileInfoAll(StringUtils.join(fileIdLIst,",")); - } - List fileNameList = fileList.stream().map(OSSFile::getFileName).collect(Collectors.toList()); - //删除的文件 - - List deleteFileList = new ArrayList<>(); - for (String fileName : fileNameListTemp) { - if(fileNameList.size() != 0 && !fileNameList.contains(fileName)){ - deleteFileList.add(fileName); - } - } - //上传的文件 - List upFileList = new ArrayList<>(); - for (String fileName : fileNameList) { - if(!fileNameListTemp.contains(fileName)){ - upFileList.add(fileName); - } - } int count = 0; - for (Map.Entry entry : map.entrySet()) { String key = entry.getKey(); String value = String.valueOf(entry.getValue()); @@ -2549,7 +2565,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl stateDictItemList = dictItemList.stream() @@ -2585,15 +2601,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 0){ String msgContent = msgContentSb.substring(0, msgContentSb.length() - 1); From 81bf21af1d1e7a32553a40c3a9c0cb649a6e4623 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Mon, 30 May 2022 15:02:59 +0800 Subject: [PATCH 07/23] =?UTF-8?q?bug53177=E6=8A=80=E6=9C=AF=E9=A2=86?= =?UTF-8?q?=E5=9F=9F=E8=AE=A2=E9=98=85=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BussDocumentLibraryEOServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 6e2bdc06f..eed24dafb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -2086,7 +2086,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Date: Mon, 30 May 2022 15:09:43 +0800 Subject: [PATCH 08/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/projectManagement/components/addModel.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue index 91c7734ef..e99ff909b 100644 --- a/jero-web/src/views/projectManagement/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/addModel.vue @@ -395,12 +395,14 @@ this.formInline = { ...this.formInline } }, projectNameChange(value) { + this.formInline.yearNameId = undefined let content = this.projectNameList.filter(res => { return res.id == value }) this.formInline.vehiclePlatform = content[0].vehiclePlatform || '' this.yearNameDataList = content[0].yearNameDataList || [] this.formInline.digitalPlatform = content[0].digitalPlatform || '' + this.formInline = {...this.formInline} } } } From 9cb36ed31ac61d8554758fd4a051c01e86f11aa2 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Mon, 30 May 2022 15:19:19 +0800 Subject: [PATCH 09/23] =?UTF-8?q?bug53278=E8=99=9A=E6=8B=9F=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E6=B6=88=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DummyInventoryBaseEOServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 8f22cf83d..ca2b55d58 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 @@ -1326,8 +1326,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("designDeliverableTemplate").split(",")); + if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTemplateName"))) { + List list = Arrays.asList(infoDiff.get("designDeliverableTemplateName").split("\\|")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); if (StringUtils.isBlank(contentLog)) { @@ -1374,8 +1374,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplate").split(",")); + if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplateName"))) { + List list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplateName").split("\\|")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); if (StringUtils.isBlank(contentLog)) { @@ -1422,8 +1422,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("verifyDeliverableTemplate").split(",")); + if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTemplateName"))) { + List list = Arrays.asList(infoDiff.get("verifyDeliverableTemplateName").split("\\|")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); if (StringUtils.isBlank(contentLog)) { From ff09bccd951a9b3dda7dcdb0c33b7c21a3105e2b Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Mon, 30 May 2022 16:17:56 +0800 Subject: [PATCH 10/23] =?UTF-8?q?[update]=20=E6=B8=85=E5=8D=95=E7=BC=96?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../documentManage/tags/dialog/DicList.vue | 2 +- .../components/TaskParameterCollection.vue | 34 +- .../dialog/ParameterTemplateAdd.vue | 45 +- .../dialog/ProjectCollectionParameters.vue | 413 ++++++++++++++++++ 4 files changed, 470 insertions(+), 24 deletions(-) create mode 100644 jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue diff --git a/jero-web/src/views/documentManage/tags/dialog/DicList.vue b/jero-web/src/views/documentManage/tags/dialog/DicList.vue index 952560c1e..464806d35 100644 --- a/jero-web/src/views/documentManage/tags/dialog/DicList.vue +++ b/jero-web/src/views/documentManage/tags/dialog/DicList.vue @@ -418,7 +418,7 @@ } this.loadData() }else{ - this.$message.warning(this.$t('operationFailed')); + this.$message.warning(res.message); } }) } diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 5f2b632eb..9a319abd9 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -1,9 +1,9 @@ @@ -98,6 +106,7 @@ import ImportFile from '@/components/ImportFile/index' import ParameterTemplateAdd from '../dialog/ParameterTemplateAdd' import ParameterTemplateCody from '../dialog/ParameterTemplateCody' + import ProjectCollectionParameters from '../dialog/ProjectCollectionParameters' import HistoricalVersion from '../dialog/historicalVersion' import { getAction, postAction } from '../../../api/manage' import Configure from '../dialog/configure' @@ -112,7 +121,8 @@ ParameterTemplateAdd, Configure, HistoricalVersion, - ParameterTemplateCody + ParameterTemplateCody, + ProjectCollectionParameters }, data() { return { @@ -189,7 +199,10 @@ itemId: '', historicalVisible: false, historicalRow: {}, // 历史版本得数据 - areaVisibleCody: false // 复制参数清单得弹框 + areaVisibleCody: false, // 复制参数清单得弹框 + drawerVisible: false, + drawerVisibleitem: false, + titleTag: '' } }, mounted() { @@ -237,6 +250,10 @@ this.areaVisible = val this.getlist() }, + // 项目收集参数 + drawerhandleCancel(val) { + this.drawerhandleCancel = val + }, searchQuery() { this.pageNo = 1 this.getlist() @@ -337,8 +354,8 @@ } }, handleCody() { - console.log('复制') - // this.areaVisibleCody = true + this.drawerVisible = true + this.titleTag = '项目收集参数' }, pageOnChange(page, pageSize) { this.pageNo = page @@ -489,6 +506,9 @@ cursor: pointer; border-radius: 4px; } + /deep/.add-padding{ + margin-left: -89px!important; + } + \ No newline at end of file From ad1545ceb7e39a0fa5fa0502bbd6c733cff0a8ea Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 30 May 2022 16:20:48 +0800 Subject: [PATCH 11/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/App.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/App.vue b/jero-web/src/App.vue index 5b0de0a85..862267a30 100644 --- a/jero-web/src/App.vue +++ b/jero-web/src/App.vue @@ -133,10 +133,10 @@ } .itemModel-multi { - width: calc(100% - 130px)!important; - display: inline-block!important; - margin-top: 2px!important; - height: 40px!important; + width: calc(100% - 130px) !important; + display: inline-block !important; + margin-top: 2px !important; + height: 40px !important; } .itemModel-multi .ant-form-explain, .ant-form-extra { From 1e3c0f4c1343394c681841491c5fba5633eeab75 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 30 May 2022 16:31:50 +0800 Subject: [PATCH 12/23] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/static/home/wdcf.png | Bin 0 -> 570 bytes .../src/main/resources/static/home/wddb.png | Bin 0 -> 1000 bytes .../src/main/resources/static/home/wdfy.png | Bin 0 -> 1123 bytes .../src/main/resources/static/home/wdk.png | Bin 0 -> 735 bytes .../src/main/resources/static/home/wdsb.png | Bin 0 -> 1099 bytes .../src/main/resources/static/home/wdsc.png | Bin 0 -> 985 bytes .../src/main/resources/static/home/xmk.png | Bin 0 -> 743 bytes .../src/main/resources/static/home/xnqd.png | Bin 0 -> 1036 bytes .../src/main/resources/static/home/xxsj.png | Bin 0 -> 747 bytes .../src/main/resources/static/home/yjcj.png | Bin 0 -> 965 bytes .../src/main/resources/static/home/zswdk.png | Bin 0 -> 1001 bytes 12 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdcf.png create mode 100644 jero-boot/jero-boot-single-startup/src/main/resources/static/home/wddb.png create mode 100644 jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdfy.png create mode 100644 jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdk.png create mode 100644 jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdsb.png create mode 100644 jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdsc.png create mode 100644 jero-boot/jero-boot-single-startup/src/main/resources/static/home/xmk.png create mode 100644 jero-boot/jero-boot-single-startup/src/main/resources/static/home/xnqd.png create mode 100644 jero-boot/jero-boot-single-startup/src/main/resources/static/home/xxsj.png create mode 100644 jero-boot/jero-boot-single-startup/src/main/resources/static/home/yjcj.png create mode 100644 jero-boot/jero-boot-single-startup/src/main/resources/static/home/zswdk.png diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml index f7d54fc5b..a432a4de1 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -93,7 +93,7 @@ spring: mvc: static-path-pattern: /** resource: - static-locations: classpath:/static/,classpath:/public/ + static-locations: classpath:/static/,classpath:/public/,classpath:/home/ autoconfigure: exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdcf.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdcf.png new file mode 100644 index 0000000000000000000000000000000000000000..e1948c9b9ddfc83e1eb230b9dab4f6800fcb1ae5 GIT binary patch literal 570 zcmV-A0>%A_P)Px$^hrcPR9HvtnaxWZK^VrL=gr3S15y-`*j{?>t%{WNlnNd^_|JGK9;5_s?V&yN zst5)Tq9^}?9(w9Iw4k>lBBdS-#5V5kyk!l6kmh5uWXUef9+zike*4TjJI^o#fJ#-p zU&Ti8A-#gR1EY6od1MCqM}yWvquBUTWx#vbN6qPfq$h@dL`0{=8X%^h=FgoC*XUjS49PV*o;w51`a{yo&z>x&9 zGik>Y01i(9M!<&>$lDA6n_~d40q#k_cT)v6xo}g-;xGsT8vsfQ`~dKE6fnta@%ed_ zF4o3jJo6pE6Wh)$b(a#zilr7~)v)o*HvrFUI#=K)pmpK@an&f4U>P)Px&qDe$SR9HvtnO$fcRUF07`QJ&>T9i^1sv!6v`XHhrm8vf)ND(B}2qGFq3!)%O zsV{}1i1np~g7{RBYDEw~C|Ex#t&mz!q)=^r@&oDz2#P5hDv7(v-2ai;CT(Uro1I;f zF$+77_nv#^x99%v-aA|ZfDYfDV7z`2!t@XlXV$iCp45amSjVM9r+LTcDI2g;lb0Y( zZP`E;fh39Jf>o!e_ikB(q1uXN4Lb){Us0p>-E`TqD}z?)r6y|sjhFXCy0egd;H93e ze!~5Pn-b`%B%;C%gbxe2j^G*y0fgpx3q%ddwKcjW%^3NsOZ$UqtkW6k4A`6=lV<=t z2OwGCWp#lg!F4*PF)@;BDXs&w5yS~&*b2?m%Yt_V?6M4YYYFoS3-M++CtGUWRz}kv z6HYM>Y(_HeC45mDIC{9A)JFh93FFkFUxfrS3u=`FhmV2SW$+J6_?8ED*^2<4Xk+?4 zpd%oD2Y3a9agkpI#AB_-xrb3wca#3`q5?@vjzFiwM(xZ~tpol_Wd z>Xkr!ecpK5+8DJvnC@LvV3%bp`kH1_fyaXBNyz^=+b67c*p~oS&(qgLJsY4;@*d&B zDD4UK2NoOnFo3I@On)}n2rT_G*Io>qNhalbFa&*bPG2c7pEAa5A?Bafz?trZ!G^&! zo*7gf@Q0O(?Gkv5=8seij8~1mqZ?pA?--SxM=D)(#|^ge+-jeP-nNFh#TehM8W<8E3Koxa z_%HE`QFj5FsvH=^x8}GX=Kq%5I3#IPFdh1zHV%Nm0g_vQ_|I90;*xNHFBsz+`59TF zjUzfgAhUya;d5Nj_COtN^tuL};RgVNv+D08?aU`T+atR;0=bLsQ2BkX`Q zx{xV>LlVA#VVuG}BL4<()I9yTa7WC38*Es@=%OEfqQb3&-Y=5^fSRSe76Y-?PVcf$ z0laPWx7um5{?ZAbnd$H{pvOxXPZ+sASJwrDT((odl|gZ|)eJNb>j)Se7;^bb?Mef{ zlmT~woH&ouxzZVL6Zj~=T5vp#5dSI>LPOFS@T_YTHyG?bLD~6uRp!(5LKpZOpn?xe z8laTmL5tzdvLByw{#^l=O=Br^ec+`?b-rgm;eNtR3H0ElOwV0=_1eW^RwBK0b^9NL W{4jItRa6TA0000Px(9Z5t%R9HvtnN5h5WfaGM|MT2w1T(@?R4mCTidvXin{Y886iAz(pp8n=#v-y7 zeJuLKM9KuS41!5CH?7LdBq2#H5c>Xd(W>%;$tj`CW}NpqC*I49j@RqVJJVd7fq7P! z`<~~V-}}GkJ?Fgl5#`#mr#82@{gOn{?q;fgH%^whN2b<$sJ-`3IywrKuruKDDSd4= zP8geF^tAQ)G3eIZU7t;t`IPYtJHQrhJ({;`@9goG2Imv6Ob=c0(f&CTLEQnyN#Iuh zT9XP-D%_wz<&?;5_YgOGUJoX5*+S?os4#@TM>ugI-?q~Ie^m_5L? zO#-|VSf}vqz(tMMg|=G66aB!C0Cxh{0biMX#Ymw?3w#1NF6axiC5+9=@d3tEq7FTC zK=HxAb?C^6RC|z!QuX&zuyQ0Sj}lm&xLz{({K9n1!n-VVV;KKr%FnhFm{)={0uR7t zV>`jk;jySD9jyvII^c*6meMwNKM=4*Zfh_<7;vB#+?B_nPadl6JfMzTtqgqGsXkF6&L9qNTvVMlaGjtNHSP@1w9U zEahb~x+2>rnD08B5`(HlRj8rtMwb%sD^QlCn}BUWS}pRA^*|AakY=4JbMdBy-gU89 zQ7?a|R|rX*jIbRkysOF$jTU&Y?@f4KgQbJO)N_JHY(P2*)JxlW)~6}B=fVJskL9s5 zq!*jjVc=DWKS0k60o0X(N?o+F!Y=j&%&(%t**1C|_zmLOA@&|l!L3z%R|d|CPSEXD zoSv1ZuuA9}h$RGlh#Q*t7<=FX=144;xRg-SX)W*`P)|Ql`Txex3U!xLo<*@#q`$M+ z(f_ax<{o?CD#|*3eMpPX*s5&NE0A`O^|Ys$X3#;z+6I6B4{$a;O2lK0H)p}pES8A4 z*c2N*>~o-PkX>tli-_4Wbs~M3JT^3fIXo2N$%Y*Mt`^*pjjaTpg5?8qM9YD5jcH`Q zMI1@aZB>AQms7AlWS5op3je);6%wmk4qOH(#2Udeq_vGIH&M9PzXMP;zfkrdogWmDzG(ac%-5JpWi&Etns;VeBc zOh-E((}e+Uj9zap#yULa*XOX|S83A=Y)Zkl;mzScDO@GMSldhjkF}zW{w5WkRJcKb piFYV7;f}o~+`(c!MJCYE?Z1|zAAhUB=I8(b002ovPDHLkV1feoEtdcQ literal 0 HcmV?d00001 diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdk.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdk.png new file mode 100644 index 0000000000000000000000000000000000000000..9eec0396ebfb1dcc2b2112b90ba5dae01b9f1e27 GIT binary patch literal 735 zcmV<50wDc~P)Px%nMp)JR9HvtnLlV0K@`S+-|WSUjfg}Z zNiC8}O<_<$8x6!Z2pUPmKb@e0wxWVj6f7iXZs*CaiH77Z%qBT+4{podxAT7Qn~&W$ zGa|Xh#|!PH;<|`((L1N~UQRCOy~PwtABv?Pbas}Nz;1-L)|nQU6UK@d(=9Xp3w%}k z*wYPizBSLVb8P0_w6={+Y|fhvs)?7_Lt7s_+0qE=&M`KDYdu>{g_{a5P#}{fVzUmM zdJMfPm<`2Z5VRM}7Aq?udmDNBDybejox*$j-{($CuS2|k4yuxxCb0uBGJppI93r@>IEA} zap6V5IJwHeJOp+v7kI|`^$~89^Sn#Oi01(VpCV)5Dg)~=*!JZBmz=d0Om~4D2HgeY z`2ygNkx|`R^D4<;3C5FzS%8zNhNxSLuV5Tb-xc5SIxYNelP=G)bPbL=>R(GW(lF&&g^`ssEq0asm0Ei5{?f%oE&L9%K{ zy6_v3S$|oK3JzpYvSO&2oh_h|ka2>6lflZ+1=cI)CL?cyvA725TCBn{f64U8rg;o} zHnTgSu&Gqd-OG@9T|rD!;T4D%^lDS#AemMW)Od$74R`F-a0iR2of_!q_BWjtyKvB} R2><{9002ovPDHLkV1h44M{588 literal 0 HcmV?d00001 diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdsb.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdsb.png new file mode 100644 index 0000000000000000000000000000000000000000..5948fd0bd70cd2349cf17ec5e99b2e61d0185194 GIT binary patch literal 1099 zcmV-R1ho5!P)Px(1xZ9fR9HvtnOlfeRT#&A|F!lwYSBegvNSO$48g7h6%o@zL3Gcug0Kr+q$rCD zdgwxg)KgH8flt+gK9vL_ln`R&*u}Dfj6f5|?-^B-VDim#l>j{XTB4 zYcLlAJEFO=M6Wo)wde=(SMl>`?#SY`TsbidNe(({m#1XM7($)2zjFOoYyK;shk-rO zTr}Fin}M@!Z?4d7SvbQ9sjfNS|R&;uoo{{9vn>xU58{8{jR#9AHZ{w`B2#cvdu_yBQ<%Yj_p$5U@86cWuWU-2fln z`~*F3`zga0!r!(!uiWBn#ry$WH%y@IcG@Z_XXfi@ZXC{#+uhojG(YVKkF=L5@Hpn~ zlzdku?MmV;i%WyTQirh9Lyc94^OMuE9>Vq{y`MpYeQz^E@RG!%W7A&3dc>mKY}cvo zo1!?_DSu93x0ec?-uH!; z=r`bg=cY$kYHlu9$He!YoaWU4u{`0Vym1vhmkakb&(gB-}#Ge>F>Yx!KzYM{Ld%{!C>w)=5- zyOMt{fo;CNr6o}+IM#NPz>^U^Bm$EqG3F&P;SOac+_Be$J6LSi+ypwh{SQTA>~Qb7 RFpK~I002ovPDHLkV1k|a4YdFO literal 0 HcmV?d00001 diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdsc.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdsc.png new file mode 100644 index 0000000000000000000000000000000000000000..8cb017b4cb763617c541130792d41831d49f87f0 GIT binary patch literal 985 zcmV;~119{5P)Px&lSxEDR9HvtnNMh3RTRd*@7((`HpMKgv_!h_AO3?Dr3;C;XbA>U)S{?hQA80z zYEcl22pVyrL8zc2QYdcJLZypJ6r@e4ASjB9;-V@o1^-YgE^KPrj&tw*I{R`QL|ThE~y+(%)eItXq~1K<5<7YiEXL4v#bN0_@=I zr6tk21#&5lGL_bzUHu1d*me4nQpI1?&9HN99^H)xbJY411r)J%F^?awh}zZU@y1R^|k}2EZqy??fEez?PPQxvW~6-st9sS$~r09_6=b>NqPUkH3l>6-|C?V}wl0$&(7WqKOYGXPfN>|BQQjzzbt z9&~YFpMC&valM2s?4Pk<*VT(J4xDK>q&w>+Y+--Of-M?})%gkohfHfs`Ut=^00vqB zTNEnbXTr8xz^Qt93j^ngn1#VauA}IabQNT`f*Ju(_f^&a`76mD@DWGq!Cqi!^cSh( z=^VmsN$#Xe;TYv-<#D5!9*1x{fWab#=QY9(i?+XLOvAttH2Sn1&`tn)!3oK4p;9CWR^OA;v=OU9&d7=9j6#M?)(KH#I?kDwX&8b36Tg4u31h%P` zm@6Q!?SfudRFM3XAwDZ}SAu#U!0^&g++%?+bqqNAG)~}&WnfO2rELN%MIIorW(nPX z3$~+^z;6(Es7ArxlI$L190r)5;#O5@Keu3ybqqK;y$32k^en%GA7O5kDQputQ6>D+ zf<4$dV4w2eo-OqX64=XN&!sGV2x0SodVOcX-CZxfdcUbDkus8qpGnxbR6zpA1s)c3 z3xVq)Jt^r3&AtFo%3}l^MQ~#dN{v9b6Zky9Lx3h@jE6F1=in@h40jl?j=^>(ANMSn z(LX7;(T)J;jwGj1Kre!b0H#Ila}{^ImRm8?MoO>eAE3l{UF64&xZBbkZnRLl^i8!y zyNWlHrw`nWYmLP89d5*}X0*L`DbsV;UOjiQnD?P)Px%p-DtRR9HvtnY(KgQ5431=kDEXP!lC+eBh%J;-e4?OCcy?XD3>THda1BQ51v- zVyT6dsDFWt7D5m)V4;l&7I`!lib_c0BME3i=H4TdM-xnP?q)aHg`H+#_`dJ{ICEwW zGgkn*dV2i!$@bQOl)Q72U#pcPi%|>c6Y{XTZ)>f!!9vB$+e4nb9N1P5)tzH(09X5NH7eYw@Vp9? z-4d$VRe_U06QBu|6@f1y>N!^^jwJY|rDXw&W_K0Nq%Jm3|2lJ=_3E>foFrghn2-?s z1y!!6EV7VR;He9GBlzN9YhDtt3)&Q2I0aI&F0iOhX>zL1V!?m2<|P4JL#wGv1fJS2 z&|XQP82P0!essPREx8H6;TEdr^9R)uoTABlS;b$rcW66!Civx`g+zX1&0MB|-;Lj>i~&OzVoS#YK4z>|Vn68}a*A12{wT zeq?ZZD#1G7G&ASLj;a6;040n>E5P%6*)FXYrVUEnzF6Ndi`lha6#NWx?dTihpa(Gy`kQE{Sl>8l0w+E~N0t z;xPlG*#}^=B{Wqd(5vE)S$rwL)f~+Oh(A(kV9TT%67-@-As^2up-ojD7$#&t;*YKd z@F?gNgr75$PMTG@2W(jarYgYIoOD%biC2JWd|GbpJk5K=pRoAM51r`LK}GJ&PP$6{ zOU}PCh7@j#_%{^=wuG&O#$4f*fU&I60JcTcVs?lupR-pg@ literal 0 HcmV?d00001 diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/home/xnqd.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/xnqd.png new file mode 100644 index 0000000000000000000000000000000000000000..27d19d0a4a82e00ecb72b0c3a2da2ff0c7a76d68 GIT binary patch literal 1036 zcmV+n1oQieP)Px&#z{m$R9HvtnN4V2MHI(>|CxL9l2mJ3L!qLAxD(VC1uZD}fe0>irzqklh)P{3 zXpDli;-a;X>L!AqxTp)og`W!%rHCMEMbVXl%Nhu_+Gv_4Z)T3n^SvYuX}ve(y(W-> zw;9fy`@84<=bSTd1aQM{D<(EhZX8h2NV6!01A-q{Pl&9I4zw64754a4IE>vwd=|bXLv~Q!^E5 z1lYASlpS=z54(nn5JP`b3XZ-R*EFm9619P287~!X80<<+o6Q*WQLm)JUIcr1NdV(r z7u}P|$NP|mfoX$Z!A5=XhwDJs0?x3Q4hk-wdx-c#Aw8;6LzcAHU^|c_mw&lG`AxDt zYWnYzPX`cp&I4-7u={;*Usr{$2VA86f_oM_m+Toe{o8ro6gH&3{~9SpEK*FD!D1@x zCa^K!+=c4}Un;n}y8@gF`wHxmC7k~)7)^=y%F<7!pjM0O3bQ6*K*8OH>}g=z5^Kj@ za94K;IQ zC&LAqAw&8)nc{2!cfj8lw%^d+&gZU@DS8P!A^6pn@e&8#wEsr`H%7usw==%op#f%R)o6= zQq}i5aMegH*KR$+%Z*&sb!+cZX3brDt+|WEtev%Vb^9+hZXGN7lpn7E0000Nj literal 0 HcmV?d00001 diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/home/xxsj.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/xxsj.png new file mode 100644 index 0000000000000000000000000000000000000000..0d49e11dbec309b3a54aabada093d622c80e5e6c GIT binary patch literal 747 zcmVPx%rAb6VR9HvtnZIikK@`V7Z)P_!77-+cNaI1S9w#SZE;xgeZ83 zQ34i%2nu3StHdhU2>yWBDgjNQh!$Fil|Q1%&d!s)%jNEJC$}-Tx(7Gi&b*!Z?04RK zGdm*yS~wCwcP}B`1YVN5+!SY&h-Fy*DupLbim+ShLqn4r$VMO%d6xJhS{U9=kKdAO z*fQKt^GkGccxUe1;7{r~qoPwoyV^qCRmcu-*0a@7xTEko1+sMs7wxIQF|y9S0e$ffFuZ&F%aFJ3j_oYXG){_%Uqoax>7a zSD47)>>XgJ4oqd5P|oKJ7>MG2MCO3LRk#(DtEicwiy!#|PKZiDcO6&&nIMoCn*lAq zn}JJIVMXy#tbc?Fms$av^szDEC_V@THG^Auk1-!p0Xf}|`raB_V?Seglj{8q13Ui? z=&tEpxlCwotkuQ-0I^@BEBICi;e6uP1MBJ^5SUY00WSiz3Mm%}&8^~qk?uwGG4KJA zDQq$DD#ht6XfjJxMeh>WGg$$@2DYtJxB~2aqV!0mUFX4ELCpf8#^ee((nE;eZ=lpC zgh8zNo)2KOfHl*^`V`nx2P~Y!nwesKE)*^UJ1!x54Cq;d7GB|Xn9yo|fUARU#qYx~ z0Sp!aRgV+e`Lz$og~HXqWwOYRfDRDaLjJNuwU0K-P0rr~4*%b@26G6{Kq^OF>PtQ= zrgTnMenw8#2j;)d!_8D}+TH=KURr(qO4n4uW(L_Roc#G#@@zAfRP8!TU{9wq{fph& z!@A8++L0RDB|$kyU?$Ucv$6ef+FmoX>i}mcZYi~Q4zx3txD6FPx&e@R3^R9HvtnN4V%RTPGw_kI%-#UIqBtx{VAp#|{=L_~2D5!@6(RFt9%D{3n! zqTOf{sf?+mS{G9MS?Iz=7D7u22-StHB2f@51u4{>KO38XU@T3{-22KMCpDQS?U!gK z6PUaFc)xR=@4aWvxx*EC9XV22H`#r8L9IK5p!%~mSs^7yDwDr5ayF<`u$@k9676lx|7U0c=CYz;~ z_7%x*FEqv?fxQd#6ky<};g=xJKiVyuv>J3TPyoY)+1?W18oVm;3{XRCv(hnQI2YJ9 z73YsasbcVY@DOl`;9xM%wFX!W2(~qnjRU7M(;Ueo=rlOjZ3e##$dgrq1HnAsYT$&u zUxZ^x^&j8A%V`3!QD_Iy-3+!|z)@ze?Qa~yMKhra`%Dryf_H+hXgP3HSW`ItmJ>&* z3f{WV?QGJ2T9~Kvvy|Lhw#Ak15;bv9_)uYe9HslfxvgEjNa#O-*9tQf@dLn?0zF(N zR%zfUjyC{5QS=+G&MaU>NN86P zbv#wl3;eUSvww7RXCDfLJxOV;O;vD5L-tc)?piY7M&R7a-c_aY4z;O!j0S)k=1F=A zX%MGFwjPssv8kL|0^DHpX94y&@;ikF3=hs8!F(aqpJMt;Vh7Trb9_`Qf$Ql{fnG1{ z14(+qI6K&5`~3>qR}1vXRDtW~*@2b=XO0?q+$s&GRIEi_CF_Kho&`OgKj1tyx-7uc zJSQdfhvbo3@Mc->!37RRu&lrtd|c8;vObKCw@P{i*wn5LpXD+f4e&D2XHuYF(nIZ3 z!}A$9YI`s_4F`q$8*Z;|5-)p6oCBXvXGB+3aAhK&MYwy0sQrK&a6j6rs^agcc`H&L z%@+ed7v|3Yd(wRmtSJ-p0-8ze4+3d_RB@B2_viJ6*;poa`Lje|7;{^hpd~fmlDu0* z7y}*&$$QJZR~}fp9o*k=IS+~dy7J$pF-ZftXO|6D8n|r0rPg(TI}SHF&?$)}FNqa* nDYN3Py;j`CV!h^8(ADkV<1@K%?(_8B00000NkvXXu0mjfAYHTd literal 0 HcmV?d00001 diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/home/zswdk.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/zswdk.png new file mode 100644 index 0000000000000000000000000000000000000000..43be627ea2f019c1b8c1941fd2811da266940784 GIT binary patch literal 1001 zcmVPx&qe(CwzkfNZmqbBp-{p2O7jpIya-sD9l zFn2j~&Ub$Ad*_||9@hXi?pEni-$dUsEA_@HEc>lfmiM4Pl}z?e^i3S!ZHZ08F0ZWW zm3gN?*5jBo#r{98{n^&-`R&HuYU!FzhP}czSx)}44R2M}bXprUGB0ZnyZ4RCEla`O zD~w&>#lBlzhr15fI8bOyq`m2Nq`ujtVT=`Kd@kZaua+(p<$NK)3fzjN+XT;m-ChIt zJ7~=02Q0Pk7Ye>0;25+XkHg5G1XebINra9$_MRpFO}pT^fm6&q#6g*!2Q~pAZ*hqe z<{U6fj@neuRG$2nfwTU!)Smzi1NY@A(kNE&1L*xA8zc2!ThVL^9LvdVC_D{us7`;j zQloi{aRF&mQKKQ2ew;6%A+SpEVVR8}4FW5gS1lsKDj3Hh?(=FmRZnp~;MWDaionRN zA-(Bo*pmx*I=HNLQhZL>Q!Pw^++1}MzE$Ma5dBOev8FwoC1!J0q(hi(1J)Knc2&d9 z89FK00s6p`@LF3vT=#bL#FeS+aTIreZCDVv*(nnriFia&H<;4#@gJ1jT~ig=+XB zk5+DnV~7u8%==)p3SelbB_W#*Ew9|bsV8gA{p;*aqva~~0~14omW1&f0| literal 0 HcmV?d00001 From 9269eba73fb80c9ff5c96bc05d895f46d1350f99 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 30 May 2022 16:38:49 +0800 Subject: [PATCH 13/23] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E5=A4=8D=E5=88=B6-=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsManifestEOController.java | 2 +- .../ocr/controller/OcrRecordEOController.java | 46 +++++++++++++++---- .../jero/modules/ocr/entity/OcrRecordEO.java | 4 ++ .../split/entity/SarFileSplitInfoEO.java | 3 ++ .../impl/SarFileSplitInfoServiceImpl.java | 8 ++++ 5 files changed, 54 insertions(+), 9 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java index c0b52a993..ee728309c 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java @@ -223,7 +223,7 @@ public class ParamsManifestEOController extends JeroController getAllManifest(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java index 81430dfea..2f78c3d92 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.ocr.entity.OcrRecordEO; @@ -82,18 +83,42 @@ public class OcrRecordEOController extends JeroController syncToDocument(@RequestBody OcrRecordEO ocrRecordEO) { + String cut = ocrRecordEO.getCut(); if(StringUtils.isBlank(ocrRecordEO.getConnectId())){ - return Result.error("同步失败"); + if (CutEnum.CN.getValue().equals(cut)) { + return Result.error("同步失败！"); + } else { + return Result.error("sync failure!"); + } } + + // 文档库删了识别的pdf文件时 + LambdaQueryWrapper pdfFileLambdaQueryWrapper = new LambdaQueryWrapper<>(); + pdfFileLambdaQueryWrapper.eq(OSSFile::getConnectId, ocrRecordEO.getConnectId()); + List pdfFiles = ossFileService.list(pdfFileLambdaQueryWrapper); + if (CollectionUtil.isEmpty(pdfFiles)) { + if (CutEnum.CN.getValue().equals(cut)) { + return Result.error("文档库已不存在转换前的pdf文件，同步失败！"); + } else { + return Result.error("Document Library no longer existed before the conversion of PDF files, synchronization fails!"); + } + + } + //查询doc文件的id - LambdaQueryWrapper ossFileLambdaQueryWrapper = new LambdaQueryWrapper<>(); - ossFileLambdaQueryWrapper.eq(OSSFile::getUrl, ocrRecordEO.getDocName()); - List ossFiles = ossFileService.list(ossFileLambdaQueryWrapper); - if (CollectionUtil.isEmpty(ossFiles)) { - return Result.error("没有可同步的文件"); + LambdaQueryWrapper docLambdaQueryWrapper = new LambdaQueryWrapper<>(); + docLambdaQueryWrapper.eq(OSSFile::getUrl, ocrRecordEO.getDocName()); + List docFiles = ossFileService.list(docLambdaQueryWrapper); + if (CollectionUtil.isEmpty(docFiles)) { + if (CutEnum.CN.getValue().equals(cut)) { + return Result.error("转换后的word文件不存在，同步失败！"); + } else { + return Result.error("Converted Word file does not exist, the synchronization fails!"); + } + } OSSFile ossFile = new OSSFile(); - String docFileId = ossFiles.get(0).getId(); + String docFileId = docFiles.get(0).getId(); ossFile.setId(docFileId); ossFile.setConnectId(ocrRecordEO.getConnectId()); ossFileService.updateById(ossFile); @@ -104,7 +129,12 @@ public class OcrRecordEOController extends JeroController> bussDocumentLibraryEOList = bussDocumentLibraryEOService.getListBySerialNumber(splitInfoEO.getSerialNumber()); + if (CollectionUtil.isNotEmpty(bussDocumentLibraryEOList)) { + splitInfoEO.setDocumentId(bussDocumentLibraryEOList.get(0).get("id").toString()); + } if(StringUtils.isNotEmpty(splitInfoEO.getFileId())) { splitInfoEO.setFlag("1"); }else{ From 957de2dcf0850af88b020ff3583dc374fa1848fd Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 30 May 2022 16:42:09 +0800 Subject: [PATCH 14/23] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9=E8=B7=9F=E8=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/service/impl/NcrTrackServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java index b31df7887..3079f494d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java @@ -54,9 +54,15 @@ public class NcrTrackServiceImpl extends ServiceImpl @Override public List getPageInfo(NcrTrackVO ncrTrackVO) { if(StringUtils.isNotBlank(ncrTrackVO.getSerialNumber())){ + if(ncrTrackVO.getSerialNumber().contains("%")){ + ncrTrackVO.setSerialNumber(ncrTrackVO.getSerialNumber().replaceAll("%", "/%")); + } ncrTrackVO.setSerialNumber(ncrTrackVO.getSerialNumber().replace("*","")); } if(StringUtils.isNotBlank(ncrTrackVO.getTitle())){ + if(ncrTrackVO.getTitle().contains("%")){ + ncrTrackVO.setTitle(ncrTrackVO.getTitle().replace("%","/%")); + } ncrTrackVO.setTitle(ncrTrackVO.getTitle().replace("*","")); } List sysUserList = sysUserService.list(); From 70e7388baafbee3411081448d277e58878774128 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 30 May 2022 16:46:36 +0800 Subject: [PATCH 15/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/components/engineeringConfirmation.vue | 2 +- .../processCenter/components/reviewedByThePersonInCharge.vue | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue index a3467523e..cc447a406 100644 --- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -3,7 +3,7 @@
{{$t('engineeringConfirmation')}} -
diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue index e7ebead41..67239e72e 100644 --- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue @@ -1,11 +1,12 @@