fix(jg)：列表去掉压力管道查询，工程装置详情优化

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/EquipmentCategoryMapper.java

@@ -23,10 +23,9 @@ import java.util.Map;
 @Mapper
 public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
 
-    @Select("SELECT * FROM tz_equipment_category WHERE code NOT LIKE '7%' ORDER BY parent_id")
+    @Select("SELECT * FROM tz_equipment_category WHERE code NOT LIKE '7%' AND code NOT LIKE '8%' ORDER BY parent_id")
     List<EquipmentCategoryDto> selectClassifyNoStart7();
 
-
     @Select("select * from tz_equipment_category where code in('1000','2000','3000','4000','5000','6000','8000','9000')")
     List<EquipmentCategoryDto> selectClassify();
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/IdxBizJgProjectContraptionMapper.xml

@@ -52,53 +52,30 @@
     </select>
 
     <select id="selectEquipList" resultType="java.util.Map">
-        WITH LatestInspection AS (
-            SELECT
-                RECORD,
-                "INSPECT_ORG_NAME",
-                "INSPECT_CONCLUSION",
-                "NEXT_INSPECT_DATE",
-                ROW_NUMBER() OVER (PARTITION BY RECORD ORDER BY "INSPECT_DATE" DESC) AS rn
-            FROM idx_biz_jg_inspection_detection_info
-        ),
-             LatestConstruction AS (
-                 SELECT
-                     RECORD,
-                     "USC_UNIT_NAME",
-                     "USC_DATE",
-                     ROW_NUMBER() OVER (PARTITION BY RECORD ORDER BY "USC_DATE" DESC) AS rn
-                 FROM idx_biz_jg_construction_info
-             )
-        SELECT
-            ibjtpp."PIPE_NAME" AS pipeName,
-            ibjtpp."PIPELINE_NUMBER" AS pipelineNumber,
-            ibjtpp."DEVICE_LEVEL" AS deviceLevel,
-            ibjtpp."NOMINAL_DIAMETER" AS nominalDiameter,
-            ibjtpp."WALL_THICKNESS" AS wallThickness,
-            ibjtpp."PIPE_LENGTH" AS pipeLength,
-            ibjtpp."PRESSURE" AS pressure,
-            ibjtpp."TEMPERATURE" AS temperature,
-            ibjtpp."MEDIUM" AS medium,
-            ibjtpp."WORK_PRESSURE" AS workPressure,
-            ibjtpp."WORK_TEMPERATURE" AS workTemperature,
-            ibjtpp."WORK_MEDIUM" AS workMedium,
-            ibjtpp."REMARKS" AS remarks,
-            latestInspection."INSPECT_ORG_NAME" AS inspectOrgName,
-            latestInspection."INSPECT_CONCLUSION" AS inspectConclusion,
-            latestInspection."NEXT_INSPECT_DATE" AS nextInspectDate,
-            ibjdi."DESIGN_UNIT_NAME" AS designUnitName,
-            latestConstruction."USC_UNIT_NAME" AS uscUnitName,
-            latestConstruction."USC_DATE" AS uscDate,
-            ibjui."USE_DATE" AS useDate,
-            ibjui."RECORD" AS record
-        FROM
-            idx_biz_jg_use_info ibjui
-                LEFT JOIN idx_biz_jg_tech_params_pipeline ibjtpp ON ibjui.RECORD = ibjtpp.RECORD
-                LEFT JOIN idx_biz_jg_design_info ibjdi ON ibjui.RECORD = ibjdi.RECORD
-                LEFT JOIN LatestInspection latestInspection
-                          ON ibjui.RECORD = latestInspection.RECORD AND latestInspection.rn = 1
-                LEFT JOIN LatestConstruction latestConstruction
-                          ON ibjui.RECORD = latestConstruction.RECORD AND latestConstruction.rn = 1
+        SELECT ibjtpp."PIPE_NAME" AS pipeName,
+               ibjtpp."PIPELINE_NUMBER" AS pipelineNumber,
+               ibjtpp."DEVICE_LEVEL" AS deviceLevel,
+               ibjtpp."NOMINAL_DIAMETER" AS nominalDiameter,
+               ibjtpp."WALL_THICKNESS" AS wallThickness,
+               ibjtpp."PIPE_LENGTH" AS pipeLength,
+               ibjtpp."PRESSURE" AS pressure,
+               ibjtpp."TEMPERATURE" AS temperature,
+               ibjtpp."MEDIUM" AS medium,
+               ibjtpp."WORK_PRESSURE" AS workPressure,
+               ibjtpp."WORK_TEMPERATURE" AS workTemperature,
+               ibjtpp."WORK_MEDIUM" AS workMedium,
+               ibjtpp."REMARKS" AS remarks,
+               (select INSPECT_ORG_NAME from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) inspectOrgName,
+               (select INSPECT_CONCLUSION from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) inspectConclusion,
+               (select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) nextInspectDate,
+               (select USC_UNIT_NAME from idx_biz_jg_construction_info jci where ibjui.RECORD = jci.RECORD ORDER BY  jci."REC_DATE" DESC limit 1) as uscUnitName,
+               (select USC_DATE from idx_biz_jg_construction_info jci where ibjui.RECORD = jci.RECORD ORDER BY  jci."REC_DATE" DESC limit 1) as uscDate,
+               ibjdi."DESIGN_UNIT_NAME" AS designUnitName,
+               ibjui."USE_DATE" AS useDate,
+               ibjui."RECORD" AS record
+        FROM idx_biz_jg_use_info ibjui
+                 LEFT JOIN idx_biz_jg_tech_params_pipeline ibjtpp ON ibjui.RECORD = ibjtpp.RECORD
+                 LEFT JOIN idx_biz_jg_design_info ibjdi ON ibjui.RECORD = ibjdi.RECORD
         WHERE ibjui.project_contraption_id = #{sequenceNbr}
     </select>