From 18e3b9bffcb922313b438c31ec6db73dcd3e96fb Mon Sep 17 00:00:00 2001 From: liao Date: Thu, 24 Aug 2023 15:46:32 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E9=80=9A=E7=94=A8=E5=A2=9E=E5=88=A0?= =?UTF-8?q?=E6=9F=A5=E6=94=B9=E5=9F=BA=E7=A1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LawsCommonController.java | 2 +- .../common/service/ILawsCommonService.java | 2 +- .../service/impl/LawsCommonServiceImpl.java | 24 +++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/jero-boot-modules/src/main/java/com/jero/modules/laws/common/controller/LawsCommonController.java b/jero-boot-modules/src/main/java/com/jero/modules/laws/common/controller/LawsCommonController.java index 96c51a8b..c2ef36d9 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/laws/common/controller/LawsCommonController.java +++ b/jero-boot-modules/src/main/java/com/jero/modules/laws/common/controller/LawsCommonController.java @@ -64,7 +64,7 @@ public class LawsCommonController { @AutoLog(value = "通用操作-获取表单模型") @ApiOperation(value="通用操作-获取表单模型", notes="通用操作-获取表单模型") @GetMapping(value = "getFormModel") - public Result>> getFormModel(@RequestParam(name="module") String module) { + public Result> getFormModel(@RequestParam(name="module") String module) { return Result.OK(lawsCommonService.getFormModel(module)); } diff --git a/jero-boot-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java b/jero-boot-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java index 0891f443..92e84b5e 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java +++ b/jero-boot-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java @@ -53,7 +53,7 @@ public interface ILawsCommonService { * @Date: 2023/8/24 10:53 * @Description: 获取表单模型 **/ - List> getFormModel(String module); + Map getFormModel(String module); /** * @Author: liao diff --git a/jero-boot-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/jero-boot-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 9ccba18f..6b97afa4 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/jero-boot-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -200,7 +200,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { map.put("db_field_txt", lawsTag.getDbFieldEnName());//字段英文名 } // 树型结构的集合 - if (FieldTypeEnum.TREE.equals(lawsTag.getFieldShowType())) { + if (FieldTypeEnum.TREE.getValue().equals(lawsTag.getFieldShowType())) { // 对树型结构做处理 map.put("tree", new java.util.ArrayList<>()); } else { @@ -217,7 +217,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { * @Description: 获取表单模型 **/ @Override - public List> getFormModel(String module) { + public Map getFormModel(String module) { // 获取操作语言 LanguageEnum language = MessageUtils.getLanguage(); // 获取要操作的表名 @@ -231,10 +231,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService { LawsArea lawsArea = new LawsArea(); lawsArea.setIsModel(module); List areaList = lawsAreaService.queryList(lawsArea); - // 用于返回的集合 - List> resultList = new java.util.ArrayList<>(); - // 区域集合 - Map areaMap = new HashMap<>(); + // 用于返回的区域集合 + Map areaMap = new LinkedHashMap<>(); // 遍历每个区域做处理 for (LawsArea area : areaList) { // 获取该区域的所有字段 @@ -260,13 +258,16 @@ public class LawsCommonServiceImpl implements ILawsCommonService { fieldMap.put("db_field_txt", lawsTag.getDbFieldEnName());//字段英文名 } fieldMap.put("field_show_type", lawsTag.getFieldShowType()); // 字段类型 - fieldMap.put("dict_field", lawsTag.getDictField()); // 字典编码 + fieldMap.put("dict_field", ""); // 字典编码 + if (StringUtils.isNotBlank(lawsTag.getDictField())) { + fieldMap.put("dict_field", lawsTag.getDictField()); // 字典编码 + } fieldMap.put("show_area", lawsTag.getShowArea()); // 显示区域 fieldMap.put("field_must_input", lawsTag.getFieldMustInput()); // 是否必填 fieldMap.put("db_length", lawsTag.getDbLength()); // 字段长度 fieldMap.put("isReadOnly", lawsTag.getIsReadOnly()); // 是否只读 // 树型结构做处理 - if (FieldTypeEnum.TREE.equals(lawsTag.getFieldShowType())) { + if (FieldTypeEnum.TREE.getValue().equals(lawsTag.getFieldShowType())) { fieldMap.put("tree", new java.util.ArrayList<>()); } else { fieldMap.put("tree", new java.util.ArrayList<>()); @@ -275,8 +276,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { } areaMap.put(areaName, fieldMapList); } - resultList.add(areaMap); - return resultList; + return areaMap; } /** @@ -357,7 +357,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { * @Description: 对数据值做格式处理 **/ private String setValue(String fieldShowType, String value) { - if (FieldTypeEnum.DATE_SINGLE.equals(fieldShowType)) { + if (FieldTypeEnum.DATE_SINGLE.getValue().equals(fieldShowType)) { // 如果是单日期格式，做格式处理 value = "str_to_date('" + value + "','%Y-%m-%d %H:%i:%s')"; } else { @@ -401,7 +401,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { .equals(lawsTag.getIsShowForm().toString())).collect(Collectors.toList()); } // 筛选获取日期类型字段 - List dateFieldList = fieldList.stream().filter(lawsTag -> FieldTypeEnum.DATE_SINGLE + List dateFieldList = fieldList.stream().filter(lawsTag -> FieldTypeEnum.DATE_SINGLE.getValue() .equals(lawsTag.getFieldShowType())).collect(Collectors.toList()) .stream().map(LawsTag::getDbFieldName).collect(Collectors.toList()); // 获取全部的字段列表