fix(scheduling): 修复设备调度中的单位ID设置问题

- 注释掉管道接收订单服务中默认状态设置逻辑
- 在设备锅炉调度服务中添加单位ID空值检查和通过单位代码获取单位ID的逻辑
- 在设备管道调度服务中添加单位ID空值检查和通过单位代码获取单位ID的逻辑
- 当设备的单位ID为空时，通过调用客户端单位API根据单位代码

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

@@ -456,11 +456,11 @@ public class PipeAcceptOrderServiceImpl implements PipeAcceptOrderService {
     @Override
     public PageResult<PipeAcceptEquipsPageRespVO> getEquipsPage(ConfirmOrderPageVO pageReqVO) {
 
-        if (CollUtil.isEmpty(pageReqVO.getUseStatus())) {
-            List<String> status = new ArrayList<>();
-            status.add("100");
-            pageReqVO.setUseStatus(status);
-        }
+//        if (CollUtil.isEmpty(pageReqVO.getUseStatus())) {
+//            List<String> status = new ArrayList<>();
+//            status.add("100");
+//            pageReqVO.setUseStatus(status);
+//        }
 
         if(StringUtils.isNotBlank( pageReqVO.getOrderId())){
             List<PipeAcceptOrderItemDO> equipContainerSchedulingItemDOS = pipeAcceptOrderItemMapper.selectList(PipeAcceptOrderItemDO::getOrderId, pageReqVO.getOrderId());

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/equipboilerscheduling/EquipBoilerSchedulingServiceImpl.java

@@ -643,7 +643,14 @@ public class EquipBoilerSchedulingServiceImpl extends ServiceImpl<EquipBoilerSch
             appointmentConfirmOrderDO.setUseUnitContact(equipContainerDO.getContact());
             appointmentConfirmOrderDO.setUseUnitAddress(equipContainerDO.getUnitAddress());
             appointmentConfirmOrderDO.setUseUnitName(equipContainerDO.getUnitName());
-            appointmentConfirmOrderDO.setUseUnitId(equipContainerDO.getUnitId());
+            if (equipContainerDO.getUnitId() == null) {
+                ClientUnitDTO unitDTO = clientUnitApi.getClientUnitByCode(equipContainerDO.getUnitCode()).getData();
+                if (unitDTO != null){
+                    appointmentConfirmOrderDO.setUseUnitId(unitDTO.getId());
+                }
+            }else {
+                appointmentConfirmOrderDO.setUseUnitId(equipContainerDO.getUnitId());
+            }
             // 设备邮编
             appointmentConfirmOrderDO.setUseUnitZipcode(equipContainerDO.getZipCode());
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/equippipescheduling/EquipPipeSchedulingServiceImpl.java

@@ -765,12 +765,19 @@ public class EquipPipeSchedulingServiceImpl extends ServiceImpl<EquipPipeSchedul
 //                appointmentConfirmOrderDO.setUseUnitPhone(unitDTO.getTel());
 
             }
+            if(equipPipeDO.getUnitId() == null){
+                unitDTO = clientUnitApi.getClientUnitByCode(equipPipeDO.getUnitCode()).getData();
+                if (unitDTO != null) {
+                    appointmentConfirmOrderDO.setUseUnitId(unitDTO.getId());
+                }
+            }else {
+                appointmentConfirmOrderDO.setUseUnitId(equipPipeDO.getUnitId());
+            }
             appointmentConfirmOrderDO.setUseUnitZipcode(equipPipeDO.getPostalCode());
             appointmentConfirmOrderDO.setUseUnitAddress(equipPipeDO.getUnitAddress());
             appointmentConfirmOrderDO.setUseUnitName(equipPipeDO.getUnitName());
             appointmentConfirmOrderDO.setUseUnitContact(equipPipeDO.getContact());
             appointmentConfirmOrderDO.setUseUnitPhone(equipPipeDO.getContactPhone());
-            appointmentConfirmOrderDO.setUseUnitId(equipPipeDO.getUnitId());
 
             //填充联系人信息
             appointmentConfirmOrderDO.setEmail(equipPipeDO.getContactEmail());