From 9d68bcd2ff382b6e8bf2292d7896e9efd38a8e81 Mon Sep 17 00:00:00 2001
From: wanghao <w0401@foxmail.com>
Date: Thu, 25 Sep 2025 16:27:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BB=8A=E6=97=A5=E5=BA=94?=
 =?UTF-8?q?=E6=80=A5=E7=9A=84=E5=BA=94=E6=80=A5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LargeScreenDataServiceImpl.java      | 29 ++++++++++---------
 .../renkang/emergency/mapper/OrderMapper.java |  2 ++
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java
index c1e908f..725b7ef 100644
--- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java
+++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java
@@ -25,6 +25,7 @@ import com.renkang.emergency.largeScreen.entity.vo.HealthArchivesVO;
 import com.renkang.emergency.largeScreen.entity.vo.TodayEmergencyVO;
 import com.renkang.emergency.largeScreen.mapper.LargeScreenDataMapper;
 import com.renkang.emergency.largeScreen.service.ILargeScreenDataService;
+import com.renkang.emergency.mapper.OrderMapper;
 import com.renkang.emergency.mapper.TblUserHelpMapper;
 import com.renkang.emergency.service.IResourceService;
 import com.renkang.emergency.service.ITbQimoNoticeService;
@@ -66,6 +67,7 @@ public class LargeScreenDataServiceImpl extends ServiceImpl<LargeScreenDataMappe
     private final IXjAedService xjAedService;
     private final ITbQimoNoticeService noticeService;
     private final TblUserHelpMapper userHelpMapper;
+    private final OrderMapper orderMapper;
     private final WatchApi watchApi;
     private final ISysBaseAPI sysBaseAPI;
     private final ISysCache sysCache;
@@ -740,27 +742,26 @@ public class LargeScreenDataServiceImpl extends ServiceImpl<LargeScreenDataMappe
      * @param list 列表
      */
     private void emergencyData(Date startDate, Date endDate, List<TodayEmergencyVO> list){
-
-        List<TblUserHelp> userHelpList = userHelpMapper.selectList(
-                new LambdaQueryWrapper<TblUserHelp>().between(TblUserHelp::getHelpTime, startDate, endDate).in(TblUserHelp::getType,Arrays.asList("0","1")));
-        if (userHelpList != null && !userHelpList.isEmpty()) {
-            List<String> userIdList = userHelpList.stream().map(TblUserHelp::getUserId).distinct().collect(Collectors.toList());
+        List<Order> orderList = orderMapper.selectList(
+                new LambdaQueryWrapper<Order>().between(Order::getCreateTime, startDate, endDate).in(Order::getInitiatorType,Arrays.asList("0","1")));
+        if (orderList != null && !orderList.isEmpty()) {
+            List<String> userIdList = orderList.stream().map(Order::getInitiatorUserId).distinct().collect(Collectors.toList());
             List<LoginUser> userList = sysBaseAPI.listUserByIdsNew(userIdList);
             // 根据用户id分组
             Map<String, LoginUser> userMap = userList.stream()
                     .collect(Collectors.toMap(LoginUser::getId, a -> a, (k1, k2) -> k1));
 
-            for (TblUserHelp tblUserHelp : userHelpList) {
+            for (Order order : orderList) {
                 TodayEmergencyVO vo = new TodayEmergencyVO();
-                vo.setUserId(tblUserHelp.getUserId());
-                if (tblUserHelp.getType().equals("0")){
+                vo.setUserId(order.getInitiatorUserId());
+                if (order.getInitiatorType().equals("0")){
                     vo.setEmergencyType("0");
                 }
-                if (tblUserHelp.getType().equals("1")){
+                if (order.getInitiatorType().equals("1")){
                     vo.setEmergencyType("1");
                 }
-                vo.setPhone(tblUserHelp.getOutMobile());
-                LoginUser user = userMap.get(tblUserHelp.getUserId());
+                vo.setPhone(order.getInitiatorUserMobile());
+                LoginUser user = userMap.get(order.getInitiatorUserId());
                 if (user != null) {
                     vo.setRealName(user.getRealname());
                     vo.setSex(user.getSex());
@@ -777,14 +778,14 @@ public class LargeScreenDataServiceImpl extends ServiceImpl<LargeScreenDataMappe
                             vo.setOrgName(thirdDepart.getDepartName());
                         }
                     }
-                    vo.setLongitude(tblUserHelp.getLon());
-                    vo.setLatitude(tblUserHelp.getLat());
+                    vo.setLongitude(order.getInitiatorLongitude());
+                    vo.setLatitude(order.getInitiatorLatitude());
                 } else {
                     vo.setRealName("未知");
                     vo.setDepartName("未知");
                     vo.setOrgName("未知");
                 }
-                vo.setTime(tblUserHelp.getHelpTime());
+                vo.setTime(order.getCreateTime());
                 list.add(vo);
             }
         }
diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/OrderMapper.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/OrderMapper.java
index 89a9249..393a6b0 100644
--- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/OrderMapper.java
+++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/OrderMapper.java
@@ -6,6 +6,7 @@ import com.renkang.emergency.archives.model.vo.EmergencyNum;
 import com.renkang.emergency.bean.response.EmergencyUser;
 import com.renkang.emergency.entity.Order;
 import com.renkang.emergency.entity.TblHelpCentorVo;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -16,6 +17,7 @@ import java.util.List;
  * @Date: 2023-04-26
  * @Version: V1.0
  */
+@Mapper
 public interface OrderMapper extends BaseMapper<Order> , MPJBaseMapper<Order> {
     /**
      * 操作人员当天值班记录