From d87721bf2b5cbbdc8088c9f9e0bfbba61b125a0f Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 04 九月 2025 14:12:21 +0800
Subject: [PATCH] 修改接口
---
service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java | 5 ++++-
service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java | 3 +++
api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java | 1 +
service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml | 1 +
4 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java b/api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java
index e924d06..130bdcf 100644
--- a/api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java
+++ b/api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java
@@ -48,6 +48,7 @@
requestLog.setDriverCode(takeReviewDto.getDriverCode());
requestLog.setDriverName(takeReviewDto.getDriverName());
requestLog.setReqTime(takeReviewDto.getHandleTime());
+ requestLog.setBoxNum(keyCollectionInfo.getBoxNum());
requestLog.setType(0);
logService.insertRequestLog(requestLog);
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java b/service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java
index 93e947e..d20df72 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/KeyCollectionInfo.java
@@ -173,4 +173,7 @@
@TableField(exist = false)
private Integer keyTimeout;
+ @Excel(name = "閽ュ寵鏌滅紪鍙�")
+ @TableField("box_num")
+ private String boxNum;
}
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
index f450d72..5ebdba2 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
@@ -5,6 +5,7 @@
import javax.annotation.Resource;
+import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.cwgl.domain.RequestLog;
@@ -212,6 +213,8 @@
String dateToStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, estimatedDepartureTime);
return AjaxResult.error("瑕佹眰鍑哄彂鏃堕棿"+ dateToStr+"锛岄鍙栭挜鍖欒秴鏃�"+keyTimeout+"涓皬鏃�");
}
- return AjaxResult.success("鎴愬姛",2);
+ AjaxResult success = new AjaxResult(0, "鎴愬姛",2);
+ success.put("boxNum",keyCollectionInfo.getBoxNum());
+ return success;
}
}
diff --git a/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml b/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
index f122086..6c711f7 100644
--- a/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
@@ -87,6 +87,7 @@
driver_m.`NAME` as driverName,
driver_m.MOBILE as driverMobile,
vhc.LICENSE_PLATE_NUMBER as licensePlateNumber,
+ vhc.NAME as boxNum,
ord.ORDER_TIME as orderTime,
ord.CREATED_TIME as orderCreatedTime,
ts.CREATED_TIME as dispatchCreatedTime,
--
Gitblit v1.8.0