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 42491c88f..d87d60920 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 @@ -457,6 +457,59 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> getField(String flag, String cut, String type) { + OnlCgformArea onlCgformArea = new OnlCgformArea(); + onlCgformArea.setIsModel(ModuleEnum.DOCUMENT_LIBRARY.getValue()); + //区域管理 + List areaList = onlCgformAreaServiceImpl.queryList(onlCgformArea); + //字段属性 + List fieldList = onlCgformFieldService.getFieldList(flag); + //过滤出字段为树形结构的 + + if (fieldList.size() != 0) { + //过滤出表单字段(is_show_form-->表单是否显示0否 1是) + if ("add".equals(type)) { + //新增时,被代替标准在表单中不显示. + fieldList = fieldList.stream() + .filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm())) && !"replaced_standard".equals(e.getDbFieldName())) + .collect(Collectors.toList()); + } else { + fieldList = fieldList.stream() + .filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm()))) + .collect(Collectors.toList()); + } + + } + //树形数据字典 + List sysCategoryTree = sysCategoryService.getSysCategoryTree(); + List> result = new ArrayList<>(); + for (OnlCgformArea onlCgformAreaTemp : areaList) { + String areaName = ""; + if (CutEnum.CN.getValue().equals(cut)) { + areaName = onlCgformAreaTemp.getShowArea(); + } else { + areaName = onlCgformAreaTemp.getEnName(); + } + List fieldListTemp = fieldList.stream().filter(e -> onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList()); + for (OnlCgformField onlCgformField : fieldListTemp) { + String dictId = onlCgformField.getDictId(); + List sysCategoryTreeVOList = new ArrayList<>(); + if (StringUtils.isNotBlank(dictId)) { + sysCategoryTreeVOList = sysCategoryTree.stream().filter(e -> dictId.equals(e.getDictId())).collect(Collectors.toList()); + } + Map map = new HashMap<>(); + mapPut(cut, map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, sysCategoryTreeVOList); + map.put("field_must_input", onlCgformField.getFieldMustInput());//是否必填 + map.put("db_length", onlCgformField.getDbLength());//字段长度 + result.add(map); + } + } + return result; + } /** * 编辑数据查询 @@ -2559,7 +2612,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl getWorkbookTitle(String cut) { - List> addForm = getAddForm(ModuleEnum.DOCUMENT_LIBRARY.getValue(), cut, "add"); + List> addForm = getField(ModuleEnum.DOCUMENT_LIBRARY.getValue(), cut, "add"); StringBuilder sb = new StringBuilder(); List pullMoreList = new LinkedList<>();//多选字段 List pullSingleList = new LinkedList<>();//单选字段