From a2b70dffde42c607ebca83c2e1e5002911003246 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 26 Mar 2021 08:51:59 +0800
Subject: [PATCH] 近一周体温数据,警情数据,健康码数据统计接口排序修改

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml |    4 ++++
 1 files changed, 4 insertions(+), 0 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 47c4940..46afca9 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
@@ -45,6 +45,9 @@
         <if test="animalHeatVo.status!=null">
             and status=#{animalHeatVo.status}
         </if>
+        <if test="animalHeatVo.begTime!=null and animalHeatVo.begTime!='' and animalHeatVo.endTime!=null and animalHeatVo.endTime!='' ">
+            and date(create_time) between #{animalHeatVo.begTime} and #{animalHeatVo.endTime}
+        </if>
         ORDER BY create_time desc
     </select>
 
@@ -113,5 +116,6 @@
 	    ) b
 		 on
 		 a.click_date = b.datetime
+		 order by a.click_date asc
     </select>
 </mapper>

--
Gitblit v1.9.3