From a67506723c8c8e6f0d223b864eaa69423a2710a8 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 11 Mar 2021 16:48:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 1920bd8..c0dcd31 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
@@ -81,7 +81,7 @@
bladeAnimalHeat.setStatus(compare1>0 ?0:1);
}
String person_rects = data.get("person_rect").toString();
- bladeAnimalHeat.setPersonRect(person_rects.substring(2,person_rects.length()-2));
+ bladeAnimalHeat.setPersonRect(person_rects.substring(1,person_rects.length()-1));
bladeAnimalHeat.setCreateTime(now());
//7.插入数据
int idata = baseMapper.insert(bladeAnimalHeat);
@@ -104,6 +104,10 @@
if (animalHeatVo.getStatus()==1){
return baseMapper.getAnimalStatisWeek();
}
+ //查询本月的统计数据
+ if (animalHeatVo.getStatus()==2){
+ return baseMapper.getAnimalStatisMonth();
+ }
}
return null;
}
--
Gitblit v1.9.3