出具报告顺序调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/boilertaskorderitemreport/BoilerTaskOrderItemReportMapper.java

@@ -15,6 +15,7 @@ import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitem.BoilerTas
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderreport.BoilerTaskOrderReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictb.DynamicTbDO;
+import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemreport.PipeTaskOrderItemReportDO;
 import jodd.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
@@ -191,4 +192,6 @@ public interface BoilerTaskOrderItemReportMapper extends BaseMapperX<BoilerTaskO
         return selectJoinPage(reqVO,BoilerMajorIssuesPageRespVO.class, recordDOMPJLambdaWrapper);
     }
 
+    List<BoilerTaskOrderItemReportDO> selectGenerateReportList(String orderId);
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -5566,11 +5566,13 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
     @Override
     public byte[] getRecordOutputStreamMerge(String orderItemId) {
 
-        List<BoilerTaskOrderItemReportDO> taskOrderReportDOS = taskOrderItemReportMapper.selectList(new LambdaQueryWrapperX<BoilerTaskOrderItemReportDO>().
-                eq(BoilerTaskOrderItemReportDO::getOrderItemId, orderItemId).
-                in(BoilerTaskOrderItemReportDO::getTaskStatus, List.of(520,600,700,710,800))
-                .orderByAsc(BoilerTaskOrderItemReportDO::getReportType)
-                .orderByAsc(BoilerTaskOrderItemReportDO::getSort));
+//        List<BoilerTaskOrderItemReportDO> taskOrderReportDOS = taskOrderItemReportMapper.selectList(new LambdaQueryWrapperX<BoilerTaskOrderItemReportDO>().
+//                eq(BoilerTaskOrderItemReportDO::getOrderItemId, orderItemId).
+//                in(BoilerTaskOrderItemReportDO::getTaskStatus, List.of(520,600,700,710,800))
+//                .orderByAsc(BoilerTaskOrderItemReportDO::getReportType)
+//                .orderByAsc(BoilerTaskOrderItemReportDO::getSort));
+
+        List<BoilerTaskOrderItemReportDO> taskOrderReportDOS = taskOrderItemReportMapper.selectGenerateReportList(orderItemId);
 
         if (CollUtil.isEmpty(taskOrderReportDOS)) {
             return null;
@@ -5623,11 +5625,13 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
      */
     public byte[] getRecordOutputStreamMerge2(String orderItemId) {
 
-        List<BoilerTaskOrderItemReportDO> taskOrderReportDOS = taskOrderItemReportMapper.selectList(new LambdaQueryWrapperX<BoilerTaskOrderItemReportDO>().
-                eq(BoilerTaskOrderItemReportDO::getOrderItemId, orderItemId).
-                in(BoilerTaskOrderItemReportDO::getTaskStatus, List.of(520,600,700,710,800))
-                .orderByAsc(BoilerTaskOrderItemReportDO::getReportType)
-                .orderByAsc(BoilerTaskOrderItemReportDO::getSort));
+//        List<BoilerTaskOrderItemReportDO> taskOrderReportDOS = taskOrderItemReportMapper.selectList(new LambdaQueryWrapperX<BoilerTaskOrderItemReportDO>().
+//                eq(BoilerTaskOrderItemReportDO::getOrderItemId, orderItemId).
+//                in(BoilerTaskOrderItemReportDO::getTaskStatus, List.of(520,600,700,710,800))
+//                .orderByAsc(BoilerTaskOrderItemReportDO::getReportType)
+//                .orderByAsc(BoilerTaskOrderItemReportDO::getSort));
+
+        List<BoilerTaskOrderItemReportDO> taskOrderReportDOS = taskOrderItemReportMapper.selectGenerateReportList(orderItemId);
 
         if (CollUtil.isEmpty(taskOrderReportDOS)) {
             return null;

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

@@ -9,4 +9,14 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
+    <select id="selectGenerateReportList">
+        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
+        where a.ORDER_ITEM_ID = #{orderItemId}
+          and a.TASK_STATUS in (520,600,700,710,800)
+        order by
+            case when a.REPORT_TYPE = 100 then 0 else 1 end,
+            a.SORT
+    </select>
+
 </mapper>

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

@@ -16,8 +16,7 @@
           and a.TASK_STATUS in (520,600,700,710,800)
           order by
             case when a.REPORT_TYPE = 100 then 0 else 1 end,
-            a.TEMPLATE_ID,
-            b.IS_MAIN_CHECK desc
+            a.SORT
     </select>
 
 </mapper>