From 77dd7d19bb13f19acd273ba92dfd2b866a229c5e Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 16 Jul 2022 16:20:07 +0800
Subject: [PATCH] 库存

---
 src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.xml |    3 ++-
 1 files changed, 2 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..95cb535 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,7 +196,7 @@
             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

--
Gitblit v1.9.3