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 1cf79dd80..43131689a 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 @@ -2079,8 +2079,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl list = this.list(); List serialNumberList = list.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); String serialNumber = (String)map.get("serial_number"); + String category = (String)map.get("lei4_bie2"); String id = (String) map.get("id"); String title = (String) map.get("title"); + String titleEn = (String) map.get("title_en"); //通过id查询数据 List> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id); if(dataList.size() != 0){ @@ -2094,7 +2096,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl dictItemList = sysDictItemServiceImpl.selectItemsAll(); //编辑时处理首页文档动态 1. 标准XXXX的状态改为 2. 标准XXXX的适用车型改为 3. 标准XXXX删除了XXXX文件 4. 标准XXXX上传了XXXX文件 - homeDocumentDynamic(cut,map, serialNumber, id, title, dataList, fieldList,dictItemList); + homeDocumentDynamic(cut,map, serialNumber, id, title, dataList, fieldList,dictItemList,category,titleEn); try { @@ -2401,7 +2403,20 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> dataList, List fieldList, - List dictItemList) { + List dictItemList, + String category, + String titleEn) { + 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 = ""; + } //文件类型字段 List onlCgformFieldList = fieldList.stream() .filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); @@ -2411,10 +2426,17 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl" + serialNumber + ","; + "&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "" + " " + titleEn; + + StringBuilder msgContentSb = new StringBuilder(); + StringBuilder msgContentInfoSb = new StringBuilder(); + //适用车型 + StringBuilder msgContentSbCarType = new StringBuilder("Applicable Models of the " + category + " " + serialNumber + " " + titleEn); + StringBuilder msgContentInfoSbCarType = new StringBuilder("Applicable Models of the " + category + " " + href); + //状态 + StringBuilder msgContentSbStatus = new StringBuilder("The Status of the " + category + " " + serialNumber + " " + titleEn); + StringBuilder msgContentInfoSbStatus = new StringBuilder("The Status of the " + category + " " + href); - StringBuilder msgContentSb = new StringBuilder("标准" + serialNumber); - StringBuilder msgContentInfoSb = new StringBuilder("标准" + href); List fileIdLIstTemp = new ArrayList<>(); for (Map.Entry entry : dataList.get(0).entrySet()) { @@ -2477,14 +2499,21 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl "state".equals(e.getDictCode()) && finalValue.equals(e.getItemValue())) .collect(Collectors.toList()); if(stateDictItemList.size() != 0){ - if(CutEnum.CN.getValue().equals(cut)){ - value = stateDictItemList.get(0).getItemText(); - }else{ - value = stateDictItemList.get(0).getEnName(); - } + value = stateDictItemList.get(0).getEnName(); } - msgContentSb.append("状态改为" + value + ","); - msgContentInfoSb.append("状态改为" + value + ","); + // + if(StringUtils.isBlank(value)){ + msgContentSbStatus.append(" has been modified to be empty ,"); + msgContentInfoSbStatus.append(" has been modified to be empty ,"); + msgContentSb.append(msgContentSbStatus); + msgContentInfoSb.append(msgContentInfoSbStatus); + }else{ + msgContentSbStatus.append(" has been modified to " + value + ","); + msgContentInfoSbStatus.append(" has been modified to " + value + ","); + msgContentSb.append(msgContentSbStatus); + msgContentInfoSb.append(msgContentInfoSbStatus); + } + } //适用车型 car_type if("shi4_yong4_che1_xing2".equals(key) && !value.equals((String)dataList.get(0).get("shi4_yong4_che1_xing2"))){ @@ -2509,9 +2538,18 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl