Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java

@@ -545,11 +545,27 @@ public class CommonController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/equList")
     @ApiOperation(httpMethod = "GET", value = "按照业务类型查询设备种类，工作台使用", notes = "按照业务类型查询设备种类，工作台使用")
-    public ResponseModel<List<DictionarieValueModel>> equList(@RequestParam(value = "type") String bizType) {
+    public ResponseModel<List<Map<String, Object>>> equList(@RequestParam(value = "type") String bizType) {
         // 在平台字典配置的自定义业务的设备种类：格式{bizType}_SBZL,如BF_YZ_SBZL==》移装注销-设备种类
         String suffix = "_SBZL";
         String dictCode = bizType + suffix;
-        return ResponseHelper.buildResponse(Systemctl.dictionarieClient.dictValues(dictCode).getResult());
+
+        List<DictionarieValueModel> resultObj = Systemctl.dictionarieClient.dictValues(dictCode).getResult();
+        List<Map<String, Object>> result = resultObj.stream()
+                .filter(obj -> obj instanceof Map)
+                .map(obj -> (Map<String, Object>) obj).collect(Collectors.toList());
+        if (bizType.equals("DJ_CSJ")){
+         result.forEach(e->{
+             if (e.getOrDefault("dictDataKey","").equals("2000")){
+                 e.put("tips","变更前需先进行委托检验，在办理变更登记时上传委托检验报告");
+
+             }else {
+                 e.put("tips","变更前需先进行安全评估，评估结果为改造或重大维修，需办理改造告知或维修告知，进行监督检验后，再进行变更登记；安全评估结果为一般维修，需办理定期检验，再进行变更登记");
+             }
+         });
+        }
+
+        return ResponseHelper.buildResponse(result);
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/superviseBusinessCategory.json

@@ -64,7 +64,9 @@
     {
       "name": "超设计使用年限变更",
       "code": "DJ_CSJ",
-      "image": "upload/tzs/common/image/更名变更登记.png"
+      "image": "upload/tzs/common/image/更名变更登记.png",
+      "tips": "“压力容器需先进行委托检验，在办理变更登记时上传委托检验报告”“大型游乐设施需先进行安全评估，如评估结果为改造或重大维修，则需先办理改造告知或维修告知，进行监督检验后，再进行变更登记；如安全评估结果为一般维修的，需先办理定期检验，再进行变更登记！"
+
     }
   ],
   "WBBA": [