From 3ba74e7692143fd6dcf4dd885f80f95dfef8387e Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期四, 23 十一月 2023 16:09:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature-risk_analysis' into feature-risk_analysis
---
src/main/resources/mapper/FugitiveDustMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/FugitiveDustMapper.xml b/src/main/resources/mapper/FugitiveDustMapper.xml
index ddbd502..6b8ed8c 100644
--- a/src/main/resources/mapper/FugitiveDustMapper.xml
+++ b/src/main/resources/mapper/FugitiveDustMapper.xml
@@ -35,7 +35,8 @@
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 != ''">
- b.name like concat('%',#{siteName},'%')
+<!-- b.name like concat('%',#{siteName},'%')-->
+ b.name = #{siteName}
</if>
<if test="mnCode !=null and mnCode != ''">
and a.mn_code = #{mnCode}
@@ -107,7 +108,7 @@
d.lst between #{beginTime} and #{endTime} and d.type = 'day'
</if>
</where>
- order by c.name asc
+ order by d.day_avg desc
</select>
--
Gitblit v1.9.3