From 66e71e5d4cb5bb3706f7c3662bbf7859f690ba84 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sun, 09 May 2021 11:59:38 +0800
Subject: [PATCH] 新增查询当前设备未处理和处理中的警情数量接口，当前设备一个警情处理完成后，如果当前设备还有其他预警未处理完成的，当前设备状态不会修改回正常状态

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 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 2435b5d..2dcdb60 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
@@ -12,10 +12,10 @@
         <if test="animalHeatVo.type==2">
             and date_format(create_time,'%Y%m') = date_format(now(),'%Y%m')
         </if>
-        <if test="animalHeatVo.begTime!=null and animalHeatVo.begTime!='' and animalHeatVo.endTime!=null and animalHeatVo.endTime!='' ">
+        <if test="animalHeatVo.begTime!=null and animalHeatVo.begTime!='' and animalHeatVo.endTime!=null and animalHeatVo.endTime!='' and animalHeatVo.begTime!='undefined' and animalHeatVo.endTime!='undefined' ">
             and date(create_time) between #{animalHeatVo.begTime} and #{animalHeatVo.endTime}
         </if>
-        <if test="animalHeatVo.timeDesc!=null and animalHeatVo.timeDesc!=''">
+        <if test="animalHeatVo.timeDesc!=null and animalHeatVo.timeDesc!='' and animalHeatVo.timeDesc!='undefined'">
             <if test="animalHeatVo.timeDesc=='0-2'">
                 and hour(create_time)>=0 and hour(create_time) &lt;2
             </if>
@@ -202,7 +202,7 @@
     <select id="exportAnimalHeat" resultType="org.springblade.common.entity.AnimalHeatExcel">
         SELECT * FROM blade_animal_heat
         where 1=1
-        <if test="animalHeatVo.status!=null">
+        <if test="animalHeatVo.status!=null and animalHeatVo.status!='' and animalHeatVo.status!='undefined'">
             and status=#{animalHeatVo.status}
         </if>
         <include refid="animalHeatCondition"></include>

--
Gitblit v1.9.3