From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 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 fcc4a02..e5613f5 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
@@ -4,9 +4,10 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
+import org.springblade.common.entity.ReportReturnData;
 import org.springblade.jfpt.animalheat.entity.BladeAnimalHeat;
+import org.springblade.common.entity.AnimalHeatExcel;
 import org.springblade.jfpt.animalheat.vo.AnimalHeatVo;
-import org.springblade.jfpt.animalheat.vo.StatisVo;
 import org.springblade.jfpt.parcel.vo.ConditionVo;
 
 import java.util.List;
@@ -76,4 +77,16 @@
 	 */
 	@SqlParser(filter = true)
     List<Integer> selectAnimalTimeData(@Param("conditionVo")ConditionVo conditionVo);
+
+	/**
+	 * 导出体温数据列表
+	 * @param animalHeatVo 条件
+	 */
+    List<AnimalHeatExcel> exportAnimalHeat(@Param("animalHeatVo")AnimalHeatVo animalHeatVo);
+
+	/**
+	 * 导出体温数据列表
+	 * @param animalHeatVo 条件
+	 */
+    List<ReportReturnData> getAnimalHeatPie(@Param("animalHeatVo")AnimalHeatVo animalHeatVo);
 }

--
Gitblit v1.9.3