From 6f2c07bbd6f50f1f9fe29bfa6fec5a6568897432 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 18 Mar 2021 10:43:01 +0800
Subject: [PATCH] 警情分发逻辑修改
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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..5fea101 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,11 +32,15 @@
<!--查询体温数据的分页数据-->
<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 >=#{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 <=#{animalHeatVo.endTime}
+ <if test="animalHeatVo.type==1">
+ and YEARWEEK(date_format(create_time,'%Y-%m-%d'),1) = YEARWEEK(now(),1)
+ </if>
+ <if test="animalHeatVo.type==2">
+ and date_format(create_time,'%Y%m') = date_format(now(),'%Y%m')
</if>
ORDER BY create_time asc
</select>
--
Gitblit v1.9.3