|
@@ -55,7 +55,7 @@ public class SystemDictItemService extends ServiceImpl<SystemDictItemMapper, Sys
|
|
|
|
|
|
public List<Map<String, Object>> getCronConClusions(List<Integer> types) {
|
|
|
if(types==null||types.size()==0){
|
|
|
- types=Arrays.asList(0,1,2,3,4,5);
|
|
|
+ types=Arrays.asList(0,1,2,3,4,5,6);
|
|
|
}
|
|
|
List<String> keys = new ArrayList<>();
|
|
|
for (Integer type : types) {
|
|
@@ -78,6 +78,9 @@ public class SystemDictItemService extends ServiceImpl<SystemDictItemMapper, Sys
|
|
|
case 5:
|
|
|
keys.add("AVOID_ASSESS");
|
|
|
break;
|
|
|
+ case 6:
|
|
|
+ keys.add("REINVALID_ASSESS");
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
//根据key值查
|
|
@@ -112,6 +115,12 @@ public class SystemDictItemService extends ServiceImpl<SystemDictItemMapper, Sys
|
|
|
map.put("rType", 5);
|
|
|
map.put("rTypeName", "回避设计");
|
|
|
break;
|
|
|
+
|
|
|
+ case "REINVALID_ASSESS":
|
|
|
+ map.put("rType", 6);
|
|
|
+ map.put("rTypeName", "无效应对");
|
|
|
+ break;
|
|
|
+
|
|
|
}
|
|
|
map.put("cTypeId", item.getId());
|
|
|
map.put("cTypeName", item.getDictChildLabel());
|