1.装置详情增加检验报告字段

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeRegistrationReformMapper.java

@@ -57,7 +57,7 @@ public interface JgChangeRegistrationReformMapper extends BaseMapper<JgChangeReg
     IPage<IdxBizJgProjectContraption> queryJgProjectContraptionPage(Page<IdxBizJgProjectContraption> page,@Param("companyCode") String useUnitCreditCode,@Param("proIds") Set<String> proIds);
 
     /**
-            * 查询指定装置下的管道，样式为汇总表样式
+     * 查询指定装置下的管道，样式为汇总表样式
      * @param projectContraptionSeq 装置id
      * @return List<Map<String, Object>>
      */

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationReformMapper.xml

@@ -377,7 +377,8 @@
             pp."WORK_MEDIUM" AS workMedium,
             (select INSPECT_ORG_NAME from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) inspectOrgName,
             (select name from cb_data_dictionary where type = 'JYJL' and code = (select INSPECT_CONCLUSION from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE DESC limit 1)) inspectConclusion,
-            to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE DESC limit 1), 'YYYY-MM-DD') nextInspectDate
+            to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE DESC limit 1), 'YYYY-MM-DD') nextInspectDate,
+            (select INSPECT_REPORT from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) inspectReport
         FROM
             idx_biz_jg_use_info ui
             LEFT JOIN idx_biz_jg_register_info ri on ri."RECORD" = ui."RECORD"

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

@@ -1634,6 +1634,10 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         IdxBizJgProjectContraption projectContraption = jgProjectContraptionService.getBaseMapper().selectById(projectContraptionSeq);
         Map<String, Object> re = new HashMap<>();
         List<Map<String, Object>> equList = this.getBaseMapper().selectPieLineListByProjectId(projectContraptionSeq);
+        // 检验报告数据格式化 转json
+        equList.stream().filter(e-> e.get("inspectReport") != null).forEach(item->{
+            item.put("inspectReport", JSON.parse(item.get("inspectReport").toString()));
+        });
         re.put("equipmentLists", equList);
         re.put("projectContraption", projectContraption.getProjectContraption());
         re.put("projectContraptionId", projectContraptionSeq);