ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 获取查询条件

Browse Source
This commit is contained in:
liao
2023-08-23 14:59:22 +08:00
parent ee56da57b5
commit 969cb4da20
5 changed files with 60 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-modules/src/main/java/com/jero/modules/laws/regulation/controller/LawsBasicInfoController.java
+8
View File
@@ -59,4 +59,12 @@ public class LawsBasicInfoController extends JeroController<LawsBasicInfo, ILaws
return Result.OK(list);
}
@AutoLog(value = "获取查询条件")
@ApiOperation(value="获取查询条件", notes="获取查询条件")
@GetMapping(value = "getQueryCondition")
public Result<List<Map<String,Object>>> getQueryCondition(@RequestParam(name="flag") String flag) {
List<Map<String,Object>> list = lawsBasicInfoService.getQueryCondition(flag);
return Result.OK(list);
}
}
jero-boot-modules/src/main/java/com/jero/modules/laws/regulation/service/ILawsBasicInfoService.java
+7
View File
@@ -41,4 +41,11 @@ public interface ILawsBasicInfoService extends IService<LawsBasicInfo> {
* @Description: 获取表单模型
**/
List<Map<String, Object>> getFormModel(String flag);
/**
* @Author: liao
* @Date: 2023/8/23 14:54
* @Description: 获取查询条件
**/
List<Map<String, Object>> getQueryCondition(String flag);
}
jero-boot-modules/src/main/java/com/jero/modules/laws/regulation/service/impl/LawsBasicInfoServiceImpl.java
+21 -4
View File
@@ -399,12 +399,11 @@ public class LawsBasicInfoServiceImpl extends ServiceImpl<LawsBasicInfoMapper, L
* @Description: 组装查询条件
**/
private String getConditionStr(Map<String, Object> parameter) {
String cut = MessageUtils.getLanguage().getValue();
//查询条件
StringBuilder conditionSb = new StringBuilder("where 1 = 1");
//过滤查询条件字段类型使用
List<Map<String, Object>> mapList = queryCondition(FileTableIdEnum.DOMESTIC_REGULATIONS.getValue(), cut, null);
List<Map<String, Object>> mapList = getQueryCondition(FileTableIdEnum.DOMESTIC_REGULATIONS.getValue());
//查询条件处理
for (Map.Entry<String, Object> entry : parameter.entrySet()) {
@@ -474,12 +473,21 @@ public class LawsBasicInfoServiceImpl extends ServiceImpl<LawsBasicInfoMapper, L
return condition;
}
private List<Map<String, Object>> queryCondition(String flag, String cut, String searchFlag) {
/**
* @Author: liao
* @Date: 2023/8/23 14:55
* @Description: 获取查询条件
**/
@Override
public List<Map<String, Object>> getQueryCondition(String flag) {
String cut = MessageUtils.getLanguage().getValue();
List<LawsTag> fieldList = getFieldList(flag);
fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(MyStringUtils.valueOf(e.getIsQuery()))).collect(Collectors.toList());
fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue()
.equals(MyStringUtils.valueOf(e.getIsQuery()))).collect(Collectors.toList());
//树形数据字典
Map<String,Object> params = new HashedMap();
params.put("cut",cut);
//List<SysCategoryTreeVO> sysCategoryTree = sysCategoryService.getSysCategoryTree(null,params);
List<Map<String, Object>> list = new java.util.ArrayList<>();
for (LawsTag lawsTag : fieldList) {
Map<String, Object> map = new HashMap<>();
@@ -491,6 +499,15 @@ public class LawsBasicInfoServiceImpl extends ServiceImpl<LawsBasicInfoMapper, L
} else {
map.put("db_field_txt", lawsTag.getDbFieldEnName());//字段英文名
}
// 树型结构的集合（后面写个通用的）
/*if ("technology_territory".equals(lawsTag.getDbFieldName())) {
List<SysCategoryTreeVO> sysCategoryTreeVOList = sysCategoryTree.stream()
.filter(sysCategoryTreeVO -> lawsTag.getDictId()
.equals(sysCategoryTreeVO.getDictId())).collect(Collectors.toList());
map.put("tree", sysCategoryTreeVOList);
} else {
map.put("tree", new java.util.ArrayList<>());
}*/
list.add(map);
}
return list;