From 3d4cbf0b3534da14db4a57f8bdafe2125b3b8678 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 13 Jul 2022 15:23:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.xml | 2 +-
1 files changed, 1 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..6bd394b 100644
--- a/src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.xml
@@ -195,7 +195,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