From 31b6aefacbee9dde61be6afcb7c6dbbf7c6baa7d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 02 Jan 2024 17:51:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index 902b68e..99e6683 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -22,7 +22,7 @@
<select id="selectTaskPage" resultMap="taskResultMap">
SELECT
- IFNULL(jda.address_name,jp.localtion)address_name ,
+ IFNULL(jda.address_name,jp.location)address_name ,
jt.id,
jt.name,
jt.type,
@@ -71,17 +71,18 @@
<if test="task.createDept != null ">and jt.create_dept = #{task.createDept}</if>
<if test="task.isDeleted != null ">and jt.is_deleted = #{task.isDeleted}</if>
<if test="task.houseCode != null and task.houseCode != ''">and jt.house_code = #{task.houseCode}</if>
- <!-- 取保候审 -->
- <if test="task.reportType != null and task.reportType == 1 ">
- and jt.report_type = 1
+ <if test="task.startTime != null and task.startTime != '' and task.endTime != null and task.endTime != '' ">
+ AND jt.create_time BETWEEN #{task.startTime} and #{task.endTime}
+ </if>
+ <!-- 取保候审 或 报事报修 -->
+ <if test="task.reportType != null and task.reportType != 2 ">
+ and jt.report_type = #{task.reportType}
</if>
<!-- 场所店铺 -->
<if test="task.reportType != null and task.reportType == 2 ">
and jt.report_type in (2,3,4,5,6)
</if>
-
order by jt.create_time desc
-
</select>
--
Gitblit v1.9.3