From 4d2e58e36ad968da65ab8c105d503c5318fa9f3b Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期四, 31 八月 2023 11:30:41 +0800
Subject: [PATCH] 扬尘后端

---
 src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml b/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml
index 5f4ae07..04cc427 100644
--- a/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml
+++ b/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml
@@ -5,21 +5,21 @@
 <mapper namespace="com.job.zsc.mapper.FugitiveDustMapper">
 
     <select id="conditonQueryDustHistoryData" resultType="com.job.zsc.pojo.DustSiteData">
-        select *
-        from monitor_site
+        select a.*,b.*
+        from ja_t_dust_site_data_info as a join ja_t_dust_site_info as b on a.mn_code = b.mn_code
         <where>
             <if test="siteName !=null and siteName != ''">
-                Name like concat('%',#{siteName},'%')
+                b.name like concat('%',#{siteName},'%')
             </if>
             <if test="mnCode !=null and mnCode != ''">
-                and MN_Code = #{mnCode}
+                and a.mn_code = #{mnCode}
             </if>
             <if test="beginTime != null and endTime != null">
-                and Lst between #{beginTime} and #{endTime}
+                and a.lst between #{beginTime} and #{endTime}
             </if>
 
             <if test="scenarioType != null and scenarioType != '' ">
-                and Type_Name in
+                and b.typename in
                 <foreach item="item" collection="scenarioType" separator="," open="("  close=")">
                     #{item}
                 </foreach>

--
Gitblit v1.9.3