1.压力管道按照装置报检，联调修改

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -446,7 +446,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
 
 
     private String buildTaskContent(JyjcInspectionApplicationModel model) {
-        return String.format("来自%s%s的业务办理,【申请单号:%s】", model.getEquList(), StringUtils.isNotBlank(model.getSupervisoryCode()) ? "【" + model.getSupervisoryCode() + "】" : "", model.getApplicationNo());
+        String equListName = EquipmentClassifityEnum.getNameByCode(model.getEquipClassify());
+        return String.format("来自%s%s的业务办理,【申请单号:%s】", equListName, StringUtils.isNotBlank(model.getSupervisoryCode()) ? "【" + model.getSupervisoryCode() + "】" : "", model.getApplicationNo());
     }
 
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionResultServiceImpl.java

@@ -489,6 +489,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
                         JSONObject paramObj = JSON.parseObject(String.valueOf(param.getParamJson()));
                         paramObj.put("equList", finalMap.get("equList"));
                         paramObj.put("equCategory", finalMap.get("equCategory"));
+                        paramObj.put("inspectionType", jyjcInspectionResultModel.getInspectionType());
                         resultMap.put(param.getParamType(), paramObj);
                     }
                 });