From de6b53552f2e35f992f60c8cc7110bcb99105d96 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期六, 13 十二月 2025 22:12:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

---
 service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java |    6 ++++++
 service/src/main/java/com/ruoyi/cwgl/service/IKeyCollectionInfoService.java         |    7 +++++++
 service/src/main/java/com/ruoyi/cwgl/mapper/KeyCollectionInfoMapper.java            |    2 ++
 api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java           |    8 ++------
 service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml                  |    5 +++++
 tms/src/main/resources/mapper/tms/TmsCarKeyDispatchMapper.xml                       |    2 +-
 6 files changed, 23 insertions(+), 7 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 74d3732..aa6315f 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
@@ -1,10 +1,6 @@
 package com.ruoyi.api.third.controller;
 
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.RandomUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.cwgl.domain.KeyCollectionInfo;
 import com.ruoyi.cwgl.domain.RequestLog;
 import com.ruoyi.cwgl.domain.dto.ReturnReportDto;
 import com.ruoyi.cwgl.domain.dto.TakeReviewDto;
@@ -19,7 +15,6 @@
 
 import javax.validation.Valid;
 import java.util.Random;
-import java.util.concurrent.ThreadLocalRandom;
 
 
 /**
@@ -94,10 +89,11 @@
     @PostMapping("/returnReport")
     public AjaxResult returnReport(@Valid @RequestBody ReturnReportDto returnReportDto){
         logger.info("褰掕繕鍙傛暟{}",returnReportDto);
-
+        String name =keyCollectionInfoService.selectNameByMobile(returnReportDto.getDriverCode());
         //娣诲姞璇锋眰鏃ュ織
         RequestLog requestLog = new RequestLog();
         requestLog.setDriverCode(returnReportDto.getDriverCode());
+        requestLog.setDriverName(name);
         requestLog.setBoxNum(returnReportDto.getBoxNum());
         requestLog.setReqTime(returnReportDto.getSaveTime());
         requestLog.setType(1);
diff --git a/service/src/main/java/com/ruoyi/cwgl/mapper/KeyCollectionInfoMapper.java b/service/src/main/java/com/ruoyi/cwgl/mapper/KeyCollectionInfoMapper.java
index 4973447..9677e6c 100644
--- a/service/src/main/java/com/ruoyi/cwgl/mapper/KeyCollectionInfoMapper.java
+++ b/service/src/main/java/com/ruoyi/cwgl/mapper/KeyCollectionInfoMapper.java
@@ -90,4 +90,6 @@
 
     String selectCwBoxNum(String licensePlateNumber);
 
+    String selectNameByMobile(String driverCode);
+
 }
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/IKeyCollectionInfoService.java b/service/src/main/java/com/ruoyi/cwgl/service/IKeyCollectionInfoService.java
index 19dfe17..79ee8e3 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/IKeyCollectionInfoService.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/IKeyCollectionInfoService.java
@@ -123,4 +123,11 @@
     String selectCwBoxNum(String licensePlateNumber);
 
     String selectBoxNum(String licensePlateNumber);
+
+    /**
+     * 鏍规嵁鎵嬫満鍙锋煡璇㈠徃鏈哄悕
+     * @param driverCode
+     * @return
+     */
+    String selectNameByMobile(String driverCode);
 }
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 a474157..d5e48d6 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
@@ -247,4 +247,10 @@
     public String selectBoxNum(String licensePlateNumber) {
         return null;
     }
+
+    @DataSource(DataSourceType.CWSJ)
+    @Override
+    public String selectNameByMobile(String driverCode) {
+        return keyCollectionInfoMapper.selectNameByMobile(driverCode);
+    }
 }
diff --git a/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml b/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
index a858f4c..6ab25c3 100644
--- a/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/KeyCollectionInfoMapper.xml
@@ -136,6 +136,11 @@
     SELECT `NAME` from tms_vehicle where LICENSE_PLATE_NUMBER = #{licensePlateNumber} and `NAME` is not null LIMIT 1
 
     </select>
+    <select id="selectNameByMobile" resultType="java.lang.String">
+        SELECT NAME from tms_driver where MOBILE =  #{driverCode}
+        limit 1
+
+    </select>
 
     <!-- 鏂板 -->
     <insert id="insertKeyCollectionInfo" parameterType="com.ruoyi.cwgl.domain.KeyCollectionInfo"  useGeneratedKeys="true" keyProperty="id">
diff --git a/tms/src/main/resources/mapper/tms/TmsCarKeyDispatchMapper.xml b/tms/src/main/resources/mapper/tms/TmsCarKeyDispatchMapper.xml
index d0a7c6d..a27b09d 100644
--- a/tms/src/main/resources/mapper/tms/TmsCarKeyDispatchMapper.xml
+++ b/tms/src/main/resources/mapper/tms/TmsCarKeyDispatchMapper.xml
@@ -67,7 +67,7 @@
         WHERE
         thisTab.driver_mobile = #{driverCode}
         AND thisTab.status = 0
-        AND thisTab.car_key_expiration_time &lt;= NOW()
+        AND thisTab.car_key_expiration_time &gt;= NOW()
         limit 1
 
     </select>

--
Gitblit v1.8.0