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 43131689a..2f3131edc 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 @@ -170,6 +170,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> mapList = bussDocumentLibraryEOMapper.selectMapsAll(StringUtils.join(ids, ",")); + List dictItemList = sysDictItemServiceImpl.selectItemsAll(); + + List connectIdList = new ArrayList<>(); for (OnlCgformField onlCgformField : fieldFileList) { @@ -202,14 +205,28 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map : mapList) { String id = (String) map.get("id"); String serialNumber = (String) map.get("serial_number"); + String titleEn = (String) map.get("title_en"); String title = (String) map.get("title"); - //文档动态------------------- - String hrefTemp = "" + serialNumber + ","; + "&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "" + " " + titleEn + ","; HomeDocumentDynamicEO homeDocumentDynamicEO = new HomeDocumentDynamicEO(); sbTemp.append(hrefTemp); - serialNumberListTemp.add(serialNumber); + serialNumberListTemp.add(category + " " + serialNumber + " " + titleEn); //--------------------------- if (documentIds.size() != 0 && documentIds.contains((String) map.get("id"))) { serialNumberList.add(serialNumber); @@ -219,12 +236,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl userIdList = domainUserRelService.queryDomainUserRelInfo(mapTemp); String title = (String) map.get("title"); String serialNumber = (String) map.get("serial_number"); + String category = (String)map.get("lei4_bie2"); + String titleEn = (String) map.get("title_en"); + List dictItemList = sysDictItemServiceImpl.selectItemsAll(); + if(StringUtils.isNotBlank(category)){ + String finalCategory = category; + List stateDictItemList = dictItemList.stream() + .filter(e -> "type".equals(e.getDictCode()) && finalCategory.equals(e.getItemValue())) + .collect(Collectors.toList()); + if(stateDictItemList.size() != 0){ + category = stateDictItemList.get(0).getEnName(); + } + }else{ + category = ""; + } Set technologyTerritorySet = new HashSet<>(); String technologyTerritoryId = ""; @@ -2030,13 +2062,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl" + serialNumber + ""; + "&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "" + " "+ titleEn + " "; //文档动态, 文档库中新增了标准XXXX homeDocumentDynamicEOService + //The standard GB 7258-2017 Technical specifications has been added to the document library. HomeDocumentDynamicEO homeDocumentDynamicEO = new HomeDocumentDynamicEO(); - homeDocumentDynamicEO.setMsgContent("文档库中新增了标准" + serialNumber); - homeDocumentDynamicEO.setMsgContentInfo("文档库中新增了标准" + href); + homeDocumentDynamicEO.setMsgContent("The " + category + " " + serialNumber + " " + titleEn + " has been added to the document library."); + homeDocumentDynamicEO.setMsgContentInfo("The " + href + " has been added to the document library."); homeDocumentDynamicEOService.save(homeDocumentDynamicEO);