From f34a510629676ebf22d75bde2e89e2fe4a2f56be Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 24 Mar 2021 18:22:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java
index 763932f..d00e195 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java
@@ -96,17 +96,17 @@
*/
@Override
public List<Map<String, Object>> getAnimalStatis(AnimalHeatVo animalHeatVo) {
- if(null!= animalHeatVo.getStatus()){
+ if(null!= animalHeatVo.getType()){
//查询当天的统计数据
- if (animalHeatVo.getStatus()==0){
+ if (animalHeatVo.getType()==0){
return baseMapper.getAnimalStatis();
}
//查询本周的统计数据
- if (animalHeatVo.getStatus()==1){
+ if (animalHeatVo.getType()==1){
return baseMapper.getAnimalStatisWeek();
}
//查询本月的统计数据
- if (animalHeatVo.getStatus()==2){
+ if (animalHeatVo.getType()==2){
return baseMapper.getAnimalStatisMonth();
}
}
@@ -132,7 +132,6 @@
*/
@Override
public List<Map<String, Integer>> selWeekDayAnimalStatis() {
- List<Map<String,Integer>> selWeekDayAnimalStatis;
return baseMapper.selWeekDayAnimalStatis();
}
--
Gitblit v1.9.3