From 555fb0758022cec5c88e98ee989d0287bdc0052d Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期四, 23 十一月 2023 08:50:05 +0800
Subject: [PATCH] 修改历史数据查询的sql语句
---
src/main/resources/mapper/FugitiveDustMapper.xml | 98 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 93 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/FugitiveDustMapper.xml b/src/main/resources/mapper/FugitiveDustMapper.xml
index f387e49..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>
@@ -118,7 +119,7 @@
from dust_exception_data 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 = #{siteName}
+ b.name like concat('%',#{siteName},'%')
</if>
<if test="exceptionType != null and exceptionType != '' ">
@@ -145,12 +146,27 @@
from dust_exception_data 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 = #{siteName}
+ </if>
<if test="exceptionType !=null and exceptionType != ''">
- a.exception_type = #{exceptionType}
+ and a.exception_type = #{exceptionType}
</if>
<if test="beginTime != null and endTime != null">
and (a.begin_time between #{beginTime} and #{endTime} or a.end_time between #{beginTime} and #{endTime})
+ </if>
+ <if test="street != null and street != '' ">
+ and b.address in
+ <foreach item="item" collection="street" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+ <if test="dutyCompany != null and dutyCompany != '' ">
+ and b.duty_company in
+ <foreach item="item" collection="dutyCompany" separator="," open="(" close=")">
+ #{item}
+ </foreach>
</if>
</where>
</select>
@@ -210,8 +226,9 @@
and a.type = #{type}
</if>
</where>
-
</select>
+
+
<select id="analysisdataByTimeAndType" resultType="com.flightfeather.monitor.pojo.AnalysisDustData">
select a.*,b.name,b.duty_company from dust_statistics_value as a join ja_t_dust_site_info as b on a.mn_code = b. mn_code
<where>
@@ -223,7 +240,78 @@
and a.type = #{type}
</if>
</where>
+ </select>
+ <select id="getExceptionData2" resultType="com.flightfeather.monitor.pojo.DustExceptionData">
+
+ select a.* ,b.*
+ from dust_exception_data as a join ja_t_dust_site_info as b on a.mn_code = b.mn_code
+ <where>
+ <if test="street != null and street != '' ">
+ b.address in
+ <foreach item="item" collection="street" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="dutyCompany != null and dutyCompany != '' ">
+ and b.duty_company in
+ <foreach item="item" collection="dutyCompany" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+ <if test="siteName !=null and siteName != ''">
+ and b.name like concat('%',#{siteName},'%')
+ </if>
+
+ <if test="exceptionType != null and exceptionType != '' ">
+ and a.exception_type in
+ <foreach item="item" collection="exceptionType" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+
+
+ <if test="beginTime != null and endTime != null">
+ and (a.begin_time between #{beginTime} and #{endTime} or a.end_time between #{beginTime} and #{endTime})
+ </if>
+
+
+
+ </where>
</select>
+ <select id="exceptionNum" resultType="java.lang.Integer">
+ select count(*)
+ from dust_exception_data 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 = #{siteName}
+ </if>
+ <if test="exceptionType != null and exceptionType != '' ">
+ and a.exception_type = #{exceptionType}
+ </if>
+
+ <if test="street != null and street != '' ">
+ and b.address in
+ <foreach item="item" collection="street" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="dutyCompany != null and dutyCompany != '' ">
+ and b.duty_company in
+ <foreach item="item" collection="dutyCompany" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="beginTime != null and endTime != null">
+ and (a.begin_time between #{beginTime} and #{endTime} or a.end_time between #{beginTime} and #{endTime})
+ </if>
+
+ </where>
+
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3