Merge remote-tracking branch 'origin/dev' into dev

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/appointmentconfirmorder/vo/AppointmentRefuseVO.java

@@ -1,5 +1,6 @@
 package cn.start.tz.module.pressure2.controller.admin.appointmentconfirmorder.vo;
 
+import cn.start.tz.module.pressure2.dal.dataobject.equippipedetail.EquipPipeDetailDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -12,6 +13,9 @@ public class AppointmentRefuseVO {
     @Schema(description = "id列表", required = true)
     private List<String> equipIds;
 
+    @Schema(description = "管线列表")
+    private List<EquipPipeDetailDO> detailEquipRows;
+
     @Schema(description = "订单id")
     private String orderId;
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorder/vo/PipeOrderItemProjectVO.java

@@ -112,4 +112,15 @@ public class PipeOrderItemProjectVO {
     private String pipeMedium;
 
     private String startEndPoint;
+
+    @Schema(description = "拒绝原因", example = "不喜欢")
+    private String reason;
+
+    private String reasonDict;
+
+    @Schema(description = "编辑类型")
+    private String editType;
+
+    @Schema(description = "拒绝类型")
+    private Integer rejectType;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/acceptorder/PipeAcceptOrderServiceImpl.java

@@ -28,6 +28,7 @@ import cn.start.tz.module.infra.api.pay.PayApi;
 import cn.start.tz.module.infra.api.pay.dto.TaskChargeDTO;
 import cn.start.tz.module.member.api.user.MemberUserApi;
 import cn.start.tz.module.pressure.constant.TemplateIdConstants;
+import cn.start.tz.module.pressure2.dal.dataobject.appointmentconfirmorder.AppointmentConfirmOrderDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boileracceptorderuser.BoilerAcceptOrderUserDO;
 import cn.start.tz.module.pressure2.enums.RedisKeyEnums;
 import cn.start.tz.module.pressure2.controller.admin.acceptorder.vo.*;
@@ -379,9 +380,11 @@ public class PipeAcceptOrderServiceImpl implements PipeAcceptOrderService {
 
     @Override
     public void refuse(AppointmentRefuseVO appointmentRefuseVO) {
+
         List<PipeAcceptOrderItemDO> equipContainerDOS =  pipeAcceptOrderItemMapper.selectList(new LambdaQueryWrapperX<PipeAcceptOrderItemDO>()
                 .in(PipeAcceptOrderItemDO::getEquipId, appointmentRefuseVO.getEquipIds())
                 .eq(PipeAcceptOrderItemDO::getOrderId, appointmentRefuseVO.getOrderId()));
+        List<String> equipDetailIds = appointmentRefuseVO.getDetailEquipRows().stream().map(EquipPipeDetailDO::getId).toList();
         if (CollUtil.isEmpty(equipContainerDOS)) {
             throw new ServiceException(404,"受理单设备不存在");
         }
@@ -390,12 +393,15 @@ public class PipeAcceptOrderServiceImpl implements PipeAcceptOrderService {
             throw new ServiceException(404,"受理单不存在");
         }
 
+        List<EquipPipeDetailDO> equipPipeDetailDOS = equipPipeDetailMapper.selectByIds(equipDetailIds);
         List<DictDataRespDTO> checkTypeDTOS = dictDataApi.getDictDataList("pressure_inspection_nature_pipe").getData();
         List<DictDataRespDTO> pipeStatusDTOS = dictDataApi.getDictDataList("PIPE_USE_STATUS").getData();
-        List<AppointmentConfirmOrderRefuseItemDO> list = equipContainerDOS.stream().map(item -> {
+
+        List<AppointmentConfirmOrderRefuseItemDO> list = equipPipeDetailDOS.stream().map(item -> {
+
             AppointmentConfirmOrderRefuseItemDO appointmentConfirmOrderRefuseItemDO = new AppointmentConfirmOrderRefuseItemDO();
             appointmentConfirmOrderRefuseItemDO.setOrderId(appointmentRefuseVO.getOrderId());
-            appointmentConfirmOrderRefuseItemDO.setEquipId(item.getEquipId());
+            appointmentConfirmOrderRefuseItemDO.setEquipId(item.getId());
             appointmentConfirmOrderRefuseItemDO.setIsReportCity(false);
 
             appointmentConfirmOrderRefuseItemDO.setUnitCode(acceptOrderDO.getUnitCode());
@@ -418,18 +424,18 @@ public class PipeAcceptOrderServiceImpl implements PipeAcceptOrderService {
             appointmentConfirmOrderRefuseItemDO.setEquipMainType(300); //管道
             appointmentConfirmOrderRefuseItemDO.setRejectionSource(1); //窗口拒检
 
-            EquipPipeDO equipPipeDO = equipPipeMapper.selectById(item.getId());
+            EquipPipeDO equipPipeDO = equipPipeMapper.selectById(item.getEquipPipeId());
             if (equipPipeDO != null) {
                 appointmentConfirmOrderRefuseItemDO.setEquipId(equipPipeDO.getId());
-                appointmentConfirmOrderRefuseItemDO.setEquipCode(equipPipeDO.getProjectNo());
+                appointmentConfirmOrderRefuseItemDO.setProductNo(item.getProjectNo());
+                appointmentConfirmOrderRefuseItemDO.setEquipCode(item.getPipeRegCode());
+                appointmentConfirmOrderRefuseItemDO.setUseRegisterNo(item.getCertificateNo());
                 appointmentConfirmOrderRefuseItemDO.setEquipDistrict(equipPipeDO.getEquipDistrict());
                 appointmentConfirmOrderRefuseItemDO.setEquipStreet(equipPipeDO.getEquipStreet());
                 appointmentConfirmOrderRefuseItemDO.setEquipType(equipPipeDO.getPipeCategory());
 //                appointmentConfirmOrderRefuseItemDO.setAreaType(equipPipeDO.getAreaType());
                 appointmentConfirmOrderRefuseItemDO.setUnitCode(equipPipeDO.getUnitCode());
                 appointmentConfirmOrderRefuseItemDO.setUnitName(equipPipeDO.getUnitName());
-                appointmentConfirmOrderRefuseItemDO.setUseRegisterNo(equipPipeDO.getCertificateNo());
-//                appointmentConfirmOrderRefuseItemDO.setProductNo(equipPipeDO.getProductCode());
                 appointmentConfirmOrderRefuseItemDO.setEquipStatus(equipPipeDO.getUseStatus());
                 if (CollUtil.isNotEmpty(pipeStatusDTOS)){
                     String equipStatusName = pipeStatusDTOS.stream()
@@ -457,25 +463,27 @@ public class PipeAcceptOrderServiceImpl implements PipeAcceptOrderService {
 
         appointmentConfirmOrderRefuseItemMapper.insertBatch(list);
 
-        List<PipeAcceptOrderItemDO> pipeAcceptOrderItemDOS = pipeAcceptOrderItemMapper.selectList(new LambdaQueryWrapperX<PipeAcceptOrderItemDO>().
-                eq(PipeAcceptOrderItemDO::getOrderId, appointmentRefuseVO.getOrderId()).
-                in(PipeAcceptOrderItemDO::getEquipId, appointmentRefuseVO.getEquipIds())
-        );
-
-        pipeAcceptOrderItemMapper.delete(new LambdaQueryWrapperX< PipeAcceptOrderItemDO>().
-                eq(PipeAcceptOrderItemDO::getOrderId, appointmentRefuseVO.getOrderId()).
-                in(PipeAcceptOrderItemDO::getEquipId, appointmentRefuseVO.getEquipIds())
-        );
-        if (CollUtil.isNotEmpty(pipeAcceptOrderItemDOS)) {
-            acceptOrderDO.setEquipNum(pipeAcceptOrderItemDOS.size());
-            acceptOrderMapper.updateById(acceptOrderDO);
-        pipeAcceptOrderItemDetailMapper.delete(new LambdaQueryWrapperX<PipeAcceptOrderItemDetailDO>().
-                in(PipeAcceptOrderItemDetailDO::getOrderItemId, pipeAcceptOrderItemDOS.stream().map(PipeAcceptOrderItemDO::getId).toList())
-        );
-        }
-        Long size = pipeAcceptOrderItemMapper.selectCount(PipeAcceptOrderItemDO::getOrderId,acceptOrderDO.getId());
-        acceptOrderDO.setEquipNum(Math.toIntExact(size));
-        acceptOrderMapper.updateById(acceptOrderDO);
+        updateAcceptOrderByPipeDetail(appointmentRefuseVO.getOrderId(),equipContainerDOS,equipDetailIds);
+
+//        List<PipeAcceptOrderItemDO> pipeAcceptOrderItemDOS = pipeAcceptOrderItemMapper.selectList(new LambdaQueryWrapperX<PipeAcceptOrderItemDO>().
+//                eq(PipeAcceptOrderItemDO::getOrderId, appointmentRefuseVO.getOrderId()).
+//                in(PipeAcceptOrderItemDO::getEquipId, appointmentRefuseVO.getEquipIds())
+//        );
+//
+//        pipeAcceptOrderItemMapper.delete(new LambdaQueryWrapperX< PipeAcceptOrderItemDO>().
+//                eq(PipeAcceptOrderItemDO::getOrderId, appointmentRefuseVO.getOrderId()).
+//                in(PipeAcceptOrderItemDO::getEquipId, appointmentRefuseVO.getEquipIds())
+//        );
+//        if (CollUtil.isNotEmpty(pipeAcceptOrderItemDOS)) {
+//            acceptOrderDO.setEquipNum(pipeAcceptOrderItemDOS.size());
+//            acceptOrderMapper.updateById(acceptOrderDO);
+//        pipeAcceptOrderItemDetailMapper.delete(new LambdaQueryWrapperX<PipeAcceptOrderItemDetailDO>().
+//                in(PipeAcceptOrderItemDetailDO::getOrderItemId, pipeAcceptOrderItemDOS.stream().map(PipeAcceptOrderItemDO::getId).toList())
+//        );
+//        }
+//        Long size = pipeAcceptOrderItemMapper.selectCount(PipeAcceptOrderItemDO::getOrderId,acceptOrderDO.getId());
+//        acceptOrderDO.setEquipNum(Math.toIntExact(size));
+//        acceptOrderMapper.updateById(acceptOrderDO);
     }
 
     @Override
@@ -1152,4 +1160,36 @@ public class PipeAcceptOrderServiceImpl implements PipeAcceptOrderService {
         result.setList(list);
         return result;
     }
+
+    public void updateAcceptOrderByPipeDetail(String orderId,List<PipeAcceptOrderItemDO> pipeAcceptOrderItemDOS,List<String> equipDetailIds) {
+
+        pipeAcceptOrderItemDetailMapper.delete(new LambdaQueryWrapperX<PipeAcceptOrderItemDetailDO>().
+                eq(PipeAcceptOrderItemDetailDO::getOrderId, orderId).
+                in(PipeAcceptOrderItemDetailDO::getEquipDetailId, equipDetailIds)
+        );
+
+        pipeAcceptOrderItemDOS.forEach(item -> {
+
+            Long count = pipeAcceptOrderItemDetailMapper.selectCount(new LambdaQueryWrapperX<PipeAcceptOrderItemDetailDO>().
+                    eq(PipeAcceptOrderItemDetailDO::getOrderId, orderId).
+                    eq(PipeAcceptOrderItemDetailDO::getOrderItemId, item.getId())
+            );
+            //管线数量为空则删除管道
+            if (count == null || count == 0){
+                pipeAcceptOrderItemMapper.deleteById(item.getId());
+            }
+
+        });
+        //管道数量为空则删除约检确认单，不为空则修改数量
+        Long count = pipeAcceptOrderItemMapper.selectCount(PipeAcceptOrderItemDO::getOrderId, orderId);
+        AcceptOrderDO updateOrder = new AcceptOrderDO();
+        updateOrder.setId(orderId);
+        if(count == null || count == 0){
+            updateOrder.setStatus(500);
+        }else{
+            updateOrder.setEquipNum(Math.toIntExact(count));
+        }
+        acceptOrderMapper.updateById(updateOrder);
+
+    }
 }

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

@@ -29,6 +29,8 @@ import cn.start.tz.module.pressure2.controller.admin.pipeorderexception.vo.PipeO
 import cn.start.tz.module.pressure2.dal.dataobject.boileracceptorderuser.BoilerAcceptOrderUserDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilerappointmentconfirmorderuser.BoilerAppointmentConfirmOrderUserDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilerorderexception.BoilerOrderExceptionDO;
+import cn.start.tz.module.pressure2.dal.dataobject.equippipescheduling.EquipPipeSchedulingDO;
+import cn.start.tz.module.pressure2.dal.mysql.equippipescheduling.EquipPipeSchedulingMapper;
 import cn.start.tz.module.pressure2.enums.RedisKeyEnums;
 import cn.start.tz.module.pressure2.controller.admin.appointmentconfirmorder.vo.*;
 import cn.start.tz.module.pressure2.controller.app.appointmentconfirmorder.vo.AppAppointmentRefuseVO;
@@ -145,6 +147,9 @@ public class PipeAppointmentConfirmOrderServiceImpl implements PipeAppointmentCo
     @Resource
     private EquipPipeMapper equipPipeMapper;
 
+    @Resource
+    private EquipPipeSchedulingMapper equipPipeSchedulingMapper;
+
     @Resource
     private PipeAppointmentConfirmOrderItemMapper appointmentConfirmOrderItemMapper;
 
@@ -579,63 +584,63 @@ public class PipeAppointmentConfirmOrderServiceImpl implements PipeAppointmentCo
     }
 
     @Override
+    @Transactional
     public void refuseCheck(AppointmentRefuseVO appointmentRefuseVO) {
         String userId = getLoginUserId();
         List<EquipPipeDO> equipContainerDOS = equipPipeMapper.selectByIds(appointmentRefuseVO.getEquipIds());
+        List<String> equipDetailIds = appointmentRefuseVO.getDetailEquipRows().stream().map(EquipPipeDetailDO::getId).toList();
         AppointmentConfirmOrderDO appointmentConfirmOrderDO = appointmentConfirmOrderMapper.selectById(appointmentRefuseVO.getOrderId());
+        if (appointmentConfirmOrderDO == null){
+            throw new ServiceException(500, "未找到该约检确认单");
+        }
 
-        // 删除拒绝约检设备
-        if(appointmentConfirmOrderDO != null){
-            List<EquipPipeSchedulingItemDO> pipeTaskOrderItemDOS = equipPipeSchedulingItemMapper.selectList(new LambdaQueryWrapperX<EquipPipeSchedulingItemDO>().
-                    eq(EquipPipeSchedulingItemDO::getSchedulingId, appointmentConfirmOrderDO.getSchedulingId()).
-                    in(EquipPipeSchedulingItemDO::getEquipId, appointmentRefuseVO.getEquipIds())
+        //删除计划排期设备
+        //删除管线
+        if (!appointmentRefuseVO.getDetailEquipRows().isEmpty()){
+            //删除管线
+            equipPipeSchedulingItemDetailMapper.delete(new LambdaQueryWrapperX<EquipPipeSchedulingItemDetailDO>().
+                    eq(EquipPipeSchedulingItemDetailDO::getSchedulingId, appointmentConfirmOrderDO.getSchedulingId()).
+                    in(EquipPipeSchedulingItemDetailDO::getEquipDetailId, equipDetailIds)
             );
-            equipPipeSchedulingItemMapper.delete(new LambdaQueryWrapperX<EquipPipeSchedulingItemDO>().
+            List<EquipPipeSchedulingItemDO> pipeSchedulingItemDOS = equipPipeSchedulingItemMapper.selectList(new LambdaQueryWrapperX<EquipPipeSchedulingItemDO>().
                     eq(EquipPipeSchedulingItemDO::getSchedulingId, appointmentConfirmOrderDO.getSchedulingId()).
-                    in(EquipPipeSchedulingItemDO::getEquipId, appointmentRefuseVO.getEquipIds())
+                    in(EquipPipeSchedulingItemDO::getEquipId, equipContainerDOS.stream().map(EquipPipeDO::getId).toList())
             );
-            if(pipeTaskOrderItemDOS != null && !pipeTaskOrderItemDOS.isEmpty()){
-            appointmentConfirmOrderDO.setEquipNumBoiler(pipeTaskOrderItemDOS.size());
-            appointmentConfirmOrderMapper.updateById(appointmentConfirmOrderDO);
-            equipPipeSchedulingItemDetailMapper.delete(new LambdaQueryWrapperX<EquipPipeSchedulingItemDetailDO>()
-                    .in(EquipPipeSchedulingItemDetailDO::getSchedulingItemId, pipeTaskOrderItemDOS.stream().map(EquipPipeSchedulingItemDO::getId).toList())
+            pipeSchedulingItemDOS.forEach(item -> {
+
+                Long count = equipPipeSchedulingItemDetailMapper.selectCount(new LambdaQueryWrapperX<EquipPipeSchedulingItemDetailDO>().
+                        eq(EquipPipeSchedulingItemDetailDO::getSchedulingId, appointmentConfirmOrderDO.getSchedulingId()).
+                        eq(EquipPipeSchedulingItemDetailDO::getSchedulingItemId, item.getId())
+                );
+                //管线数量为空则删除管道
+                if (count == null || count == 0){
+                    equipPipeSchedulingItemMapper.deleteById(item.getId());
+                }
+
+            });
+
+            Long count = equipPipeSchedulingItemMapper.selectCount(new LambdaQueryWrapperX<EquipPipeSchedulingItemDO>().
+                    eq(EquipPipeSchedulingItemDO::getSchedulingId, appointmentConfirmOrderDO.getSchedulingId())
             );
+            //管道数量为空则删除排期表
+            if (count == null || count == 0){
+                equipPipeSchedulingMapper.deleteById(appointmentConfirmOrderDO.getSchedulingId());
             }
 
         }
+
         if (300 == appointmentRefuseVO.getType()) {
             // 无需上报, 设备移除约检单
-            List<PipeAppointmentConfirmOrderItemDO> pipeTaskOrderItemDOS = appointmentConfirmOrderItemMapper.selectList(new LambdaQueryWrapperX<PipeAppointmentConfirmOrderItemDO>().
-                    eq(PipeAppointmentConfirmOrderItemDO::getOrderId, appointmentRefuseVO.getOrderId()).
-                    in(PipeAppointmentConfirmOrderItemDO::getEquipId, appointmentRefuseVO.getEquipIds())
-            );
-            appointmentConfirmOrderItemMapper.delete(new LambdaQueryWrapperX<PipeAppointmentConfirmOrderItemDO>().
-                    eq(PipeAppointmentConfirmOrderItemDO::getOrderId, appointmentRefuseVO.getOrderId()).
-                    in(PipeAppointmentConfirmOrderItemDO::getEquipId, appointmentRefuseVO.getEquipIds())
-            );
-            if(pipeTaskOrderItemDOS != null && !pipeTaskOrderItemDOS.isEmpty()){
-            appointmentConfirmOrderItemDetailMapper.delete(new LambdaQueryWrapperX<PipeAppointmentConfirmOrderItemDetailDO>()
-                    .in(PipeAppointmentConfirmOrderItemDetailDO::getItemId, pipeTaskOrderItemDOS.stream().map(PipeAppointmentConfirmOrderItemDO::getId).toList())
-            );
-            }
-            if(StringUtils.isNotBlank(appointmentRefuseVO.getOrderId())){
-                Long count = appointmentConfirmOrderItemMapper.selectCount(PipeAppointmentConfirmOrderItemDO::getOrderId, appointmentRefuseVO.getOrderId());
-                AppointmentConfirmOrderDO updateOrder = new AppointmentConfirmOrderDO();
-                updateOrder.setId(appointmentRefuseVO.getOrderId());
-                if (count == null || count == 0) {
-                    updateOrder.setStatus(500);
-                }
-                if (count != null) {
-                    updateOrder.setEquipNumBoiler(Math.toIntExact(count));
-                }
-                appointmentConfirmOrderMapper.updateById(updateOrder);
-            }
+            updateConfirmOrderByPipeDetail(appointmentRefuseVO.getOrderId(),equipContainerDOS,equipDetailIds);
             return;
         }
         // 拒绝检验
         if(200 == appointmentRefuseVO.getType()){
 
-            List<AppointmentConfirmRefuseYearItemDO> list = equipContainerDOS.stream().map(item -> {
+            List<EquipPipeDetailDO> equipPipeDetailDOS = equipPipeDetailMapper.selectByIds(equipDetailIds);
+            List<AppointmentConfirmRefuseYearItemDO> list = equipPipeDetailDOS.stream().map(item -> {
+
+                EquipPipeDO equipPipeDO = equipPipeMapper.selectById(item.getEquipPipeId());
                 AppointmentConfirmRefuseYearItemDO appointmentConfirmOrderRefuseItemDO = new AppointmentConfirmRefuseYearItemDO();
                 appointmentConfirmOrderRefuseItemDO.setOrderId(appointmentRefuseVO.getOrderId());
                 appointmentConfirmOrderRefuseItemDO.setEquipId(item.getId());
@@ -643,20 +648,16 @@ public class PipeAppointmentConfirmOrderServiceImpl implements PipeAppointmentCo
                     appointmentConfirmOrderRefuseItemDO.setNextCheckDate(LocalDate.from(item.getNextLegalCheckDate()));
                 }
 
-                appointmentConfirmOrderRefuseItemDO.setUnitCode(item.getUnitCode());
-                appointmentConfirmOrderRefuseItemDO.setUnitName(item.getUnitName());
+                appointmentConfirmOrderRefuseItemDO.setUnitCode(equipPipeDO.getUnitCode());
+                appointmentConfirmOrderRefuseItemDO.setUnitName(equipPipeDO.getUnitName());
                 appointmentConfirmOrderRefuseItemDO.setCheckType(appointmentRefuseVO.getCheckType());
                 appointmentConfirmOrderRefuseItemDO.setOrderNo(appointmentRefuseVO.getOrderNo());
                 appointmentConfirmOrderRefuseItemDO.setSubmitId(getLoginUserId());
                 appointmentConfirmOrderRefuseItemDO.setSubmitTime(LocalDateTime.now());
                 appointmentConfirmOrderRefuseItemDO.setReasonDict(appointmentRefuseVO.getReasonDict());
-                //appointmentConfirmOrderRefuseItemDO.setBeDistrict(item.getBeDistrict());
-                //appointmentConfirmOrderRefuseItemDO.setEquipType(item.getEquipType());
 
-                if (appointmentConfirmOrderDO != null) {
-                    appointmentConfirmOrderRefuseItemDO.setCheckDate(appointmentConfirmOrderDO.getAppointmentDate());
-                    appointmentConfirmOrderRefuseItemDO.setOrderNo(appointmentConfirmOrderDO.getAppointmentNo());
-                }
+                appointmentConfirmOrderRefuseItemDO.setCheckDate(appointmentConfirmOrderDO.getAppointmentDate());
+                appointmentConfirmOrderRefuseItemDO.setOrderNo(appointmentConfirmOrderDO.getAppointmentNo());
 
                 appointmentConfirmOrderRefuseItemDO.setReason(appointmentRefuseVO.getReason());
                 return appointmentConfirmOrderRefuseItemDO;
@@ -664,43 +665,34 @@ public class PipeAppointmentConfirmOrderServiceImpl implements PipeAppointmentCo
 
             appointmentConfirmRefuseYearItemMapper.insert(list);
 
-            appointmentConfirmOrderItemMapper.delete(new LambdaQueryWrapperX<PipeAppointmentConfirmOrderItemDO>().
-                    eq(PipeAppointmentConfirmOrderItemDO::getOrderId, appointmentRefuseVO.getOrderId()).
-                    in(PipeAppointmentConfirmOrderItemDO::getEquipId, appointmentRefuseVO.getEquipIds())
-            );
-
-            if(StringUtils.isNotBlank(appointmentRefuseVO.getOrderId())){
-                Long count = appointmentConfirmOrderItemMapper.selectCount(PipeAppointmentConfirmOrderItemDO::getOrderId, appointmentRefuseVO.getOrderId());
-                AppointmentConfirmOrderDO updateOrder = new AppointmentConfirmOrderDO();
-                updateOrder.setId(appointmentRefuseVO.getOrderId());
-                if (count == null || count == 0) {
-                    updateOrder.setStatus(500);
-                }
-                if (count != null) {
-                    updateOrder.setEquipNumBoiler(Math.toIntExact(count));
-                }
-                appointmentConfirmOrderMapper.updateById(updateOrder);
-            }
+            updateConfirmOrderByPipeDetail(appointmentRefuseVO.getOrderId(),equipContainerDOS,equipDetailIds);
 
             return ;
         }
 
+        //上报市局
         Map<String, Object> processInstanceVariables = new HashMap<>();
         List<DictDataRespDTO> checkTypeDTOS = dictDataApi.getDictDataList("pressure_inspection_nature_pipe").getData();
         List<DictDataRespDTO> pipeStatusDTOS = dictDataApi.getDictDataList("PIPE_USE_STATUS").getData();
-        List<AppointmentConfirmOrderRefuseItemDO> list = equipContainerDOS.stream().map(item -> {
+        List<EquipPipeDetailDO> equipPipeDetailDOS = equipPipeDetailMapper.selectByIds(equipDetailIds);
+
+        List<AppointmentConfirmOrderRefuseItemDO> list = equipPipeDetailDOS.stream().map(item -> {
+
+            EquipPipeDO equipPipeDO = equipPipeMapper.selectById(item.getEquipPipeId());
+
             AppointmentConfirmOrderRefuseItemDO appointmentConfirmOrderRefuseItemDO = new AppointmentConfirmOrderRefuseItemDO();
             appointmentConfirmOrderRefuseItemDO.setOrderId(appointmentRefuseVO.getOrderId());
             appointmentConfirmOrderRefuseItemDO.setIsReportCity(false);
 
             appointmentConfirmOrderRefuseItemDO.setEquipId(item.getId());
-            appointmentConfirmOrderRefuseItemDO.setEquipCode(item.getProjectNo());
-            appointmentConfirmOrderRefuseItemDO.setEquipDistrict(item.getEquipDistrict());
-            appointmentConfirmOrderRefuseItemDO.setEquipStreet(item.getEquipStreet());
-            appointmentConfirmOrderRefuseItemDO.setEquipType(item.getPipeCategory());
-            appointmentConfirmOrderRefuseItemDO.setUnitCode(item.getUnitCode());
-            appointmentConfirmOrderRefuseItemDO.setUnitName(item.getUnitName());
+            appointmentConfirmOrderRefuseItemDO.setProductNo(item.getProjectNo());
+            appointmentConfirmOrderRefuseItemDO.setEquipCode(item.getPipeRegCode());
             appointmentConfirmOrderRefuseItemDO.setUseRegisterNo(item.getCertificateNo());
+            appointmentConfirmOrderRefuseItemDO.setEquipDistrict(equipPipeDO.getEquipDistrict());
+            appointmentConfirmOrderRefuseItemDO.setEquipStreet(equipPipeDO.getEquipStreet());
+            appointmentConfirmOrderRefuseItemDO.setEquipType(item.getPipeCategory());
+            appointmentConfirmOrderRefuseItemDO.setUnitCode(equipPipeDO.getUnitCode());
+            appointmentConfirmOrderRefuseItemDO.setUnitName(equipPipeDO.getUnitName());
             appointmentConfirmOrderRefuseItemDO.setEquipStatus(item.getUseStatus());
             if (CollUtil.isNotEmpty(pipeStatusDTOS)){
                 String equipStatusName = pipeStatusDTOS.stream()
@@ -710,8 +702,8 @@ public class PipeAppointmentConfirmOrderServiceImpl implements PipeAppointmentCo
                         .orElse("");
                 appointmentConfirmOrderRefuseItemDO.setEquipStatusName(equipStatusName);
             }
-            appointmentConfirmOrderRefuseItemDO.setContact(item.getContact());
-            appointmentConfirmOrderRefuseItemDO.setContactPhone(item.getContactPhone());
+            appointmentConfirmOrderRefuseItemDO.setContact(equipPipeDO.getContact());
+            appointmentConfirmOrderRefuseItemDO.setContactPhone(equipPipeDO.getContactPhone());
 
             appointmentConfirmOrderRefuseItemDO.setEquipMainType(300);
             appointmentConfirmOrderRefuseItemDO.setRejectionSource(1); //窗口拒检
@@ -719,24 +711,22 @@ public class PipeAppointmentConfirmOrderServiceImpl implements PipeAppointmentCo
             appointmentConfirmOrderRefuseItemDO.setReasonDict(appointmentRefuseVO.getReasonDict());
             appointmentConfirmOrderRefuseItemDO.setOrderType(appointmentRefuseVO.getOrderType());
 
-            appointmentConfirmOrderRefuseItemDO.setSubmitId(WebFrameworkUtils.getLoginUserId());
+            appointmentConfirmOrderRefuseItemDO.setSubmitId(getLoginUserId());
             appointmentConfirmOrderRefuseItemDO.setSubmitTime(LocalDateTime.now());
 
-            if (appointmentConfirmOrderDO != null) {
-                appointmentConfirmOrderRefuseItemDO.setCheckDate(appointmentConfirmOrderDO.getAppointmentDate());
-                appointmentConfirmOrderRefuseItemDO.setOrderNo(appointmentConfirmOrderDO.getAppointmentNo());
-                appointmentConfirmOrderRefuseItemDO.setNextCheckDate(appointmentConfirmOrderDO.getAppointmentDate());
-                Integer checkType = appointmentConfirmOrderDO.getCheckType();
-                if (CollUtil.isNotEmpty(checkTypeDTOS)){
-                    String checkTypeName = checkTypeDTOS.stream()
-                            .filter(dict -> dict.getValue().equals(checkType.toString()))
-                            .map(DictDataRespDTO::getLabel)
-                            .findFirst()
-                            .orElse("");
-                    appointmentConfirmOrderRefuseItemDO.setCheckTypeName(checkTypeName);
-                }
-                appointmentConfirmOrderRefuseItemDO.setCheckType(checkType);
+            appointmentConfirmOrderRefuseItemDO.setCheckDate(appointmentConfirmOrderDO.getAppointmentDate());
+            appointmentConfirmOrderRefuseItemDO.setOrderNo(appointmentConfirmOrderDO.getAppointmentNo());
+            appointmentConfirmOrderRefuseItemDO.setNextCheckDate(appointmentConfirmOrderDO.getAppointmentDate());
+            Integer checkType = appointmentConfirmOrderDO.getCheckType();
+            if (CollUtil.isNotEmpty(checkTypeDTOS)){
+                String checkTypeName = checkTypeDTOS.stream()
+                        .filter(dict -> dict.getValue().equals(checkType.toString()))
+                        .map(DictDataRespDTO::getLabel)
+                        .findFirst()
+                        .orElse("");
+                appointmentConfirmOrderRefuseItemDO.setCheckTypeName(checkTypeName);
             }
+            appointmentConfirmOrderRefuseItemDO.setCheckType(checkType);
 
             if (appointmentRefuseVO.getType() == 100) {
                 appointmentConfirmOrderRefuseItemDO.setIsReportCity(true);
@@ -770,30 +760,9 @@ public class PipeAppointmentConfirmOrderServiceImpl implements PipeAppointmentCo
             appointmentConfirmOrderRefuseItemMapper.updateById(updateObj);
         });
 
-        List<PipeAppointmentConfirmOrderItemDO> pipeTaskOrderItemDOS = appointmentConfirmOrderItemMapper.selectList(new LambdaQueryWrapperX<PipeAppointmentConfirmOrderItemDO>().
-                eq(PipeAppointmentConfirmOrderItemDO::getOrderId, appointmentRefuseVO.getOrderId()).
-                in(PipeAppointmentConfirmOrderItemDO::getEquipId, appointmentRefuseVO.getEquipIds())
-        );
+        //修改约检确认单
+        updateConfirmOrderByPipeDetail(appointmentRefuseVO.getOrderId(),equipContainerDOS,equipDetailIds);
 
-        appointmentConfirmOrderItemMapper.delete(new LambdaQueryWrapperX<PipeAppointmentConfirmOrderItemDO>().
-                eq(PipeAppointmentConfirmOrderItemDO::getOrderId, appointmentRefuseVO.getOrderId()).
-                in(PipeAppointmentConfirmOrderItemDO::getEquipId, appointmentRefuseVO.getEquipIds())
-        );
-        if (pipeTaskOrderItemDOS != null && pipeTaskOrderItemDOS.size() > 0) {
-        appointmentConfirmOrderItemDetailMapper.delete(new LambdaQueryWrapperX<PipeAppointmentConfirmOrderItemDetailDO>()
-                .in(PipeAppointmentConfirmOrderItemDetailDO::getItemId, pipeTaskOrderItemDOS.stream().map(PipeAppointmentConfirmOrderItemDO::getId).toList())
-        );
-        }
-        Long count = appointmentConfirmOrderItemMapper.selectCount(PipeAppointmentConfirmOrderItemDO::getOrderId, appointmentRefuseVO.getOrderId());
-        AppointmentConfirmOrderDO updateOrder = new AppointmentConfirmOrderDO();
-        updateOrder.setId(appointmentRefuseVO.getOrderId());
-        if (count == null || count == 0) {
-            updateOrder.setStatus(500);
-        }
-        if (count != null) {
-            updateOrder.setEquipNumBoiler(Math.toIntExact(count));
-        }
-        appointmentConfirmOrderMapper.updateById(updateOrder);
     }
 
     /**
@@ -1331,4 +1300,40 @@ public class PipeAppointmentConfirmOrderServiceImpl implements PipeAppointmentCo
 
         return pageResult;
     }
+
+    public void updateConfirmOrderByPipeDetail(String orderId,List<EquipPipeDO> equipContainerDOS,List<String> equipDetailIds) {
+
+        appointmentConfirmOrderItemDetailMapper.delete(new LambdaQueryWrapperX<PipeAppointmentConfirmOrderItemDetailDO>().
+                eq(PipeAppointmentConfirmOrderItemDetailDO::getOrderId, orderId).
+                in(PipeAppointmentConfirmOrderItemDetailDO::getEquipId, equipDetailIds)
+        );
+        List<PipeAppointmentConfirmOrderItemDO> pipeAppointmentConfirmOrderItemDOS = appointmentConfirmOrderItemMapper.selectList(new LambdaQueryWrapperX<PipeAppointmentConfirmOrderItemDO>().
+                eq(PipeAppointmentConfirmOrderItemDO::getOrderId, orderId).
+                in(PipeAppointmentConfirmOrderItemDO::getEquipId, equipContainerDOS.stream().map(EquipPipeDO::getId).toList())
+        );
+        pipeAppointmentConfirmOrderItemDOS.forEach(item -> {
+
+            Long count = appointmentConfirmOrderItemDetailMapper.selectCount(new LambdaQueryWrapperX<PipeAppointmentConfirmOrderItemDetailDO>().
+                    eq(PipeAppointmentConfirmOrderItemDetailDO::getOrderId, orderId).
+                    eq(PipeAppointmentConfirmOrderItemDetailDO::getItemId, item.getId())
+            );
+            //管线数量为空则删除管道
+            if (count == null || count == 0){
+                appointmentConfirmOrderItemMapper.deleteById(item.getId());
+            }
+
+        });
+        //管道数量为空则删除约检确认单，不为空则修改数量
+        Long count = appointmentConfirmOrderItemMapper.selectCount(PipeAppointmentConfirmOrderItemDO::getOrderId, orderId);
+        AppointmentConfirmOrderDO updateOrder = new AppointmentConfirmOrderDO();
+        updateOrder.setId(orderId);
+        if(count == null || count == 0){
+            updateOrder.setStatus(500);
+        }else{
+            updateOrder.setEquipNumBoiler(Math.toIntExact(count));
+        }
+        appointmentConfirmOrderMapper.updateById(updateOrder);
+
+    }
+
 }

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

@@ -1697,96 +1697,128 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
         Map<String, EquipPipeDO> equipContainerDOMap = equipContainerDOS.stream().collect(Collectors.toMap(EquipPipeDO::getId, equipContainerDO -> equipContainerDO));
 
-        if (!rejectEquipIDList.isEmpty()) {
-
-            List<PipeTaskOrderItemDO> pipeTaskOrderItemDOS = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapperX<PipeTaskOrderItemDO>()
-                    .eq(PipeTaskOrderItemDO::getOrderId, id)
-                    .in(PipeTaskOrderItemDO::getEquipId, rejectEquipIDList));
-
-            // 删除任务单设备表记录
-            pipeTaskOrderItemMapper.delete(new LambdaQueryWrapperX<PipeTaskOrderItemDO>()
-                    .eq(PipeTaskOrderItemDO::getOrderId, id)
-                    .in(PipeTaskOrderItemDO::getEquipId, rejectEquipIDList));
-            if ( pipeTaskOrderItemDOS != null && !pipeTaskOrderItemDOS.isEmpty()){
-            pipeTaskOrderItemDetailMapper.delete(new LambdaQueryWrapperX<PipeTaskOrderItemDetailDO>()
-                    .in(PipeTaskOrderItemDetailDO::getOrderItemId, pipeTaskOrderItemDOS.stream().map(PipeTaskOrderItemDO::getId).toList())
-            );
-            }
 
-            List<AppointmentConfirmOrderRefuseItemDO> rejectItems = new ArrayList<>();
-            List<DictDataRespDTO> checkTypeDTOS = dictDataApi.getDictDataList("pressure_inspection_nature_pipe").getData();
-            List<DictDataRespDTO> pipeStatusDTOS = dictDataApi.getDictDataList("PIPE_USE_STATUS").getData();
-            for (PipeTaskOrderItemAuditUpdateVO itemAuditUpdateVO : rejectEquipList) {
-                AppointmentConfirmOrderRefuseItemDO rejectItem = new AppointmentConfirmOrderRefuseItemDO();
+        if (!orderItems.isEmpty()) {
+
+            //设备删除
+            PipeTaskOrderDO finalTaskOrderDO1 = taskOrderDO;
+            PipeTaskOrderAuditUpdateVO finalTaskOrderItemAuditUpdateVO = taskOrderItemAuditUpdateVO;
+            orderItems.forEach(orderItem -> {
+
+                List<AppointmentConfirmOrderRefuseItemDO> rejectItems = new ArrayList<>();
+                List<PipeOrderItemProjectVO> pipeOrderItemProjectVOS = orderItem.getDetailDOS();
+                pipeOrderItemProjectVOS.forEach(pipeTaskOrderItemAuditUpdateVO -> {
+
+                    if (("reject").equals(pipeTaskOrderItemAuditUpdateVO.getEditType())) {
+                        pipeTaskOrderItemDetailMapper.delete(new LambdaQueryWrapperX<PipeTaskOrderItemDetailDO>()
+                                .eq(PipeTaskOrderItemDetailDO::getOrderId, id)
+                                .eq(PipeTaskOrderItemDetailDO::getEquipDetailId, pipeTaskOrderItemAuditUpdateVO.getId()));
+
+                        List<DictDataRespDTO> checkTypeDTOS = dictDataApi.getDictDataList("pressure_inspection_nature_pipe").getData();
+                        List<DictDataRespDTO> pipeStatusDTOS = dictDataApi.getDictDataList("PIPE_USE_STATUS").getData();
+                        AppointmentConfirmOrderRefuseItemDO rejectItem = new AppointmentConfirmOrderRefuseItemDO();
+
+                        EquipPipeDetailDO equipPipeDetailDO = equipPipeDetailMapper.selectById(pipeTaskOrderItemAuditUpdateVO.getId());
+
+                        if (equipPipeDetailDO != null) {
+                            EquipPipeDO equipPipeDO = equipPipeMapper.selectById(equipPipeDetailDO.getEquipPipeId());
+                            if (equipPipeDO != null){
+                                rejectItem.setContact(equipPipeDO.getContact());
+                                rejectItem.setContactPhone(equipPipeDO.getContactPhone());
+                                rejectItem.setEquipDistrict(equipPipeDO.getEquipDistrict());
+                                rejectItem.setEquipStreet(equipPipeDO.getEquipStreet());
+                                rejectItem.setUnitCode(equipPipeDO.getUnitCode());
+                                rejectItem.setUnitName(equipPipeDO.getUnitName());
+                            }
+                            rejectItem.setEquipId(equipPipeDetailDO.getId());
+                            rejectItem.setProductNo(equipPipeDetailDO.getProjectNo());
+                            rejectItem.setEquipCode(equipPipeDetailDO.getPipeRegCode());
+                            rejectItem.setUseRegisterNo(equipPipeDetailDO.getCertificateNo());
+                            rejectItem.setEquipType(equipPipeDetailDO.getPipeCategory());
+                            rejectItem.setEquipStatus(equipPipeDetailDO.getUseStatus());
+                            if (CollUtil.isNotEmpty(pipeStatusDTOS)){
+                                String equipStatusName = pipeStatusDTOS.stream()
+                                        .filter(dict -> dict.getValue().equals(equipPipeDetailDO.getUseStatus()))
+                                        .map(DictDataRespDTO::getLabel)
+                                        .findFirst()
+                                        .orElse("");
+                                rejectItem.setEquipStatusName(equipStatusName);
+                            }
 
-                EquipPipeDO equipContainerDO = equipContainerDOMap.get(itemAuditUpdateVO.getId());
-                if (equipContainerDO != null) {
-                    rejectItem.setEquipId(equipContainerDO.getId());
-                    rejectItem.setEquipCode(equipContainerDO.getProjectNo());
-                    rejectItem.setEquipDistrict(equipContainerDO.getEquipDistrict());
-                    rejectItem.setEquipStreet(equipContainerDO.getEquipStreet());
-                    rejectItem.setEquipType(equipContainerDO.getPipeCategory());
-//                    rejectItem.setAreaType(equipContainerDO.get());
-                    rejectItem.setUnitCode(equipContainerDO.getUnitCode());
-                    rejectItem.setUnitName(equipContainerDO.getUnitName());
-                    rejectItem.setUseRegisterNo(equipContainerDO.getCertificateNo());
-//                    rejectItem.setProductNo(equipContainerDO.getProductCode());
-                    rejectItem.setEquipStatus(equipContainerDO.getUseStatus());
-                    if (CollUtil.isNotEmpty(pipeStatusDTOS)){
-                        String equipStatusName = pipeStatusDTOS.stream()
-                                .filter(dict -> dict.getValue().equals(equipContainerDO.getUseStatus()))
-                                .map(DictDataRespDTO::getLabel)
-                                .findFirst()
-                                .orElse("");
-                        rejectItem.setEquipStatusName(equipStatusName);
+                        }
+
+                        Integer checkType = finalTaskOrderDO1.getCheckType();
+                        if (CollUtil.isNotEmpty(checkTypeDTOS)){
+                            String checkTypeName = checkTypeDTOS.stream()
+                                    .filter(dict -> dict.getValue().equals(checkType.toString()))
+                                    .map(DictDataRespDTO::getLabel)
+                                    .findFirst()
+                                    .orElse("");
+                            rejectItem.setCheckTypeName(checkTypeName);
+                        }
+                        rejectItem.setCheckType(checkType);
+                        rejectItem.setNextCheckDate(finalTaskOrderDO1.getCheckDate());
+
+                        rejectItem.setEquipMainType(300); //300管道
+
+                        rejectItem.setTaskOrderId(id);
+                        rejectItem.setOrderNo(finalTaskOrderDO1.getOrderNo());
+                        rejectItem.setReason(pipeTaskOrderItemAuditUpdateVO.getReason());
+                        rejectItem.setReasonDict(pipeTaskOrderItemAuditUpdateVO.getReasonDict());
+                        rejectItem.setRejectionSource(2);
+
+                        rejectItem.setCheckDate(finalTaskOrderItemAuditUpdateVO.getCheckDate());
+
+                        rejectItem.setSubmitId(WebFrameworkUtils.getLoginUserId());
+                        rejectItem.setSubmitTime(LocalDateTime.now());
+
+                        // 上报市局
+                        if (100 == pipeTaskOrderItemAuditUpdateVO.getRejectType()) {
+                            rejectItem.setIsReportCity(true);
+                            rejectItems.add(rejectItem);
+                            // 拒绝约检
+                        } else if (200 == pipeTaskOrderItemAuditUpdateVO.getRejectType()) {
+                            rejectItem.setIsReportCity(false);
+                            rejectItems.add(rejectItem);
+                        }
+                        // 300 无需上报
+
+                    }
+
+                });
+
+                //管线数量为0则删除管道
+                PipeTaskOrderItemDO pipeTaskOrderItemDO = pipeTaskOrderItemMapper.selectOne(new LambdaQueryWrapperX<PipeTaskOrderItemDO>()
+                        .eq(PipeTaskOrderItemDO::getOrderId, id)
+                        .eq(PipeTaskOrderItemDO::getEquipId, orderItem.getId()));
+                if (pipeTaskOrderItemDO != null){
+                    Long count = pipeTaskOrderItemDetailMapper.selectCount(new LambdaQueryWrapperX<PipeTaskOrderItemDetailDO>()
+                            .eq(PipeTaskOrderItemDetailDO::getOrderId, id)
+                            .eq(PipeTaskOrderItemDetailDO::getOrderItemId, pipeTaskOrderItemDO.getId()));
+                    if (count == null || count == 0){
+                        pipeTaskOrderItemMapper.deleteById(pipeTaskOrderItemDO.getId());
                     }
-                    rejectItem.setContact(equipContainerDO.getContact());
-                    rejectItem.setContactPhone(equipContainerDO.getContactPhone());
                 }
 
-                Integer checkType = taskOrderDO.getCheckType();
-                if (CollUtil.isNotEmpty(checkTypeDTOS)){
-                    String checkTypeName = checkTypeDTOS.stream()
-                            .filter(dict -> dict.getValue().equals(checkType.toString()))
-                            .map(DictDataRespDTO::getLabel)
-                            .findFirst()
-                            .orElse("");
-                    rejectItem.setCheckTypeName(checkTypeName);
+                //任务单设备为0则作废任务单
+                Long count = pipeTaskOrderItemMapper.selectCount(PipeTaskOrderItemDO::getOrderId, id);
+                PipeTaskOrderDO updateOrder = new PipeTaskOrderDO();
+                updateOrder.setId(id);
+                if(count == null || count == 0){
+                    updateOrder.setTaskStatus(200);
+                }else{
+                    updateOrder.setEquipNum(Math.toIntExact(count));
                 }
-                rejectItem.setCheckType(checkType);
-                rejectItem.setNextCheckDate(taskOrderDO.getCheckDate());
-
-                rejectItem.setEquipMainType(300); //300管道
-
-                rejectItem.setTaskOrderId(id);
-                rejectItem.setOrderNo(taskOrderDO.getOrderNo());
-                rejectItem.setReason(itemAuditUpdateVO.getReason());
-                rejectItem.setReasonDict(itemAuditUpdateVO.getReasonDict());
-                rejectItem.setRejectionSource(2);
-
-                rejectItem.setCheckDate(taskOrderItemAuditUpdateVO.getCheckDate());
-
-                rejectItem.setSubmitId(WebFrameworkUtils.getLoginUserId());
-                rejectItem.setSubmitTime(LocalDateTime.now());
-
-                // 上报市局
-                if (100 == itemAuditUpdateVO.getRejectType()) {
-                    rejectItem.setIsReportCity(true);
-                    rejectItems.add(rejectItem);
-                    // 拒绝约检
-                } else if (200 == itemAuditUpdateVO.getRejectType()) {
-                    rejectItem.setIsReportCity(false);
-                    rejectItems.add(rejectItem);
+                pipeTaskOrderMapper.updateById(updateOrder);
+
+                if (!rejectItems.isEmpty()) {
+                    appointmentConfirmOrderRefuseItemMapper.insertBatch(rejectItems);
                 }
-                // 300 无需上报
-            }
 
-            if (!rejectItems.isEmpty()) {
-                appointmentConfirmOrderRefuseItemMapper.insertBatch(rejectItems);
-            }
+            });
+
         }
 
-        PipeTaskOrderDO taskUpdateOrderDO = pipeTaskOrderMapper.selectById(id);
         // 新增 检验设备
         List<PipeTaskOrderItemAuditUpdateVO> addEquipList = orderItems.stream().filter(item -> "add".equals(item.getEditType())).toList();
         if (!addEquipList.isEmpty()) {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderitemsuspend/PipeTaskOrderItemSuspendServiceImpl.java

@@ -260,9 +260,10 @@ public class PipeTaskOrderItemSuspendServiceImpl extends ServiceImpl<PipeTaskOrd
                         taskOrderItemSuspendDO.setSafeManager(equipPipeDO.getSecurityMan());
                         taskOrderItemSuspendDO.setSafeManagerPhone(equipPipeDO.getSecurityManPhone());
 
-                        bean.setEquipType(equipPipeDetailDO.getPipeCategory());
                         bean.setEquipId(equipPipeDetailDO.getId());
-                        bean.setEquipCode(equipPipeDetailDO.getProjectNo());
+                        bean.setEquipCode(equipPipeDetailDO.getPipeRegCode());
+                        bean.setProductNo(equipPipeDO.getProjectNo());
+                        bean.setUseRegisterNo(equipPipeDetailDO.getCertificateNo());
                         bean.setEquipStatus(equipPipeDetailDO.getUseStatus());
                         if (CollUtil.isNotEmpty(pipeStatusDTOS)){
                             String equipStatusName = pipeStatusDTOS.stream()
@@ -272,15 +273,12 @@ public class PipeTaskOrderItemSuspendServiceImpl extends ServiceImpl<PipeTaskOrd
                                     .orElse("");
                             bean.setEquipStatusName(equipStatusName);
                         }
-                        bean.setUseRegisterNo(equipPipeDetailDO.getCertificateNo());
-
                         bean.setEquipDistrict(equipPipeDO.getEquipDistrict());
                         bean.setEquipStreet(equipPipeDO.getEquipStreet());
                         bean.setEquipType(equipPipeDetailDO.getPipeCategory());
 //                bean.setAreaType(equipPipeDetailDO.getAreaType());
                         bean.setUnitCode(equipPipeDO.getUnitCode());
                         bean.setUnitName(equipPipeDO.getUnitName());
-//                bean.setProductNo(equipPipeDO.getProductCode());
                         bean.setContact(equipPipeDO.getContact());
                         bean.setContactPhone(equipPipeDO.getContactPhone());
                         if (taskOrderDO.getCheckType() == 100  && equipPipeDetailDO.getNextLegalCheckDate() != null){