From cc6333cc4604c391f1893421f2065b9b9c662733 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 31 May 2022 15:31:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E4=BF=A1=E6=81=AF=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E6=96=B0=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/epmet/dto/form/IcHouseListFormDTO.java | 10 ++++++++++
.../src/main/resources/mapper/IcHouseDao.xml | 6 ++++++
2 files changed, 16 insertions(+)
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java
index cec2d19994..8697f4b375 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java
@@ -79,4 +79,14 @@ public class IcHouseListFormDTO extends PageFormDTO {
* 备注
*/
private String remark;
+
+ /**
+ * 开始日期 eg:20220505
+ */
+ private String updateStartDate;
+
+ /**
+ * 结束日期 eg:20220505
+ */
+ private String updateEndDate;
}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index 5fe411e6ee..7df81d921a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -170,6 +170,12 @@
AND a.REMARK like CONCAT('%',#{remark},'%')
+
+ AND ((DATE_FORMAT(a.CREATED_TIME,'%Y%m%d')) >= #{updateStartDate} OR (DATE_FORMAT(a.UPDATED_TIME,'%Y%m%d')) >= #{updateStartDate})
+
+
+ AND ((DATE_FORMAT(a.CREATED_TIME,'%Y%m%d')) #{updateEndDate} OR (DATE_FORMAT(a.UPDATED_TIME,'%Y%m%d')) #{updateEndDate})
+
and a.del_flag = '0'
#排序规则:根据小区、楼栋、单元、门牌号(分别按照数字和中文)分别升序排序