From b7df6735bcb2d447cae7fcfba2d12accf3dd2fcc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 03 Feb 2024 17:27:21 +0800
Subject: [PATCH] 消防检查优化
---
src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml | 11 +++++++++--
src/main/java/org/springblade/modules/taskPlaceRectification/dto/TaskPlaceRectificationDTO.java | 6 ++++++
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 3 ---
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
index d233e50..597f649 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -514,9 +514,6 @@
#{code}
</foreach>
</when>
- <otherwise>
- and jg.grid_code in ('')
- </otherwise>
</choose>
</if>
order by jp.create_time desc,jp.id desc
diff --git a/src/main/java/org/springblade/modules/taskPlaceRectification/dto/TaskPlaceRectificationDTO.java b/src/main/java/org/springblade/modules/taskPlaceRectification/dto/TaskPlaceRectificationDTO.java
index 6d386fb..c178829 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/dto/TaskPlaceRectificationDTO.java
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/dto/TaskPlaceRectificationDTO.java
@@ -92,5 +92,11 @@
@ApiModelProperty(value = "地址编码", example = "")
private String addressName;
+ @ApiModelProperty(value = "开始时间", example = "")
+ private String startTime;
+
+ @ApiModelProperty(value = "结束时间", example = "")
+ private String endTime;
+
}
diff --git a/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml b/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
index a06ac8a..633b081 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
@@ -196,6 +196,13 @@
<if test="taskPalce.taskName != null and taskPalce.taskName != ''">and task_name = #{taskPalce.taskName}
</if>
+ <if test="taskPalce.startTime!=null and taskPalce.startTime!=''">
+ and jtpr.create_time>=#{taskPalce.startTime}
+ </if>
+ <if test="taskPalce.endTime!=null and taskPalce.endTime!=''">
+ and jtpr.create_time<=#{taskPalce.endTime}
+ </if>
+
<if test="taskPalce.placeName!=null and taskPalce.placeName!=''">
and jp.place_name like concat('%',#{taskPalce.placeName},'%')
</if>
@@ -323,10 +330,10 @@
and jp.nine_type = bd.dict_key
and br.town_code =#{code}
<if test="taskPlaceRectification.startTime!=null and taskPlaceRectification.startTime!=''">
- and create_time>=#{taskPlaceRectification.startTime}
+ and jpc.create_time>=#{taskPlaceRectification.startTime}
</if>
<if test="taskPlaceRectification.endTime!=null and taskPlaceRectification.endTime!=''">
- and create_time<=#{taskPlaceRectification.endTime}
+ and jpc.create_time<=#{taskPlaceRectification.endTime}
</if>
</where>
) number
--
Gitblit v1.9.3