diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java index 7b4fb596f..d8ddb7dd4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java @@ -186,13 +186,13 @@ public class DummyInventoryInfoEOEn implements Serializable { private String designDeliverableTemplateName; /**设计符合性确认-发起人*/ - @Excel(name = "design-Initiator", width = 15,dicCode ="fa1_qi3_ren2") + @Excel(name = "design-Initiator", width = 15) @ApiModelProperty(value = "设计符合性确认-发起人") @Dict(dicCode ="fa1_qi3_ren2") private String designInitiator; /**设计符合性确认-责任人*/ - @Excel(name = "design-Assignee", width = 15,dicCode ="ze2_ren4_ren2") + @Excel(name = "design-Assignee", width = 15) @ApiModelProperty(value = "设计符合性确认-责任人") @Dict(dicCode ="ze2_ren4_ren2") private String designDuty; @@ -213,13 +213,13 @@ public class DummyInventoryInfoEOEn implements Serializable { private String prehomoDeliverableTemplateName; /**prehomo确认-发起人*/ - @Excel(name = "Prehomo-Initiator", width = 15,dicCode ="fa1_qi3_ren2") + @Excel(name = "Prehomo-Initiator", width = 15) @ApiModelProperty(value = "prehomo确认-发起人") @Dict(dicCode ="fa1_qi3_ren2") private String prehomoInitiator; /**prehomo确认-责任人*/ - @Excel(name = "Prehomo-Assignee", width = 15,dicCode ="ze2_ren4_ren2") + @Excel(name = "Prehomo-Assignee", width = 15) @ApiModelProperty(value = "prehomo确认-责任人") @Dict(dicCode ="ze2_ren4_ren2") private String prehomoDuty; @@ -240,13 +240,13 @@ public class DummyInventoryInfoEOEn implements Serializable { private String verifyDeliverableTemplateName; /**验证符合性确认-发起人*/ - @Excel(name = "verify-Initiator", width = 15,dicCode ="fa1_qi3_ren2") + @Excel(name = "verify-Initiator", width = 15) @ApiModelProperty(value = "验证符合性确认-发起人") @Dict(dicCode ="fa1_qi3_ren2") private String verifyInitiator; /**验证符合性确认-责任人*/ - @Excel(name = "verify-Assignee", width = 15,dicCode ="ze2_ren4_ren2") + @Excel(name = "verify-Assignee", width = 15) @ApiModelProperty(value = "验证符合性确认-责任人") @Dict(dicCode ="ze2_ren4_ren2") private String verifyDuty; 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 e25515084..12c628f4f 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 @@ -1539,7 +1539,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl fileInfos = getOssFiles(dataList); - //数据转换(文件名称,技术领域,对应标准) + //数据转换(文件名称,技术领域,对应标准,发起人,责任人) dataTransition(dataList, fileInfos,dummyInventoryInfoEO); OutputStream os = null; @@ -1714,6 +1714,11 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl dataList, List fileInfos,DummyInventoryInfoEO dummyInventoryInfoEO) { //技术领域 List sysCategoryList = sysCategoryService.list(); + //普通数据字典 + List dictItemList = sysDictItemServiceImpl.selectItemsAll(); + List sysDictItemInitiator = dictItemList.stream().filter(e -> "fa1_qi3_ren2".equals(e.getDictCode())).collect(Collectors.toList()); + List sysDictItemDuty = dictItemList.stream().filter(e -> "ze2_ren4_ren2".equals(e.getDictCode())).collect(Collectors.toList()); + //文档库数据 List correspondingStandardIdList = new ArrayList<>(); for (DummyInventoryInfoEO inventoryInfoEO : dataList) { @@ -1722,33 +1727,49 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); -// lambdaQueryWrapper.in(BussDocumentLibraryEO::getId,correspondingStandardIdList); -// List bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(lambdaQueryWrapper); for (DummyInventoryInfoEO inventoryInfoEO : dataList) { - String correspondingStandard = inventoryInfoEO.getCorrespondingStandard(); String technologyTerritory = inventoryInfoEO.getTechnologyTerritory(); String designDeliverableTemplate = inventoryInfoEO.getDesignDeliverableTemplate(); String prehomoDeliverableTemplate = inventoryInfoEO.getPrehomoDeliverableTemplate(); String verifyDeliverableTemplate = inventoryInfoEO.getVerifyDeliverableTemplate(); - //对应标准 -// if(StringUtils.isNotBlank(correspondingStandard)){ -// StringBuilder sb = new StringBuilder(); -// for (String s : correspondingStandard.split(",")) { -// List collect = bussDocumentLibraryEOList.stream() -// .filter(e -> s.equals(e.getId())).collect(Collectors.toList()); -// if(collect.size() != 0){ -// sb.append(collect.get(0).getSerialNumber() + ","); -// }else{ -// sb.append(s + ","); -// } -// } -// if(StringUtils.isNotBlank(sb)){ -// String substring = sb.substring(0, sb.length() - 1); -// inventoryInfoEO.setCorrespondingStandard(substring); -// } -// } + //技术的发起人,责任人 + String designInitiator = inventoryInfoEO.getDesignInitiator(); + String designInitiatorPerson = getPerson(dummyInventoryInfoEO, sysDictItemInitiator, designInitiator); + if(StringUtils.isNotBlank(designInitiatorPerson)){ + inventoryInfoEO.setDesignInitiator(designInitiatorPerson); + } + String designDuty = inventoryInfoEO.getDesignDuty(); + String designDutyPerson = getPerson(dummyInventoryInfoEO, sysDictItemDuty, designDuty); + if(StringUtils.isNotBlank(designDutyPerson)){ + inventoryInfoEO.setDesignDuty(designDutyPerson); + } + + //pre的发起人,责任人 + String prehomoInitiator = inventoryInfoEO.getPrehomoInitiator(); + String prehomoInitiatorPerson = getPerson(dummyInventoryInfoEO, sysDictItemInitiator, prehomoInitiator); + if(StringUtils.isNotBlank(prehomoInitiatorPerson)){ + inventoryInfoEO.setPrehomoInitiator(prehomoInitiatorPerson); + } + String prehomoDuty = inventoryInfoEO.getPrehomoDuty(); + String prehomoDutyPerson = getPerson(dummyInventoryInfoEO, sysDictItemDuty, prehomoDuty); + if(StringUtils.isNotBlank(prehomoDutyPerson)){ + inventoryInfoEO.setPrehomoDuty(prehomoDutyPerson); + } + + //验证的发起人,责任人 + String verifyInitiator = inventoryInfoEO.getVerifyInitiator(); + String verifyInitiatorPerson = getPerson(dummyInventoryInfoEO, sysDictItemInitiator, verifyInitiator); + if(StringUtils.isNotBlank(verifyInitiatorPerson)){ + inventoryInfoEO.setVerifyInitiator(verifyInitiatorPerson); + } + String verifyDuty = inventoryInfoEO.getVerifyDuty(); + String verifyDutyPerson = getPerson(dummyInventoryInfoEO, sysDictItemDuty, verifyDuty); + if(StringUtils.isNotBlank(verifyDutyPerson)){ + inventoryInfoEO.setVerifyDuty(verifyDutyPerson); + } + + //技术领域 if(StringUtils.isNotBlank(technologyTerritory)){ StringBuilder sb = new StringBuilder(); @@ -1787,6 +1808,27 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl sysDictItemList, String designInitiator) { + if(StringUtils.isNotBlank(designInitiator)){ + StringBuilder sb = new StringBuilder(); + for (String s : designInitiator.split(",")) { + List itemList = sysDictItemList.stream().filter(e -> s.equals(e.getItemValue())).collect(Collectors.toList()); + if(itemList.size() != 0){ + if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ + sb.append(itemList.get(0).getItemText()+","); + }else{ + sb.append(itemList.get(0).getEnName()+","); + } + } + if(StringUtils.isNotBlank(sb)){ + String substring = sb.substring(0, sb.length() - 1); + return substring; + } + } + } + return null; + } + /** * 模板名称转换 * @param fileInfos