diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java index 2ea6f4104..9142b4f18 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java @@ -62,4 +62,5 @@ public interface IFileSplitItemsEOService extends IService List allImgList, SarFileSplitItemsEOPage page); + public String[] getWorkbookTitleForExport(String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index e8b03294f..801c8183c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -739,8 +739,45 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl getWorkbookTitle(String cut) { - // 查询新增表单字段 - List> addForm = languageSwitchService.getForm(ModuleEnum.FILE_SPLIT_ITEMS.getValue(), cut); + // 查询条款表所有字段 + List fieldList = onlCgformFieldService.getFieldList(ModuleEnum.FILE_SPLIT_ITEMS.getValue()); + // 过滤导出字段 + if (fieldList.size() != 0) { + fieldList = fieldList.stream() + .filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm())) || "条款内容".equals(e.getDbFieldTxt())) + .collect(Collectors.toList()); + } + //树形数据字典 + List sysCategoryTree = sysCategoryService.getSysCategoryTreeByCut(cut); // 查询所有 并以树结构返回 + + List> list = new ArrayList<>(); + for (OnlCgformField onlCgformField : fieldList) { + Map map = new HashMap<>(); + if (FieldTypeEnum.TREE.getValue().equals(onlCgformField.getFieldShowType())) { + List sysCategoryTreeVOList = sysCategoryTree.stream() + .filter(e -> onlCgformField.getDictId().equals(e.getDictId())) + .collect(Collectors.toList()); + map.put("tree", sysCategoryTreeVOList); // 树形结构字段 设置树形结构字段值 + } else { + map.put("tree", new ArrayList<>()); // 其他类型字段 该key为空 + } + + map.put("area", null);//展示区域。没用到 + map.put("field_show_type", onlCgformField.getFieldShowType());//类型(判断是下拉还是输入框,等等) + map.put("field_must_input", onlCgformField.getFieldMustInput());//是否必填 + map.put("dict_field", onlCgformField.getDictField()); //下拉类型的数据字典编码 + map.put("db_field_name", onlCgformField.getDbFieldName());//字段 + map.put("db_length", onlCgformField.getDbLength());//字段长度 + if (CutEnum.CN.getValue().equals(cut)) { + map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名 + } else { + map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名 + } + list.add(map); + } + + // 获取新增表单字段 + List> addForm = list; StringBuilder sb = new StringBuilder(); List pullMoreList = new LinkedList<>();//多选字段 List pullSingleList = new LinkedList<>();//单选字段 @@ -820,11 +857,11 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl list = new LinkedList<>(); - list.add(title); - list.add(sbTwo.toString()); - list.add(count + ""); - return list; + List resultList = new LinkedList<>(); + resultList.add(title); + resultList.add(sbTwo.toString()); + resultList.add(count + ""); + return resultList; } /** @@ -1444,7 +1481,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl fieldList = onlCgformFieldService.getFieldList(ModuleEnum.FILE_SPLIT_ITEMS.getValue()); // 过滤出需要导出的字段