From 72b971c98c46531064d74b68fc8fe8864ed0b544 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 08 Nov 2022 09:04:56 +0800
Subject: [PATCH] 大屏溯源统计次数sql修改

---
 src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.xml |   34 ++++++++++++++++++++++++++++++++--
 1 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.xml b/src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.xml
index 8c89416..53b4b2f 100644
--- a/src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.xml
@@ -10,36 +10,42 @@
 
     <!--获取扫描次数统计数据-->
     <select id="getSweepRecordStatistics" resultType="java.lang.Integer">
+--         今天
         select count(*) from sys_sweep_record  ssr left join sys_traceability st on ssr.code = st.id
         left join sys_recovery sr on sr.id = st.recovery_id
         left join sys_land sl on sl.id = sr.land_id
-        WHERE DAY(ssr.create_time) = NOW()
+        WHERE TO_DAYS( ssr.create_time )  = TO_DAYS(NOW())
         and sl.farm_id = #{sweepRecord.farmId}
         union all
+--         昨天
         select count(*) from sys_sweep_record  ssr left join sys_traceability st on ssr.code = st.id
         left join sys_recovery sr on sr.id = st.recovery_id
         left join sys_land sl on sl.id = sr.land_id
         WHERE TO_DAYS( NOW( ) ) - TO_DAYS( ssr.create_time) = 1
         and sl.farm_id = #{sweepRecord.farmId}
         union all
+--         本周
         select count(*) from sys_sweep_record  ssr left join sys_traceability st on ssr.code = st.id
         left join sys_recovery sr on sr.id = st.recovery_id
         left join sys_land sl on sl.id = sr.land_id
         WHERE YEARWEEK(date_format(ssr.create_time,'%Y-%m-%d')) = YEARWEEK(now())
         and sl.farm_id = #{sweepRecord.farmId}
         union all
+--         上周
         select count(*) from sys_sweep_record  ssr left join sys_traceability st on ssr.code = st.id
         left join sys_recovery sr on sr.id = st.recovery_id
         left join sys_land sl on sl.id = sr.land_id
         WHERE YEARWEEK(date_format(ssr.create_time,'%Y-%m-%d')) = YEARWEEK(now())-1
         and sl.farm_id = #{sweepRecord.farmId}
         union all
+--         本月
         select count(*) from sys_sweep_record  ssr left join sys_traceability st on ssr.code = st.id
         left join sys_recovery sr on sr.id = st.recovery_id
         left join sys_land sl on sl.id = sr.land_id
         WHERE DATE_FORMAT( ssr.create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
         and sl.farm_id = #{sweepRecord.farmId}
         union all
+--         上月
         select count(*) from sys_sweep_record  ssr left join sys_traceability st on ssr.code = st.id
         left join sys_recovery sr on sr.id = st.recovery_id
         left join sys_land sl on sl.id = sr.land_id
@@ -170,6 +176,7 @@
 		and sl.farm_id = #{sweepRecord.farmId}
         GROUP BY gptime
         ) AS righttable ON DATE_FORMAT(lefttable.date, '%Y-%c-%d') = righttable.gptime
+        ORDER BY time
     </select>
 
     <!--获取扫描次数统计数据(年统计)-->
@@ -195,11 +202,34 @@
             left join sys_traceability st on ssr.code = st.id
             left join sys_recovery sr on sr.id = st.recovery_id
             left join sys_land sl on sl.id = sr.land_id
-            where  year(ssr.create_time) = #{sweepRecord.farmId}
+            where  year(ssr.create_time) = #{sweepRecord.time}
             and sl.farm_id = #{sweepRecord.farmId}
             GROUP BY month(ssr.create_time)
         ) n
         on m.id = n.a
         order by id
     </select>
+
+    <!--获取扫描次数统计数据(年统计)-->
+    <select id="getSweepRecordStatisticCount" resultType="java.lang.Integer">
+--         总计
+        select count(*) from sys_sweep_record  ssr left join sys_traceability st on ssr.code = st.id
+        left join sys_recovery sr on sr.id = st.recovery_id
+        left join sys_land sl on sl.id = sr.land_id
+        WHERE sl.farm_id = #{sweepRecord.farmId}
+        union all
+--         今天
+        select count(*) from sys_sweep_record  ssr left join sys_traceability st on ssr.code = st.id
+        left join sys_recovery sr on sr.id = st.recovery_id
+        left join sys_land sl on sl.id = sr.land_id
+        WHERE TO_DAYS( ssr.create_time )  = TO_DAYS(NOW())
+        and sl.farm_id = #{sweepRecord.farmId}
+        union all
+--         昨天
+        select count(*) from sys_sweep_record  ssr left join sys_traceability st on ssr.code = st.id
+        left join sys_recovery sr on sr.id = st.recovery_id
+        left join sys_land sl on sl.id = sr.land_id
+        WHERE TO_DAYS( NOW( ) ) - TO_DAYS( ssr.create_time) = 1
+        and sl.farm_id = #{sweepRecord.farmId}
+    </select>
 </mapper>

--
Gitblit v1.9.3