From d5b43ef0da42eaf50a08ce17e5fd3351eeb26a5e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 20 Mar 2021 14:10:19 +0800
Subject: [PATCH] 违禁品筛选条件去除，警情统计接口修改

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

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml
index 102d895..47c4940 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml
@@ -32,13 +32,20 @@
     <!--查询体温数据的分页数据-->
     <select id="selectAnimalHeatPageList" resultType="org.springblade.jfpt.animalheat.entity.BladeAnimalHeat">
         SELECT * FROM blade_animal_heat
-        <if test="animalHeatVo.begTime!=null and animalHeatVo.begTime!=''">
-            and create_time &gt;=#{animalHeatVo.begTime}
+        where 1=1
+        <if test="animalHeatVo.type==0">
+            and to_days(create_time)=to_days(now())
         </if>
-        <if test="animalHeatVo.endTime!=null and animalHeatVo.endTime!=''">
-            and create_time &lt;=#{animalHeatVo.endTime}
+        <if test="animalHeatVo.type==1">
+            and YEARWEEK(date_format(create_time,'%Y-%m-%d'),1) = YEARWEEK(now(),1)
         </if>
-        ORDER BY create_time asc
+        <if test="animalHeatVo.type==2">
+            and date_format(create_time,'%Y%m') = date_format(now(),'%Y%m')
+        </if>
+        <if test="animalHeatVo.status!=null">
+            and status=#{animalHeatVo.status}
+        </if>
+        ORDER BY create_time desc
     </select>
 
     <!--查询本周每天的体温数据(按礼拜一开始计算)-->

--
Gitblit v1.9.3