From 2f4bec42a317d8ef59f27c03950a469eb2dfcaca Mon Sep 17 00:00:00 2001
From: dfdg <2710245601@qq.com>
Date: Tue, 14 Oct 2025 14:57:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectBigScreenServiceImpl.java        | 2 +-
 .../org/dromara/gps/mapper/GpsEquipmentSonMapper.java    | 9 +++++----
 .../project/service/impl/BusProjectServiceImpl.java      | 4 +++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/ProjectBigScreenServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/ProjectBigScreenServiceImpl.java
index 814be24a..b1590c7d 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/ProjectBigScreenServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/ProjectBigScreenServiceImpl.java
@@ -519,7 +519,7 @@ public class ProjectBigScreenServiceImpl implements ProjectBigScreenService {
                 app.put("id", item.getUserId());
                 app.put("userId", item.getUserId());
                 app.put("label", item.getUserId());
-                app.put("name", item.getDeviceName());
+                app.put("name", item.getUserName());
                 app.put("type", "app");
                 app.put("lat", item.getLocLatitude());
                 app.put("lng", item.getLocLongitude());
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/mapper/GpsEquipmentSonMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/mapper/GpsEquipmentSonMapper.java
index 171503fd..57a39b08 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/mapper/GpsEquipmentSonMapper.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/mapper/GpsEquipmentSonMapper.java
@@ -25,7 +25,7 @@ public interface GpsEquipmentSonMapper extends BaseMapperPlus<GpsEquipmentSon, G
         "        gps_equipment_son \n" +
         "WHERE \n" +
         "project_id = #{projectId} \n " +
-//        "AND create_time BETWEEN #{startTime} AND #{endTime}\n" +
+        "AND create_time BETWEEN #{startTime} AND #{endTime}\n" +
         ")\n" +
         "SELECT\n" +
         "    *\n" +
@@ -67,12 +67,13 @@ public interface GpsEquipmentSonMapper extends BaseMapperPlus<GpsEquipmentSon, G
         "WHERE \n" +
         "project_id = #{projectId}\n " +
         "AND client_id IS NULL \n" +
-//        "AND create_time BETWEEN #{startTime} AND #{endTime} \n" +
+        "AND create_time BETWEEN #{startTime} AND #{endTime} \n" +
         ")\n" +
         "SELECT\n" +
-        "    *\n" +
+        "    r.*,su.nick_name as userName\n" +
         "FROM\n" +
-        "    RankedData\n" +
+        "    RankedData r " +
+        "LEFT JOIN sys_user su ON r.user_id=su.user_id\n" +
         "WHERE\n" +
         "    rn = 1;")
     List<GpsEquipmentSonVo> getUserListByProjectId(@Param("projectId") Long projectId, @Param("startTime") LocalDateTime startOfDay, @Param("endTime") LocalDateTime now);
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java
index 8e4936af..fd5d13e4 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java
@@ -1196,7 +1196,9 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
             renyuan.put("name", byUserId.getUserName() != null ? byUserId.getUserName():"");
             renyuan.put("teamName", byUserId.getTeamName() != null ? byUserId.getTeamName():"");
             renyuan.put("phone", byUserId.getPhone() != null ? byUserId.getPhone():"");
-            renyuan.put("typeOfWork", dictDataService.selectDictLabel("type_of_work", byUserId.getTypeOfWork()));
+            if (byUserId.getTypeOfWork() !=null){
+                renyuan.put("typeOfWork", dictDataService.selectDictLabel("type_of_work", byUserId.getTypeOfWork()));
+            }
             renyuan.put("contractorNmae",byUserId.getContractorId() != null ? contractorService.getById(byUserId.getContractorId()).getName():"");
         }
         map.put("renyuan", renyuan);