WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

交付物类型数据字典

Browse Source
This commit is contained in:
zhn
2022-05-27 11:39:53 +08:00
parent de7b996fd9
commit b65ca78d88
5 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
+10 -1
View File
@@ -579,7 +579,16 @@ public class SysCategoryController {
*/
@GetMapping("/getSysCategoryTree")
public Result getSysCategoryTree() {
return Result.OK(sysCategoryService.getSysCategoryTree());
return Result.OK(sysCategoryService.getSysCategoryTree(null));
}
/**
* 只查询交付物类型的树形数据字典
* @return
*/
@GetMapping("/getDeliverableTree")
public Result getDeliverableTree() {
String flag = "deliverable_template";
return Result.OK(sysCategoryService.getSysCategoryTree(flag));
}
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java
+1 -1
View File
@@ -67,7 +67,7 @@ public interface ISysCategoryService extends IService<SysCategory> {
* 获取树形结构
* @return
*/
List<SysCategoryTreeVO> getSysCategoryTree();
List<SysCategoryTreeVO> getSysCategoryTree(String flag);
/**
* 获取树形结构，中英文可切换
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java
+8 -2
View File
@@ -264,10 +264,16 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
}
@Override
public List<SysCategoryTreeVO> getSysCategoryTree() {
public List<SysCategoryTreeVO> getSysCategoryTree(String flag) {
try {
//只查询技术领域的technology_territory
String dictId = sysCategoryMapper.getFieldInfo("technology_territory");
String dictId = "";
if("deliverable_template".equals(flag)){
dictId = sysCategoryMapper.getFieldInfo("deliverable_template");
}else{
dictId = sysCategoryMapper.getFieldInfo("technology_territory");
}
List<SysCategory> list = new ArrayList<>();
if(StringUtils.isNotBlank(dictId)){
LambdaQueryWrapper<SysCategory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+4 -4
View File
@@ -384,7 +384,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
}
//树形数据字典
List<SysCategoryTreeVO> sysCategoryTree = sysCategoryService.getSysCategoryTree();
List<SysCategoryTreeVO> sysCategoryTree = sysCategoryService.getSysCategoryTree(null);
List<Map<String, Object>> list = new ArrayList<>();
for (OnlCgformField onlCgformField : fieldList) {
Map<String, Object> map = new HashMap<>();
@@ -430,7 +430,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsQuery()))).collect(Collectors.toList());
}
//树形数据字典
List<SysCategoryTreeVO> sysCategoryTree = sysCategoryService.getSysCategoryTree();
List<SysCategoryTreeVO> sysCategoryTree = sysCategoryService.getSysCategoryTree(null);
List<Map<String, Object>> list = new ArrayList<>();
for (OnlCgformField onlCgformField : fieldList) {
Map<String, Object> map = new HashMap<>();
@@ -561,7 +561,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
}
//树形数据字典
List<SysCategoryTreeVO> sysCategoryTree = sysCategoryService.getSysCategoryTree();
List<SysCategoryTreeVO> sysCategoryTree = sysCategoryService.getSysCategoryTree(null);
// List<Map<String, Object>> result = new ArrayList<>();
// for (OnlCgformArea onlCgformAreaTemp : areaList) {
// String areaName = "";
@@ -654,7 +654,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
}
//树形数据字典
List<SysCategoryTreeVO> sysCategoryTree = sysCategoryService.getSysCategoryTree();
List<SysCategoryTreeVO> sysCategoryTree = sysCategoryService.getSysCategoryTree(null);
List<Map<String, Object>> result = new ArrayList<>();
for (OnlCgformArea onlCgformAreaTemp : areaList) {
String areaName = "";
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+1 -1
View File
@@ -2808,7 +2808,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsQuery()))).collect(Collectors.toList());
}
//树形数据字典
List<SysCategoryTreeVO> sysCategoryTree = sysCategoryService.getSysCategoryTree(); // 查询所有 并以树结构返回
List<SysCategoryTreeVO> sysCategoryTree = sysCategoryService.getSysCategoryTree(null); // 查询所有 并以树结构返回
List<Map<String, Object>> list = new ArrayList<>();
for (OnlCgformField onlCgformField : fieldList) {
Map<String, Object> map = new HashMap<>();