From 1c612547c46e9c386d9f53c73978e2d81b09dde4 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 17 Oct 2022 08:53:52 +0800
Subject: [PATCH] 修改全景类农场的int类型为Integer类型；扫描记录sql查询修改
---
src/main/java/org/springblade/modules/panorama/entity/Panorama.java | 2 +-
src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.xml | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/panorama/entity/Panorama.java b/src/main/java/org/springblade/modules/panorama/entity/Panorama.java
index 1d76741..ac19979 100644
--- a/src/main/java/org/springblade/modules/panorama/entity/Panorama.java
+++ b/src/main/java/org/springblade/modules/panorama/entity/Panorama.java
@@ -40,6 +40,6 @@
private String jd;
private String wd;
private String addressName;
- private int farmId;
+ private Integer farmId;
}
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 6171089..83e4ede 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()
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
@@ -206,17 +212,20 @@
<!--获取扫描次数统计数据（年统计）-->
<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()
+ 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
--
Gitblit v1.9.3