WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

Browse Source
This commit is contained in:
范强强
2023-03-24 14:13:12 +08:00
parent bd8dd3bfed f988892474
commit bf6e7c4f21
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+11 -2
View File
@@ -795,12 +795,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
areaName = onlCgformAreaTemp.getEnName(); areaName = onlCgformAreaTemp.getEnName();
} }
List<OnlCgformField> fieldListTemp = fieldList.stream().filter(e -> onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList()); List<OnlCgformField> fieldListTemp = fieldList.stream().filter(e -> onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList());
OnlCgformField phasedOnlCgformField = new OnlCgformField(); /*OnlCgformField phasedOnlCgformField = new OnlCgformField();
phasedOnlCgformField.setId(UUID.randomUUID().toString().replace("-", "")); phasedOnlCgformField.setId(UUID.randomUUID().toString().replace("-", ""));
phasedOnlCgformField.setDbFieldTxt("分阶段实施详情"); phasedOnlCgformField.setDbFieldTxt("分阶段实施详情");
phasedOnlCgformField.setDbFieldEnName("Details of the phased implementation"); phasedOnlCgformField.setDbFieldEnName("Details of the phased implementation");
phasedOnlCgformField.setDbFieldName("phasedImplDetails"); phasedOnlCgformField.setDbFieldName("phasedImplDetails");
fieldListTemp.add(phasedOnlCgformField); fieldListTemp.add(phasedOnlCgformField);*/
for (OnlCgformField onlCgformField : fieldListTemp) { for (OnlCgformField onlCgformField : fieldListTemp) {
String dictId = onlCgformField.getDictId(); String dictId = onlCgformField.getDictId();
List<SysCategoryTreeVO> sysCategoryTreeVOList = new ArrayList<>(); List<SysCategoryTreeVO> sysCategoryTreeVOList = new ArrayList<>();
@@ -814,6 +814,15 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
result.add(map); result.add(map);
} }
} }
Map<String,Object> fjdssMap = new HashMap<>();
fjdssMap.put("area","文本信息");
if(StringUtils.equals(cut,CutEnum.CN.getValue())){
fjdssMap.put("db_field_txt","分阶段实施详情");
}else {
fjdssMap.put("db_field_txt","Details of the phased implementation");
}
fjdssMap.put("db_field_name","phasedImplDetails");
result.add(fjdssMap);
return result; return result;
} }