diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/moduleEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java similarity index 86% rename from jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/moduleEnum.java rename to jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java index 7a0a3a6b7..6395949d2 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/moduleEnum.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java @@ -5,14 +5,14 @@ package com.jero.common.constant.enums; * @date 2022/1/21 16:42 * @auth zhn */ -public enum moduleEnum { +public enum ModuleEnum { DOCUMENT_LIBRARY("文档管理","1"); String name; String value; - private moduleEnum(String name,String value) { + private ModuleEnum(String name, String value) { this.name = name; this.value = value; } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java index d086b4ed5..80ea6f58f 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Map; import com.jero.common.constant.enums.TableEnum; -import com.jero.common.constant.enums.moduleEnum; +import com.jero.common.constant.enums.ModuleEnum; import com.jero.common.system.util.JeroDataAutorUtils; import com.jero.generater.modules.online.auth.mapper.OnlAuthDataMapper; import com.jero.generater.modules.online.auth.service.IOnlAuthPageService; @@ -819,7 +819,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl getFieldList(String flag){ List fieldList = new ArrayList<>(); - if(moduleEnum.DOCUMENT_LIBRARY.getValue().equals(flag)){ + if(ModuleEnum.DOCUMENT_LIBRARY.getValue().equals(flag)){ fieldList = onlCgformFieldMapper.getFieldList(TableEnum.BUSS_DOCUMENT_LIBRARY.getTable()); } return fieldList; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java index f57f10374..b845ade5c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java @@ -209,15 +209,13 @@ public class BussDocumentLibraryEOController extends JeroController用于区分字段查询(根据表名) * @return */ @AutoLog(value = "详情,编辑数据查询") @ApiOperation(value="详情,编辑数据查询", notes="详情,编辑数据查询") @GetMapping(value = "/getDocumentInfoById") - public Result>> getDocumentInfoById(@RequestParam(name="id",required=true) String id, - @RequestParam(name="flag",required=true) String flag) { - List> list = bussDocumentLibraryEOService.getDocumentInfoById(id,flag); + public Result>> getDocumentInfoById(@RequestParam(name="id",required=true) String id) { + List> list = bussDocumentLibraryEOService.getDocumentInfoById(id); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java index e78fe132a..5bcced763 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java @@ -86,5 +86,5 @@ public interface IBussDocumentLibraryEOService extends IService> getDocumentInfoById(String id,String flag); + List> getDocumentInfoById(String id); } 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 0a7ef7990..0e557cdfa 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 @@ -1,6 +1,7 @@ package com.jero.modules.document.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.common.constant.enums.ModuleEnum; import com.jero.common.constant.enums.YesOrNo; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; @@ -160,8 +161,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> getAddForm(String flag) { + OnlCgformArea onlCgformArea = new OnlCgformArea(); + onlCgformArea.setIsModel(ModuleEnum.DOCUMENT_LIBRARY.getValue()); //区域管理 - List areaList = onlCgformAreaServiceImpl.queryList(); + List areaList = onlCgformAreaServiceImpl.queryList(onlCgformArea); //字段属性 List fieldList = onlCgformFieldService.getFieldList(flag); @@ -192,41 +195,42 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> getDocumentInfoById(String id,String flag) { + public List> getDocumentInfoById(String id) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(BussDocumentLibraryEO::getId,id); //通过id查询数据 List> dateList = bussDocumentLibraryEOMapper.selectMaps(queryWrapper); - //区域管理 - List areaList = onlCgformAreaServiceImpl.queryList(); - //字段属性 - List fieldList = onlCgformFieldService.getFieldList(flag); + return dateList; +// //区域管理 +// List areaList = onlCgformAreaServiceImpl.queryList(); +// //字段属性 +// List fieldList = onlCgformFieldService.getFieldList(flag); +// +// if(fieldList.size() != 0){ +// //过滤出表单字段(is_show_form-->表单是否显示0否 1是) +// fieldList = fieldList.stream().filter(e-> YesOrNo.YES.getValue().equals(String.valueOf(e.getIsShowForm()))).collect(Collectors.toList()); +// } +// List> result = new ArrayList<>(); +// for (OnlCgformArea onlCgformAreaTemp : areaList) { +// fieldList = fieldList.stream().filter(e->onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList()); +// for (OnlCgformField onlCgformField : fieldList) { +// Map map = new HashMap<>(); +// if(dateList.size() != 0){ +// dateList.get(0).entrySet().forEach(entry->{ +// if(onlCgformField.getDbFieldName().equals(entry.getKey())){ +// map.put("value",entry.getValue()); +// } +// }); +// } +// map.put("field_show_type",onlCgformField.getFieldShowType());//类型(判断是下拉还是输入框,等等) +// map.put("dict_field",onlCgformField.getDictField()); +// map.put("db_field_name",onlCgformField.getDbFieldName());//字段 +// map.put("db_field_txt",onlCgformField.getDbFieldTxt());//字段中文名 +// map.put("db_field_en_name",onlCgformField.getDbFieldEnName());//字段英文名 +// map.put("area",onlCgformAreaTemp.getShowArea());//区域 +// result.add(map); +// } +// } - if(fieldList.size() != 0){ - //过滤出表单字段(is_show_form-->表单是否显示0否 1是) - fieldList = fieldList.stream().filter(e-> YesOrNo.YES.getValue().equals(String.valueOf(e.getIsShowForm()))).collect(Collectors.toList()); - } - List> result = new ArrayList<>(); - for (OnlCgformArea onlCgformAreaTemp : areaList) { - fieldList = fieldList.stream().filter(e->onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList()); - for (OnlCgformField onlCgformField : fieldList) { - Map map = new HashMap<>(); - if(dateList.size() != 0){ - dateList.get(0).entrySet().forEach(entry->{ - if(onlCgformField.getDbFieldName().equals(entry.getKey())){ - map.put("value",entry.getValue()); - } - }); - } - map.put("field_show_type",onlCgformField.getFieldShowType());//类型(判断是下拉还是输入框,等等) - map.put("dict_field",onlCgformField.getDictField()); - map.put("db_field_name",onlCgformField.getDbFieldName());//字段 - map.put("db_field_txt",onlCgformField.getDbFieldTxt());//字段中文名 - map.put("db_field_en_name",onlCgformField.getDbFieldEnName());//字段英文名 - map.put("area",onlCgformAreaTemp.getShowArea());//区域 - result.add(map); - } - } - return result; } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java index 3c95e98e9..247ffd42f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java @@ -35,7 +35,7 @@ import com.jero.common.aspect.annotation.AutoLog; public class OnlCgformAreaController extends JeroController { @Autowired private IOnlCgformAreaService onlCgformAreaService; - + /** * 分页列表查询 * @@ -67,7 +67,8 @@ public class OnlCgformAreaController extends JeroController> queryList() { - List list = onlCgformAreaService.queryList(); + OnlCgformArea onlCgformArea = new OnlCgformArea(); + List list = onlCgformAreaService.queryList(onlCgformArea); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java index 66df572c9..b9fdb6001 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java @@ -57,5 +57,5 @@ public interface IOnlCgformAreaService extends IService { * * @return */ - List queryList(); + List queryList(OnlCgformArea onlCgformArea); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java index 5669ef0ca..885c95d55 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.mapper.OnlCgformAreaMapper; import com.jero.modules.tag.service.IOnlCgformAreaService; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.List; import java.util.Date; @@ -84,9 +85,12 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl queryList() { + public List queryList(OnlCgformArea onlCgformArea) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.orderByAsc(OnlCgformArea::getSort); + if(StringUtils.isNotBlank(onlCgformArea.getIsModel())){ + lambdaQueryWrapper.eq(OnlCgformArea::getIsModel,onlCgformArea.getIsModel()) + .orderByAsc(OnlCgformArea::getSort); + } return list(lambdaQueryWrapper); } }