提交审核

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/boilertaskorderitemreport/BoilerTaskOrderItemReportMapper.xml

@@ -13,12 +13,15 @@
         select a.* from PRESSURE2_BOILER_TASK_ORDER_ITEM_REPORT a
                             left join PRESSURE2_BOILER_TASK_ORDER_ITEM b on a.ORDER_ITEM_ID = b.ID
                             left join PRESSURE2_BOILER_TASK_ORDER_ITEM_PART c on a.ITEM_PART_ID = c.ID
+                            inner join PRESSURE2_BOILER_CONNECT_RECORD_REPORT d on d.ID = a.PROJECT_ID
         where a.ORDER_ITEM_ID = #{orderItemId}
           and a.TASK_STATUS in (520,600,700,710,800)
+        and d.PROJECT_TYPE in ('MAIN','SUB','STANDALONE')
         order by
             case when a.ITEM_PART_ID = '0' then 0 else 1 end,
             c.PART_TYPE,
-            case when a.REPORT_TYPE = 100 then 0 else 1 end,
+            -- case when a.REPORT_TYPE = 100 then 0 else 1 end,
+            case when d.PROJECT_TYPE = 'MAIN' then 0 else 1 end,
             a.SORT
     </select>
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/pipetaskorderitemreport/PipeTaskOrderItemReportMapper.xml

@@ -12,8 +12,10 @@
     <select id="selectGenerateReportList">
         select a.* from PRESSURE2_PIPE_TASK_ORDER_ITEM_REPORT a
         left join PRESSURE2_PIPE_TASK_ORDER_ITEM b on a.ORDER_ITEM_ID = b.ID
+        left join PRESSURE2_BOILER_CONNECT_RECORD_REPORT c on c.ID = a.PROJECT_ID
         where a.ORDER_ID = #{orderId}
           and a.TASK_STATUS in (520,600,700,710,800)
+          and c.PROJECT_TYPE in ('MAIN','SUB','STANDALONE')
           order by
             case when a.REPORT_TYPE = 100 then 0 else 1 end,
             a.SORT