From d363694ff8509c0c8a010967b8ad38fbf5155e91 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 16 Jul 2022 16:51:17 +0800
Subject: [PATCH] 溯源扫码统计新增
---
src/main/java/org/springblade/modules/traceability/controller/SweepRecordController.java | 10 ++++++++++
src/main/java/org/springblade/modules/traceability/service/impl/SweepRecordServiceImpl.java | 10 ++++++++++
src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.java | 8 ++++++++
src/main/java/org/springblade/modules/traceability/service/SweepRecordService.java | 7 +++++++
src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.xml | 20 ++++++++++++++++++++
5 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/traceability/controller/SweepRecordController.java b/src/main/java/org/springblade/modules/traceability/controller/SweepRecordController.java
index 48be1d4..22324a9 100644
--- a/src/main/java/org/springblade/modules/traceability/controller/SweepRecordController.java
+++ b/src/main/java/org/springblade/modules/traceability/controller/SweepRecordController.java
@@ -128,4 +128,14 @@
return R.data(sweepRecordService.getSweepRecordStatisticsByDayOrMonthOrYear(sweepRecord));
}
+ /**
+ * 累计扫描统计
+ * @param sweepRecord
+ * @return
+ */
+ @GetMapping("/getSweepRecordStatisticCount")
+ public R getSweepRecordStatisticCount(SweepRecordVO sweepRecord){
+ return R.data(sweepRecordService.getSweepRecordStatisticCount(sweepRecord));
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.java b/src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.java
index 99f7cdc..8bbe185 100644
--- a/src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.java
+++ b/src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.java
@@ -9,6 +9,7 @@
import org.springblade.modules.traceability.vo.SweepRecordVO;
import java.util.List;
+import java.util.Map;
/**
* 溯源扫描记录Mapper 接口
@@ -53,4 +54,11 @@
* @return
*/
List<SweepRecordStatisticDTO> getSweepRecordStatisticsByDay(@Param("sweepRecord") SweepRecordVO sweepRecord);
+
+ /**
+ * 累计扫描统计
+ * @param sweepRecord
+ * @return
+ */
+ List<Integer> getSweepRecordStatisticCount(@Param("sweepRecord") SweepRecordVO sweepRecord);
}
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 95cb535..6171089 100644
--- a/src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.xml
@@ -203,4 +203,24 @@
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>
diff --git a/src/main/java/org/springblade/modules/traceability/service/SweepRecordService.java b/src/main/java/org/springblade/modules/traceability/service/SweepRecordService.java
index c1f1c78..ca95ae8 100644
--- a/src/main/java/org/springblade/modules/traceability/service/SweepRecordService.java
+++ b/src/main/java/org/springblade/modules/traceability/service/SweepRecordService.java
@@ -36,4 +36,11 @@
* @return
*/
Object getSweepRecordStatisticsByDayOrMonthOrYear(SweepRecordVO sweepRecord);
+
+ /**
+ * 累计扫描统计
+ * @param sweepRecord
+ * @return
+ */
+ Object getSweepRecordStatisticCount(SweepRecordVO sweepRecord);
}
diff --git a/src/main/java/org/springblade/modules/traceability/service/impl/SweepRecordServiceImpl.java b/src/main/java/org/springblade/modules/traceability/service/impl/SweepRecordServiceImpl.java
index 05bb5f4..8b923ff 100644
--- a/src/main/java/org/springblade/modules/traceability/service/impl/SweepRecordServiceImpl.java
+++ b/src/main/java/org/springblade/modules/traceability/service/impl/SweepRecordServiceImpl.java
@@ -71,4 +71,14 @@
}
return null;
}
+
+ /**
+ * 累计扫描统计
+ * @param sweepRecord
+ * @return
+ */
+ @Override
+ public Object getSweepRecordStatisticCount(SweepRecordVO sweepRecord) {
+ return baseMapper.getSweepRecordStatisticCount(sweepRecord);
+ }
}
--
Gitblit v1.9.3