From 06faa4851865e3a471b547ac7f0268b34ed2ae37 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 13 Jul 2022 09:13:38 +0800
Subject: [PATCH] 溯源统计接口修改
---
src/main/java/org/springblade/modules/lang/mapper/LandMapper.java | 2 +-
src/main/resources/application-test.yml | 2 +-
src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
index 2f3b988..fad1a68 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
@@ -79,5 +79,5 @@
* @param land
* @return
*/
- List<LandVO> getLandList(LandVO land);
+ List<LandVO> getLandList(@Param("land") LandVO land);
}
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
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index c3a5ebb..4104659 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -16,7 +16,7 @@
datasource:
url: jdbc:mysql://61.131.136.25:2083/zhny?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
- password: ZHba@0112
+ password: NCzhba@2022
#第三方登陆
social:
--
Gitblit v1.9.3