From 7a1e4d9fe3fe2172d5c4fba524f17ffd73ffbb3e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 08 Jul 2024 10:39:26 +0800
Subject: [PATCH] 公安添加时间过滤
---
src/main/java/org/springblade/modules/task/vo/TaskResidencePermitApplyVO.java | 7 +++++++
src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml | 5 +++++
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 1 +
src/main/java/org/springblade/modules/nursingCheckIn/mapper/NursingCheckInMapper.xml | 3 +++
src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml | 3 +++
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 4 ++++
src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml | 5 ++++-
src/main/java/org/springblade/modules/task/vo/TaskLabelReportingEventVO.java | 8 ++++++++
src/main/java/org/springblade/modules/place/vo/PlaceVO.java | 10 ++++++++++
src/main/java/org/springblade/modules/nursingCheckIn/vo/NursingCheckInVO.java | 7 +++++++
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 4 ++++
11 files changed, 56 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
index 770f07f..ec09a74 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -349,6 +349,7 @@
and jhs.district_code = #{household.aoiCode}
</if>
and jh.is_deleted = 0
+ and jg.grid_code is not null
order by jh.id desc
</where>
diff --git a/src/main/java/org/springblade/modules/nursingCheckIn/mapper/NursingCheckInMapper.xml b/src/main/java/org/springblade/modules/nursingCheckIn/mapper/NursingCheckInMapper.xml
index 10a47ce..c2f774a 100644
--- a/src/main/java/org/springblade/modules/nursingCheckIn/mapper/NursingCheckInMapper.xml
+++ b/src/main/java/org/springblade/modules/nursingCheckIn/mapper/NursingCheckInMapper.xml
@@ -19,6 +19,9 @@
<if test="nursingCheckIn.images != null and nursingCheckIn.images != ''">and images = #{nursingCheckIn.images}</if>
<if test="nursingCheckIn.placeId != null ">and place_id = #{nursingCheckIn.placeId}</if>
<if test="nursingCheckIn.type != null and nursingCheckIn.type != ''">and type = #{nursingCheckIn.type}</if>
+ <if test="nursingCheckIn.startTime != null and nursingCheckIn.startTime != '' and nursingCheckIn.endTime != null and nursingCheckIn.endTime != '' ">
+ AND create_time BETWEEN #{nursingCheckIn.startTime} and #{nursingCheckIn.endTime}
+ </if>
</where>
order by id desc
</select>
diff --git a/src/main/java/org/springblade/modules/nursingCheckIn/vo/NursingCheckInVO.java b/src/main/java/org/springblade/modules/nursingCheckIn/vo/NursingCheckInVO.java
index b11e737..4fbe338 100644
--- a/src/main/java/org/springblade/modules/nursingCheckIn/vo/NursingCheckInVO.java
+++ b/src/main/java/org/springblade/modules/nursingCheckIn/vo/NursingCheckInVO.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.nursingCheckIn.vo;
+import io.swagger.annotations.ApiModelProperty;
import org.springblade.modules.nursingCheckIn.entity.NursingCheckInEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
@@ -31,5 +32,11 @@
@EqualsAndHashCode(callSuper = true)
public class NursingCheckInVO extends NursingCheckInEntity {
private static final long serialVersionUID = 1L;
+ @ApiModelProperty("开始时间")
+ private String startTime;
+
+ @ApiModelProperty("结束时间")
+ private String endTime;
+
}
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 10e1710..4a9090b 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -184,6 +184,10 @@
and jpag.pcs_name like concat('%',#{place.deptName},'%')
</if>
+ <if test="place.startTime != null and place.startTime != '' and place.endTime != null and place.endTime != '' ">
+ AND jp.create_time BETWEEN #{place.startTime} and #{place.endTime}
+ </if>
+
<if test="place.policeName!=null and place.policeName!=''">
and bus.name like concat('%',#{place.policeName},'%')
</if>
diff --git a/src/main/java/org/springblade/modules/place/vo/PlaceVO.java b/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
index 210c838..84209d8 100644
--- a/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
+++ b/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.place.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import liquibase.pro.packaged.S;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
@@ -52,6 +53,15 @@
private String phone;
+ @ApiModelProperty(value = "开始时间", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private String startTime;
+
+ /** 创建时间 */
+ @ApiModelProperty(value = "结束时间", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private String endTime;
+
/**
* 类型 2：非小区（能关联地址表） 3：商超
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
index 1e83fa4..0fcb2ea 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
@@ -95,6 +95,9 @@
<if test="taskLabelReportingEvent.principalPhone != null and taskLabelReportingEvent.principalPhone != ''">
AND jp.principal_phone like concat('%',#{taskLabelReportingEvent.principalPhone},'%')
</if>
+ <if test="taskLabelReportingEvent.startTime != null and taskLabelReportingEvent.startTime != '' and taskLabelReportingEvent.endTime != null and taskLabelReportingEvent.endTime != '' ">
+ AND jtlre.create_time BETWEEN #{taskLabelReportingEvent.startTime} and #{taskLabelReportingEvent.endTime}
+ </if>
<if test="taskLabelReportingEvent.roleName != null and taskLabelReportingEvent.roleName != ''">
<if test="taskLabelReportingEvent.roleName=='wgy'">
<if test="isAdministrator==2">
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 eee8477..be111d3 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -443,6 +443,10 @@
AND jt.report_type = #{task.reportType}
</if>
+ <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 or task.reportType == ''">
AND jt.report_type in (2,3,6,7)
</if>
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml
index d709791..c73c20a 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml
@@ -64,6 +64,11 @@
<if test="place.placeName != null and place.placeName != ''">
and jp.place_name like concat('%', #{place.placeName},'%')
</if>
+
+ <if test="place.startTime != null and place.startTime != '' and place.endTime != null and place.endTime != '' ">
+ AND jtnfr.create_time BETWEEN #{place.startTime} and #{place.endTime}
+ </if>
+
<if test="place.principal != null and place.principal != ''">
and jp.principal like concat('%', #{place.principal},'%')
</if>
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
index cc0580e..5a71a03 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
@@ -42,7 +42,10 @@
<if test="residen.address != null and residen.address != ''">and jtrpa.address like CONCAT('%',#{residen.address},'%')</if>
<if test="residen.houseCode != null and residen.houseCode != ''">and jtrpa.house_code = #{residen.houseCode}</if>
<if test="residen.taskId != null ">and jtrpa.task_id = #{residen.taskId}</if>
- <if test="residen.createTime != null ">and jtrpa.create_time = #{residen.createTime}</if>
+
+ <if test="residen.startTime != null and residen.startTime != '' and residen.endTime != null and residen.endTime != '' ">
+ AND jtrpa.create_time BETWEEN #{residen.startTime} and #{residen.endTime}
+ </if>
<if test="residen.updateTime != null ">and jtrpa.update_time = #{residen.updateTime}</if>
<if test="residen.createUser != null ">and jtrpa.create_user = #{residen.createUser}</if>
<if test="residen.houseRentalId != null ">and jtrpa.house_rental_id = #{residen.houseRentalId}</if>
diff --git a/src/main/java/org/springblade/modules/task/vo/TaskLabelReportingEventVO.java b/src/main/java/org/springblade/modules/task/vo/TaskLabelReportingEventVO.java
index 5da38e7..504528d 100644
--- a/src/main/java/org/springblade/modules/task/vo/TaskLabelReportingEventVO.java
+++ b/src/main/java/org/springblade/modules/task/vo/TaskLabelReportingEventVO.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.task.vo;
+import io.swagger.annotations.ApiModelProperty;
import org.springblade.modules.task.entity.TaskLabelReportingEventEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
@@ -88,4 +89,11 @@
private String houseCode;
+
+ @ApiModelProperty("开始时间")
+ private String startTime;
+
+ @ApiModelProperty("结束时间")
+ private String endTime;
+
}
diff --git a/src/main/java/org/springblade/modules/task/vo/TaskResidencePermitApplyVO.java b/src/main/java/org/springblade/modules/task/vo/TaskResidencePermitApplyVO.java
index c75e5c0..3513a86 100644
--- a/src/main/java/org/springblade/modules/task/vo/TaskResidencePermitApplyVO.java
+++ b/src/main/java/org/springblade/modules/task/vo/TaskResidencePermitApplyVO.java
@@ -60,4 +60,11 @@
@ApiModelProperty(value = "角色类型", example = "")
private String roleType;
+
+ @ApiModelProperty("开始时间")
+ private String startTime;
+
+ @ApiModelProperty("结束时间")
+ private String endTime;
+
}
--
Gitblit v1.9.3