小程序拒检约检

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/appointmentconfirmorder/AppointmentConfirmOrderServiceImpl.java

@@ -602,7 +602,7 @@ public class AppointmentConfirmOrderServiceImpl implements AppointmentConfirmOrd
             return;
         }
         // 拒绝检验
-        if(200 == appointmentRefuseVO.getType()){
+/*        if(200 == appointmentRefuseVO.getType()){
 
             List<AppointmentConfirmRefuseYearItemDO> list = equipContainerDOS.stream().map(item -> {
                 AppointmentConfirmRefuseYearItemDO appointmentConfirmOrderRefuseItemDO = new AppointmentConfirmRefuseYearItemDO();
@@ -658,7 +658,7 @@ public class AppointmentConfirmOrderServiceImpl implements AppointmentConfirmOrd
             }
 
             return ;
-        }
+        }*/
 
         Map<String, Object> processInstanceVariables = new HashMap<>();
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/appointmentconfirmorder/PipeAppointmentConfirmOrderServiceImpl.java

@@ -641,7 +641,7 @@ public class PipeAppointmentConfirmOrderServiceImpl implements PipeAppointmentCo
             return;
         }
         // 拒绝检验
-        if(200 == appointmentRefuseVO.getType()){
+        /*if(200 == appointmentRefuseVO.getType()){
 
             List<EquipPipeDetailDO> equipPipeDetailDOS = equipPipeDetailMapper.selectByIds(equipDetailIds);
             List<AppointmentConfirmRefuseYearItemDO> list = equipPipeDetailDOS.stream().map(item -> {
@@ -674,7 +674,7 @@ public class PipeAppointmentConfirmOrderServiceImpl implements PipeAppointmentCo
             updateConfirmOrderByPipeDetail(appointmentRefuseVO.getOrderId(),equipContainerDOS,equipDetailIds);
 
             return ;
-        }
+        }*/
 
         //上报市局
         Map<String, Object> processInstanceVariables = new HashMap<>();
@@ -1263,11 +1263,21 @@ public class PipeAppointmentConfirmOrderServiceImpl implements PipeAppointmentCo
         }
     }
 
+    @Resource
+    private PipeAppointmentConfirmOrderItemMapper pipeAppointmentConfirmOrderItemMapper;
+
     @Override
     public void refuseCheckApp(AppAppointmentRefuseVO appointmentRefuseVO) {
         AppointmentRefuseVO refuseVO = new AppointmentRefuseVO();
-        refuseVO.setEquipIds(appointmentRefuseVO.getEquipIds());
-        refuseVO.setDetailEquipRows(appointmentRefuseVO.getDetailEquipRows());
+        List<PipeAppointmentConfirmOrderItemDO> pipeAppointmentConfirmOrderItemDOS = pipeAppointmentConfirmOrderItemMapper.selectByIds(appointmentRefuseVO.getEquipIds());
+        refuseVO.setEquipIds(pipeAppointmentConfirmOrderItemDOS.stream().map(PipeAppointmentConfirmOrderItemDO::getEquipId).toList());
+        List<EquipPipeDetailDO> detailEquipRows = appointmentRefuseVO.getDetailEquipRows();
+        if (!CollUtil.isEmpty(detailEquipRows)) {
+            List<PipeAppointmentConfirmOrderItemDetailDO> pipeAppointmentConfirmOrderItemDetailDOS = pipeAppointmentConfirmOrderItemDetailMapper.selectByIds(detailEquipRows.stream().map(EquipPipeDetailDO::getId).toList());
+            List<String> list = pipeAppointmentConfirmOrderItemDetailDOS.stream().map(PipeAppointmentConfirmOrderItemDetailDO::getEquipId).toList();
+            List<EquipPipeDetailDO> equipPipeDetailDOS = equipPipeDetailMapper.selectByIds(list);
+            refuseVO.setDetailEquipRows(equipPipeDetailDOS);
+        }
         refuseVO.setOrderId(appointmentRefuseVO.getOrderId());
         refuseVO.setOrderNo(appointmentRefuseVO.getOrderNo());
         refuseVO.setCheckType(appointmentRefuseVO.getCheckType());

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

@@ -10,6 +10,7 @@ import cn.start.tz.framework.common.exception.ServiceException;
 import cn.start.tz.framework.common.exception.enums.GlobalErrorCodeConstants;
 import cn.start.tz.framework.common.pojo.CommonResult;
 import cn.start.tz.framework.common.util.date.DateUtils;
+import cn.start.tz.framework.env.core.enums.EnvEnum;
 import cn.start.tz.framework.ip.core.Area;
 import cn.start.tz.framework.ip.core.utils.AreaUtils;
 import cn.start.tz.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -163,6 +164,7 @@ import cn.start.tz.module.pressure2.service.pdf.PdfService;
 import cn.start.tz.module.pressure2.service.pipetaskorder.PipeTaskOrderService;
 import cn.start.tz.module.pressure2.service.pipetaskorder.PipeTaskOrderServiceImpl;
 import cn.start.tz.module.pressure2.service.pipetaskorderissuereport.PipeTaskOrderIssueReportService;
+import cn.start.tz.module.pressure2.service.pushtaskorder.PushTaskOrderService;
 import cn.start.tz.module.pressure2.service.synchronization.SynchronizationService;
 import cn.start.tz.module.pressure2.service.synchronization.dto.ReportDto;
 import cn.start.tz.module.pressure2.service.userwallthicknesstemplate.UserWallThicknessTemplateService;
@@ -1923,6 +1925,9 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         return true;
     }
 
+    @Resource
+    private PushTaskOrderService pushTaskOrderService;
+
     @Transactional
     @Override
     public Boolean audit(String id, Integer status, String reason) {
@@ -2010,6 +2015,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             BoilerTaskOrderItemDO taskOrderItem = new BoilerTaskOrderItemDO();
             taskOrderItem.setTaskStatus(TaskOrderStatusEnum.CANCEL.getStatus());
             boilerTaskOrderItemMapper.update(taskOrderItem, new LambdaUpdateWrapper<BoilerTaskOrderItemDO>().eq(BoilerTaskOrderItemDO::getOrderId, id));
+//            pushTaskOrderService.pushFinanceSystem(taskOrderDO);
         }
 
         return true;