From 1aa2a59a237dbc4c58a5e3d09be2bfeaf1535c8b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 31 八月 2024 21:26:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/resources/mapper/zgyw/PlatformOnlineMapper.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ycl-server/src/main/resources/mapper/zgyw/PlatformOnlineMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/PlatformOnlineMapper.xml
index 78a7fab..5b32179 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/PlatformOnlineMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/PlatformOnlineMapper.xml
@@ -10,6 +10,7 @@
         <result column="today_outline_sed" property="todayOutlineSed" />
         <result column="update_time" property="updateTime" />
         <result column="create_time" property="createTime" />
+        <result column="area" property="area" />
     </resultMap>
 
     <select id="getById" resultMap="BaseResultMap">
@@ -52,7 +53,7 @@
 
 
     <select id="yesterdayData" resultMap="BaseResultMap">
-        select * from t_platform_online
-        where create_date between #{startDate} and #{endDate}
+        select po.*,p.area from t_platform_online po inner join t_platform p on po.platform_id = p.id
+        where po.create_date between #{startDate} and #{endDate}
     </select>
 </mapper>

--
Gitblit v1.8.0