From 48959b0b908dd57bf9dd991b75756ac2698f2b4d Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期四, 12 十月 2023 10:48:11 +0800
Subject: [PATCH] 修改了数据排名清单的sql语句

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

diff --git a/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml b/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml
index 04cc427..34bb6f7 100644
--- a/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml
+++ b/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml
@@ -3,6 +3,32 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.job.zsc.mapper.FugitiveDustMapper">
+    <update id="update">
+        update audit_info
+        <set>
+            <if test="exceptionId != null and exceptionId!=''" >
+                exception_id = #{exceptionId},
+            </if>
+            <if test="checker != null and checker!=''" >
+                checker = #{checker},
+            </if>
+
+            <if test="checkerContent != null and checkerContent!=''" >
+                checker_content = #{checkerContent} ,
+            </if>
+            <if test="enterpriseContent != null and enterpriseContent!=''" >
+                enterprise_content = #{enterpriseContent},
+            </if>
+            <if test="auditStatus != null and auditStatus!=''" >
+                audit_status = #{auditStatus},
+            </if>
+            <if test="updateTime != null" >
+                update_time = #{updateTime}
+        </if>
+
+        </set>
+        where exception_id = #{exceptionId}
+    </update>
 
     <select id="conditonQueryDustHistoryData" resultType="com.job.zsc.pojo.DustSiteData">
         select a.*,b.*
@@ -47,32 +73,37 @@
     <select id="analysisByTime" resultType="com.job.zsc.pojo.AnalysisDustData">
         select  c.name,d.*
         from ja_t_dust_site_info as c  join
-        (select
-        a.mn_code as mn_code,
-        DATE(a.lst) as lst,
-        ROUND(AVG(a.dust_value),3)  as day_avg,
-        min(a.dust_value) as min,
-        max(a.dust_value) as max,
+        (
+        select
+        mn_code as mn_code,
+        DATE(lst) as lst,
+        ROUND(AVG(dust_value),3)  as day_avg,
+        min(dust_value) as min,
+        max(dust_value) as max,
         CONCAT(ROUND(COUNT(*)/96*100, 2), '%')  as day_online,
-        CONCAT(ROUND(SUM(CASE WHEN a.dust_value >0 THEN 1 ELSE 0 END)/96 *100, 2), '%') as day_valid,
-        CONCAT(ROUND(SUM(CASE WHEN a.dust_value >= 1  THEN 1 ELSE 0 END)/96*100,2),'%') as  day_exceeding
-        from ja_t_dust_site_data_info as a join ja_t_dust_site_info as b on a.mn_code = b.mn_code
+        CONCAT(ROUND(SUM(CASE WHEN dust_value >0 THEN 1 ELSE 0 END)/96 *100, 2), '%') as day_valid,
+        CONCAT(ROUND(SUM(CASE WHEN dust_value >= 1  THEN 1 ELSE 0 END)/96*100,2),'%') as  day_exceeding
+        from ja_t_dust_site_data_info
         <where>
-            <if test="siteName !=null and siteName != ''">
-                b.name = #{siteName}
-            </if>
+<!--            <if test="siteName !=null and siteName != ''">-->
+<!--                b.name = #{siteName}-->
+<!--            </if>-->
 
             <if test="beginTime != null and endTime != null">
-                and  a.lst between #{beginTime} and #{endTime}
+                lst between #{beginTime} and #{endTime}
             </if>
+
         </where>
-        GROUP BY a.mn_code,DATE(a.lst)
+        GROUP BY mn_code,DATE(lst)
         order by lst asc ) as d  on c.mn_code = d.mn_code
     </select>
 
-    <!--鏉′欢鏌ヨ寮傚父鏁版嵁-->
+
+
+    <!--鏉′欢鏌ヨ寮傚父鏁版嵁  鍔犱笂浜嗗璁′俊鎭�-->
     <select id="getExceptionData" resultType="com.job.zsc.pojo.DustExceptionData">
-        select b.name,b.typename,b.address,b.duty_company,a.*
+        select *
+        from (select a.* ,b.name,b.typename,b.address,b.duty_company
         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 != ''">
@@ -86,17 +117,22 @@
                 </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>
+        )
+        as c left join audit_info as d  on c.id = d.exception_id
     </select>
+
 
 
     <!--   鏍规嵁鏌愭鏃堕棿鍐呮煇涓紓甯哥被鍨嬫煡璇㈠搴旂殑搴楅摵鍚嶇О鍜岃澶囩紪鍙�-->
     <select id="getExceptionSitenameAndCode" resultType="com.job.zsc.pojo.DustExceptionData">
         select DISTINCT b.name,a.mn_code
         from dust_exception_data as a join ja_t_dust_site_info as b on a.mn_code = b.mn_code
+
         <where>
             <if test="exceptionType !=null and exceptionType != ''">
                 a.exception_type  = #{exceptionType}
@@ -123,4 +159,60 @@
         </where>
         order by a.lst asc
     </select>
+
+    <select id="getHasAuditedData" resultType="com.job.zsc.pojo.DustExceptionData">
+        select *
+        from dust_exception_data as a left join audit_info as b on a.id = b.exception_id
+        <where>
+            <if test="beginTime != null and endTime != null">
+                (a.begin_time between #{beginTime} and #{endTime} or a.end_time between #{beginTime} and  #{endTime}) and b.audit_status != 0
+
+            </if>
+        </where>
+
+    </select>
+    <select id="getSiteNameByTimeAndExceptionType" resultType="com.job.zsc.pojo.DustExceptionData">
+        select DISTINCT b.name
+        from dust_exception_data as a join ja_t_dust_site_info as b on a.mn_code = b.mn_code
+        <where>
+            <if test="exceptionType != null and exceptionType != '' ">
+                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="analysisdataByType" resultType="com.job.zsc.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>
+            <if test="month != null and month != null">
+               a.lst  = #{month}
+            </if>
+
+            <if test="type != null and type != ''">
+                and a.type  = #{type}
+            </if>
+        </where>
+
+    </select>
+    <select id="analysisdataByTimeAndType" resultType="com.job.zsc.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>
+            <if test="beginTime != null and endTime != null">
+                a.Lst between #{beginTime} and #{endTime}
+            </if>
+
+            <if test="type != null and type != ''">
+                and a.type  = #{type}
+            </if>
+        </where>
+
+
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3