From a5b6b004f1737bf06aaaeb8d06e40b9702de25e5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 12 Mar 2021 14:18:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.java
index c426ff4..b4df899 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.java
@@ -7,6 +7,7 @@
 import org.springblade.jfpt.animalheat.vo.StatisVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * mapper 映射层
@@ -17,13 +18,13 @@
 	 * 获取体温数据统计  --当天
 	 * @return
 	 */
-	List<StatisVo> getAnimalStatis();
+	List<Map<String, Object>> getAnimalStatis();
 
 	/**
 	 * 获取体温数据统计  --本周
 	 * @return
 	 */
-	List<StatisVo> getAnimalStatisWeek();
+	List<Map<String, Object>> getAnimalStatisWeek();
 
 	/**
 	 * 体温数据的分页数据
@@ -32,4 +33,16 @@
 	 * @return
 	 */
 	List<BladeAnimalHeat> selectAnimalHeatPageList(IPage<BladeAnimalHeat> page, AnimalHeatVo animalHeatVo);
+
+	/**
+	 * 查询本周每天的体温数据数量
+	 * @return
+	 */
+    List<Map<String, Integer>> selWeekDayAnimalStatis();
+
+	/**
+	 * 获取体温数据统计  --本月
+	 * @return
+	 */
+    List<Map<String, Object>> getAnimalStatisMonth();
 }

--
Gitblit v1.9.3