Merge branch 'develop_tzs_register' of…

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

@@ -52,39 +52,54 @@
     </select>
 
     <select id="selectEquipList" resultType="java.util.Map">
+        WITH LatestInspection AS (
             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,
-            ibjidi."INSPECT_ORG_NAME" as inspectOrgName,
-            ibjidi."INSPECT_CONCLUSION" as inspectConclusion,
-            ibjidi."NEXT_INSPECT_DATE" as nextInspectDate,
-            ibjdi."DESIGN_UNIT_NAME" as designUnitName,
-            ibjci."USC_UNIT_NAME" as uscUnitName,
-            ibjci."USC_DATE" as uscDate,
-            ibjui."USE_DATE" as useDate,
-            ibjui."RECORD" as record
+                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_supervision_info ibjsi ON ibjui.RECORD = ibjsi.RECORD
-        LEFT JOIN idx_biz_jg_register_info ibjri ON ibjui.RECORD = ibjri.RECORD
-        LEFT JOIN idx_biz_jg_other_info ibjoi ON ibjui.RECORD = ibjoi.RECORD
                 LEFT JOIN idx_biz_jg_tech_params_pipeline ibjtpp ON ibjui.RECORD = ibjtpp.RECORD
-        LEFT JOIN idx_biz_jg_inspection_detection_info ibjidi ON ibjui.RECORD = ibjidi.RECORD
                 LEFT JOIN idx_biz_jg_design_info ibjdi ON ibjui.RECORD = ibjdi.RECORD
-        LEFT JOIN idx_biz_jg_construction_info ibjci on ibjui.RECORD = ibjci.RECORD
-        WHERE
-        ibjui.project_contraption_id = #{sequenceNbr}
+                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
+        WHERE ibjui.project_contraption_id = #{sequenceNbr}
     </select>
 
     <select id="countContraptionInUseTimesForEdit" resultType="java.lang.Integer">