From d95f6551e8214d69cd0fd511ec693641eb61ba16 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 01 Aug 2022 10:36:26 +0800
Subject: [PATCH] 1、大屏首页接口修复,解决double类型相加精度问题

---
 src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.xml |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 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..6171089 100644
--- a/src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.xml
@@ -170,6 +170,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 +196,31 @@
             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 DAY(ssr.create_time) = 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