소스 검색

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

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

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

@@ -234,8 +234,8 @@ 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.setEquipMainType(reqVO.getEquipMainType());
             taskOrderSignFileDO.setReceiver(reqVO.getReceiver());
             taskOrderSignFileDO.setReceiverPhone(reqVO.getReceiverPhone());
             taskOrderSignFileDO.setIsPush(IsYesOrNoEnum.YES.getKey());
@@ -243,6 +243,7 @@ public class BoilerTaskOrderSignFileServiceImpl extends ServiceImpl<BoilerTaskOr
             updateById(taskOrderSignFileDO);
         } else {
             taskOrderSignFileDO = new BoilerTaskOrderSignFileDO();
+            taskOrderSignFileDO.setEquipMainType(reqVO.getEquipMainType());
             taskOrderSignFileDO.setOrderId(taskOrderDO.getId());
             taskOrderSignFileDO.setBusinessType(reqVO.getBusinessType());
             taskOrderSignFileDO.setReceiver(reqVO.getReceiver());