调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/appointmentconfirmorder/AppointmentConfirmOrderDO.java

@@ -161,6 +161,10 @@ public class AppointmentConfirmOrderDO extends BaseDO {
      * 使用单位名称
      */
     private String useUnitName;
+    /**
+     * 使用单位名称
+     */
+    private String useUnitId;
     /**
      * 使用单位统一社会信用代码
      */

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

@@ -837,7 +837,8 @@ public class AppointmentConfirmOrderServiceImpl implements AppointmentConfirmOrd
         log.info("acceptOrder.getId():{}", acceptOrder.getId());
         String processInstanceId = processInstanceApi.createProcessInstance(userId,
                 new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(BpmModelConstants.ACCEPT_ORDER)
-                        .setVariables(processInstanceVariables).setBusinessKey(acceptOrder.getId())).getCheckedData();
+                        .setVariables(processInstanceVariables).setBusinessKey(acceptOrder.getId()).setEquipMainType("200"))
+                .getCheckedData();
 
         // 将工作流的编号，更新到 受理单中
         acceptOrderMapper.updateById(new AcceptOrderDO().setId(acceptOrder.getId()).setProcessInstanceId(processInstanceId));

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

@@ -1017,7 +1017,7 @@ public class PipeAppointmentConfirmOrderServiceImpl implements PipeAppointmentCo
         log.info("acceptOrder.getId():{}", acceptOrder.getId());
         String processInstanceId = processInstanceApi.createProcessInstance(userId,
                 new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(BpmModelConstants.ACCEPT_ORDER)
-                        .setVariables(processInstanceVariables).setBusinessKey(acceptOrder.getId())).getCheckedData();
+                        .setVariables(processInstanceVariables).setBusinessKey(acceptOrder.getId()).setEquipMainType("300")).getCheckedData();
 
         // 将工作流的编号，更新到 受理单中
         acceptOrderMapper.updateById(new AcceptOrderDO().setId(acceptOrder.getId()).setProcessInstanceId(processInstanceId));

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/pipe/QR0413_202400ReportOFData.java

@@ -94,8 +94,10 @@ public class QR0413_202400ReportOFData implements IDynamicOFData {
 //        result.put("contact", acceptOrderDO.getUnitContact());
         // 检验员签名
         OrderReportDO orderReportDO = orderReportService.getOne(new LambdaQueryWrapper<OrderReportDO>().eq(OrderReportDO::getAcceptOrderId, acceptOrderDO.getId()));
-        result.put("checkName", orderReportDO.getSignUrl());
-        result.put("checkDate", orderReportDO.getSignUrl());
+        if (orderReportDO != null) {
+            result.put("checkName", orderReportDO.getSignUrl());
+            result.put("checkDate", orderReportDO.getSignUrl());
+        }
         // 填充客户签名
         BoilerTaskOrderDO one = boilerTaskOrderService.getOne(new LambdaQueryWrapper<BoilerTaskOrderDO>().eq(BoilerTaskOrderDO::getAcceptOrderId, refId));
         if (one != null){

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/pipe/QR0424_202403ReportOFData.java

@@ -82,8 +82,10 @@ public class QR0424_202403ReportOFData implements IDynamicOFData {
 //        result.put("contact", acceptOrderDO.getUnitContact());
         // 检验员签名
         OrderReportDO orderReportDO = orderReportService.getOne(new LambdaQueryWrapper<OrderReportDO>().eq(OrderReportDO::getAcceptOrderId, acceptOrderDO.getId()));
-        result.put("checkName", orderReportDO.getSignUrl());
-        result.put("checkDate", orderReportDO.getSignUrl());
+        if (orderReportDO != null) {
+            result.put("checkName", orderReportDO.getSignUrl());
+            result.put("checkDate", orderReportDO.getSignUrl());
+        }
         // 填充客户签名
         BoilerTaskOrderDO one = boilerTaskOrderService.getOne(new LambdaQueryWrapper<BoilerTaskOrderDO>().eq(BoilerTaskOrderDO::getAcceptOrderId, refId));
         if (one != null){

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

@@ -643,6 +643,7 @@ public class EquipBoilerSchedulingServiceImpl extends ServiceImpl<EquipBoilerSch
             appointmentConfirmOrderDO.setUseUnitContact(equipContainerDO.getContact());
             appointmentConfirmOrderDO.setUseUnitAddress(equipContainerDO.getUnitAddress());
             appointmentConfirmOrderDO.setUseUnitName(equipContainerDO.getUnitName());
+            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

@@ -770,7 +770,7 @@ public class EquipPipeSchedulingServiceImpl extends ServiceImpl<EquipPipeSchedul
             appointmentConfirmOrderDO.setUseUnitName(equipPipeDO.getUnitName());
             appointmentConfirmOrderDO.setUseUnitContact(equipPipeDO.getContact());
             appointmentConfirmOrderDO.setUseUnitPhone(equipPipeDO.getContactPhone());
-
+            appointmentConfirmOrderDO.setUseUnitId(equipPipeDO.getUnitId());
 
             //填充联系人信息
             appointmentConfirmOrderDO.setEmail(equipPipeDO.getContactEmail());