diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java index 7536ab487..bcba55d30 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java @@ -603,4 +603,14 @@ public class SysCategoryController { String flag = "evaluation_method"; return Result.OK(sysCategoryService.getSysCategoryTree(flag)); } + + /** + * 只查询交付物类型的树形数据字典 + * @return + */ + @GetMapping("/getCertificationDeliverableTree") + public Result getCertificationDeliverableTree() { + String flag = "ren4_zheng4_-_jiao1_fu4_wu4_lei4_xing2"; + return Result.OK(sysCategoryService.getSysCategoryTree(flag)); + } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/SysCategoryValueTypeEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/SysCategoryValueTypeEnum.java index dafb43d9e..5a8359056 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/SysCategoryValueTypeEnum.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/SysCategoryValueTypeEnum.java @@ -4,7 +4,8 @@ public enum SysCategoryValueTypeEnum { FILE("附件","file"), TEXT("文本","text"), - NA("不用填","N/A") + SELECT("选择","select"), + NA("不用填","N/A"), ; String name; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java index db4eeac8c..3e51539c0 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java @@ -275,6 +275,8 @@ public class SysCategoryServiceImpl extends ServiceImpl { + boolean flag = false; + if (StringUtils.equals(data.getDeliverableType(), category.getId())) { + flag = true; + } + return flag; + }).map(SysCategory::getValueType).distinct().collect(Collectors.joining(",")); + data.setValueType(valueType); } if(StringUtils.isNotEmpty(data.getDutyTerritory())){ String dutyTerritoryName = this.sysDictItemService.disposeShowDictItemValue(sysDictItems,data.getDutyTerritory(),cut, ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());