Przeglądaj źródła

feat(boilertaskordersignfile): 更新任务单推送接口字段映射

- 将TaskOrderPushReqVO中的id字段重命名为orderId并更新验证消息
- 在TaskOrderPushReqVO中新增equipMainType设备类型字段
- 修改serviceFromPush方法中使用orderId替代id进行任务单查询
- 在签名文件处理中设置设备类型字段值
xuzhancheng 3 dni temu
rodzic
commit
2474c04559

+ 6 - 3
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskordersignfile/vo/TaskOrderPushReqVO.java

@@ -7,9 +7,9 @@ import lombok.Data;
 @Data
 public class TaskOrderPushReqVO {
 
-    @Schema(description = "id")
-    @NotNull(message = "受理单id不能为空")
-    private String id;
+    @Schema(description = "orderId")
+    @NotNull(message = "任务单id不能为空")
+    private String orderId;
 
 
     /**
@@ -38,4 +38,7 @@ public class TaskOrderPushReqVO {
 
     @Schema(description = "安全检查记录ID")
     private String securityCheckId;
+
+    @Schema(description = "设备类型")
+    private String equipMainType;
 }

+ 2 - 2
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskordersignfile/BoilerTaskOrderSignFileServiceImpl.java

@@ -210,7 +210,7 @@ public class BoilerTaskOrderSignFileServiceImpl extends ServiceImpl<BoilerTaskOr
     public void serviceFromPush(TaskOrderPushReqVO reqVO) throws Exception {
         log.info("serviceFromPush {}", reqVO);
         // 根据id查询任务单
-        BoilerTaskOrderDO taskOrderDO = boilerTaskOrderMapper.selectById(reqVO.getId());
+        BoilerTaskOrderDO taskOrderDO = boilerTaskOrderMapper.selectById(reqVO.getOrderId());
         // 如果任务单不存在,抛出异常
         if (taskOrderDO == null) {
             throw new ServiceException(404, "任务单不存在");
@@ -234,7 +234,7 @@ public class BoilerTaskOrderSignFileServiceImpl extends ServiceImpl<BoilerTaskOr
 
         BoilerTaskOrderSignFileDO taskOrderSignFileDO =
                 selectLastOneByOrderIdAndBusinessType(taskOrderDO.getId(), reqVO.getBusinessType(), reqVO.getOrderItemId(), reqVO.getSecurityCheckId());
-
+        taskOrderSignFileDO.setEquipMainType(reqVO.getEquipMainType());
         if (ObjectUtil.isNotNull(taskOrderSignFileDO)) {
             taskOrderSignFileDO.setReceiver(reqVO.getReceiver());
             taskOrderSignFileDO.setReceiverPhone(reqVO.getReceiverPhone());