报告归档调整

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

@@ -4184,6 +4184,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         //重大线索 不需要审核
         if (dynamicTbDO.getTbType() != null && TaskOrderItemReportTypeEnum.MAJOR_CLUE.getType().intValue() == dynamicTbDO.getTbType()) {
             addReport.setStatus(200);
+            addReport.setTaskStatus(TaskOrderStatusEnum.REPORT_FINISH.getStatus());
         }else{
             addReport.setStatus(0);
         }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderServiceImpl.java

@@ -3373,6 +3373,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
         //重大线索 不需要审核
         if (dynamicTbDO.getTbType() != null && TaskOrderItemReportTypeEnum.MAJOR_CLUE.getType().intValue() == dynamicTbDO.getTbType()) {
             addReport.setStatus(200);
+            addReport.setTaskStatus(TaskOrderStatusEnum.REPORT_FINISH.getStatus());
         }else{
             addReport.setStatus(0);
         }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderissuereport/PipeTaskOrderIssueReportServiceImpl.java

@@ -2089,7 +2089,7 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
         taskOrderArchiveDetail.setEquipCode(taskOrderItemDO.getEquipCode());
 
         LambdaQueryWrapper<PipeTaskOrderItemReportDO> queryWrapper = new LambdaQueryWrapperX<>();
-        queryWrapper.eq(PipeTaskOrderItemReportDO::getOrderItemId, orderItemId);
+        queryWrapper.eq(PipeTaskOrderItemReportDO::getOrderId, taskOrderDO.getId());
         queryWrapper.eq(PipeTaskOrderItemReportDO::getTaskStatus, 800);
         List<PipeTaskOrderItemReportDO> taskOrderItemReportDOS = taskOrderItemReportMapper.selectList(queryWrapper);
         if (CollUtil.isNotEmpty(taskOrderItemReportDOS)) {
@@ -2219,7 +2219,6 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
             BoilerTaskOrderSignFilePageReqVO pageReqVO4 = new BoilerTaskOrderSignFilePageReqVO();
             pageReqVO4.setBusinessType(400);
             pageReqVO4.setOrderId(taskOrderItemReportDOS.get(0).getOrderId());
-            pageReqVO4.setOrderItemId(orderItemId);
             PageResult<BoilerTaskOrderSignFileRespVO> taskOrderSignFilePage4 = taskOrderSignFileService.getTaskOrderSignFilePage(pageReqVO4);
             if (ObjectUtil.isNotEmpty(taskOrderSignFilePage4) && CollUtil.isNotEmpty(taskOrderSignFilePage4.getList())) {