记录校核查询修改

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/boilertaskorderitem/BoilerTaskOrderItemMapper.xml

@@ -162,8 +162,8 @@
         left join PRESSURE_TASK_ORDER bto on bto.ID = btoi.ORDER_ID
         left join PRESSURE2_EQUIP_BOILER eb on eb.ID = btoi.EQUIP_ID
         left join PRESSURE2_BOILER_TASK_ORDER_ITEM_REPORT btoir on btoir.ORDER_ITEM_ID = btoi.ID
-        left join PRESSURE2_BOILER_TASK_ORDER_ITEM_REPORT_USER btoiru on btoiru.REPORT_ID = btoir.ID
-        left join PRESSURE2_BOILER_TASK_ORDER_ITEM_RECHECK btoir1 on btoir1.MAIN_REPORT_ID = btoir.ID
+        left join PRESSURE2_BOILER_TASK_ORDER_ITEM_REPORT_USER btoiru on btoiru.REPORT_ID = btoir.ID and btoiru.DELETED = 0
+        --left join PRESSURE2_BOILER_TASK_ORDER_ITEM_RECHECK btoir1 on btoir1.MAIN_REPORT_ID = btoir.ID
         <where>
             btoi.DELETED = 0 AND btoir.RECHECK_ID != ''
             <if test="orderNo != null and orderNo != ''">
@@ -251,8 +251,8 @@
         left join PRESSURE_TASK_ORDER bto on bto.ID = btoi.ORDER_ID
         left join PRESSURE2_EQUIP_BOILER eb on eb.ID = btoi.EQUIP_ID
         left join PRESSURE2_BOILER_TASK_ORDER_ITEM_REPORT btoir on btoir.ORDER_ITEM_ID = btoi.ID
-        left join PRESSURE2_BOILER_TASK_ORDER_ITEM_REPORT_USER btoiru on btoiru.REPORT_ID = btoir.ID
-        left join PRESSURE2_BOILER_TASK_ORDER_ITEM_RECHECK btoir1 on btoir1.MAIN_REPORT_ID = btoir.ID
+        left join PRESSURE2_BOILER_TASK_ORDER_ITEM_REPORT_USER btoiru on btoiru.REPORT_ID = btoir.ID and btoiru.DELETED = 0
+        --left join PRESSURE2_BOILER_TASK_ORDER_ITEM_RECHECK btoir1 on btoir1.MAIN_REPORT_ID = btoir.ID
         <where>
             btoi.DELETED = 0 AND btoir.RECHECK_ID != ''
             <if test="orderNo != null and orderNo != ''">

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/pipetaskorderitem/PipeTaskOrderItemMapper.xml

@@ -156,7 +156,7 @@
         from PRESSURE2_PIPE_TASK_ORDER_INPUT btoi
         left join PRESSURE_TASK_ORDER bto on bto.ID = btoi.ORDER_ID
         left join PRESSURE2_PIPE_TASK_ORDER_ITEM_REPORT btoir on btoir.ORDER_ID = btoi.ORDER_ID
-        left join PRESSURE2_PIPE_TASK_ORDER_ITEM_REPORT_USER btoiru on btoiru.REPORT_ID = btoir.ID
+        left join PRESSURE2_PIPE_TASK_ORDER_ITEM_REPORT_USER btoiru on btoiru.REPORT_ID = btoir.ID and btoiru.DELETED = 0
         left join PRESSURE2_PIPE_TASK_ORDER_ITEM_RECHECK btoir1 on btoir1.MAIN_REPORT_ID = btoir.ID
         left join PRESSURE2_PIPE_TASK_ORDER_ITEM ptoi on ptoi.ORDER_ID = btoi.ORDER_ID and ptoi.DELETED = 0
         left join (
@@ -250,7 +250,7 @@
         from PRESSURE2_PIPE_TASK_ORDER_INPUT btoi
         left join PRESSURE_TASK_ORDER bto on bto.ID = btoi.ORDER_ID
         left join PRESSURE2_PIPE_TASK_ORDER_ITEM_REPORT btoir on btoir.ORDER_ID = btoi.ORDER_ID
-        left join PRESSURE2_PIPE_TASK_ORDER_ITEM_REPORT_USER btoiru on btoiru.REPORT_ID = btoir.ID
+        left join PRESSURE2_PIPE_TASK_ORDER_ITEM_REPORT_USER btoiru on btoiru.REPORT_ID = btoir.ID and btoiru.DELETED = 0
         left join PRESSURE2_PIPE_TASK_ORDER_ITEM_RECHECK btoir1 on btoir1.MAIN_REPORT_ID = btoir.ID
         left join PRESSURE2_PIPE_TASK_ORDER_ITEM ptoi on ptoi.ORDER_ID = btoi.ORDER_ID and ptoi.DELETED = 0
         left join (