获取认证-交付物类型接口

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));
+	}
 }

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;

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<SysCategoryMapper, SysCa
 				dictId = sysCategoryMapper.getDictId("deliverable_template");
 			}else if("evaluation_method".equals(flag)){
 				dictId = sysCategoryMapper.getDictId("evaluation_method");
+			}else if("ren4_zheng4_-_jiao1_fu4_wu4_lei4_xing2".equals(flag)){
+				dictId = sysCategoryMapper.getDictId("ren4_zheng4_-_jiao1_fu4_wu4_lei4_xing2");
 			}else{
 				dictId = sysCategoryMapper.getFieldInfo("technology_territory");
 			}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java

@@ -204,4 +204,8 @@ public class ProjectCertificationInventoryEO implements Serializable {
 
     @TableField(exist = false)
     private String roleCode;
+
+    /**值类型，对应SysCategoryValueTypeEnum中value**/
+    @TableField(exist = false)
+    private String valueType;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java

@@ -548,6 +548,15 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 
 					String deliverableTypeNameEn = this.getTreeName(CutEnum.EN.getValue(), categoryList, Arrays.asList(data.getDeliverableType().split(",")));
 					data.setDeliverableTypeNameEn(deliverableTypeNameEn);
+
+					String valueType = categoryList.stream().filter(category -> {
+						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());