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 1/8] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E4=BF=A1=E6=81=AF?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
=?UTF-8?q?=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'
#排序规则：根据小区、楼栋、单元、门牌号(分别按照数字和中文)分别升序排序
From 1e332de4fcb88ad9bd25f530903dc8e63820eab4 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 31 May 2022 16:23:49 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E5=8D=95=E5=85=83?=
=?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tools/exception/EpmetErrorCode.java | 1 +
.../java/com/epmet/dao/IcBuildingUnitDao.java | 22 ++++++++++++++-
.../main/java/com/epmet/dao/IcHouseDao.java | 8 ++++++
.../service/impl/BuildingServiceImpl.java | 15 ++++++++++-
.../resources/mapper/IcBuildingUnitDao.xml | 27 ++++++++++---------
.../src/main/resources/mapper/IcHouseDao.xml | 7 +++++
6 files changed, 65 insertions(+), 15 deletions(-)
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index ed274b2c28..6a66e1ae71 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@@ -256,6 +256,7 @@ public enum EpmetErrorCode {
RESI_IC_NAT(8925,"已存在记录，请联系社区工作人员修改"),
IC_MOVE_IN(8926,"居民信息中房屋信息与当前选择房屋不一致，是否更新？"),
NOT_REGEIST_RESI(8927,"未注册居民"),
+ UNIT_EXIST_HOUSES_ERROR(8928,"单元下存在房屋，不可修改单元数"),
//通用错误码 start
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingUnitDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingUnitDao.java
index 69465df911..147f25f7d2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingUnitDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingUnitDao.java
@@ -20,6 +20,9 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.entity.IcBuildingUnitEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 楼栋单元信息
@@ -29,5 +32,22 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface IcBuildingUnitDao extends BaseDao {
-
+
+ /**
+ * Desc: 根据楼栋ID获取单元IDs
+ * @param buildingId
+ * @param size
+ * @author zxc
+ * @date 2022/5/31 15:46
+ */
+ List getUnitIdByBuildingId(@Param("buildingId")String buildingId,@Param("size")Integer size);
+
+ /**
+ * Desc: 删除单元
+ * @param ids
+ * @author zxc
+ * @date 2022/5/31 16:04
+ */
+ void delUnit(@Param("ids")List ids);
+
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
index e1cb4de562..d428631ad5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
@@ -102,4 +102,12 @@ public interface IcHouseDao extends BaseDao {
*/
HouseAgencyInfoResultDTO getHouseAgencyInfo(@Param("houseId") String houseId);
+ /**
+ * Desc: 获取单元下的房屋数
+ * @param unitIds
+ * @author zxc
+ * @date 2022/5/31 15:53
+ */
+ Integer getHouseCountByUnitIds(@Param("unitIds")List unitIds);
+
}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
index ceab6ed43d..c1863e5cd0 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
@@ -454,7 +454,20 @@ public class BuildingServiceImpl implements BuildingService {
Integer unit = icBuilding.getTotalUnitNum();
if (nowUnit < unit) {
//如果小于，判断是否存在房屋，如果存在就提示不能更改
- throw new EpmetException(EpmetErrorCode.ORG_EDIT_FAILED.getCode(), EpmetErrorCode.ORG_EDIT_FAILED.getMsg(), "暂不支持单元号减小");
+ /**
+ * 校验规则，单元号倒序，校验（原来的单元数 - 现在单元数）个单元下是不是存在房屋，存在房屋不能更新
+ * 2022-05-31修改逻辑，可以修改变小，先去校验,单元下存在房屋就报错，不存在，删除对应单元，更新楼栋单元数
+ */
+ Integer size = unit - nowUnit;
+ List ids = icBuildingUnitDao.getUnitIdByBuildingId(formDTO.getBuildingId(), size);
+ if (!CollectionUtils.isEmpty(ids)){
+ Integer houseCount = icHouseDao.getHouseCountByUnitIds(ids);
+ if (houseCount.compareTo(NumConstant.ZERO) != NumConstant.ZERO){
+ throw new EpmetException(EpmetErrorCode.UNIT_EXIST_HOUSES_ERROR.getCode());
+ }
+ icBuildingUnitDao.delUnit(ids);
+ }
+// throw new EpmetException(EpmetErrorCode.ORG_EDIT_FAILED.getCode(), EpmetErrorCode.ORG_EDIT_FAILED.getMsg(), "暂不支持单元号减小");
} else {
//新增单元
List units = icBuildingUnitService.getUnitOptions(icBuilding.getId());
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml
index 0ee38da368..09f334b42d 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml
@@ -3,19 +3,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ UPDATE ic_building_unit
+ SET DEL_FLAG = '1',
+ UPDATED_TIME = NOW()
+ WHERE ID IN (
+ #{id}
+ )
+
+
+
+
\ No newline at end of file
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 7df81d921a..a8222a88bb 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
@@ -380,4 +380,11 @@
WHERE h.ID = #{houseId}
+
+
+
From 085ba123726af2e4d91be6713c9d5b1087305dac Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 1 Jun 2022 10:16:45 +0800
Subject: [PATCH 3/8] emm
---
.../constant/ImportErrorMsgConstants.java | 1 +
.../model/ImportBuildingInfoListener.java | 2 +-
.../impl/IcNeighborHoodServiceImpl.java | 26 +++++++++++++++----
3 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java
index 0156f0e042..85f0d846f7 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java
@@ -9,6 +9,7 @@ public interface ImportErrorMsgConstants {
String EXIST_ERROR = "数据已存在";
String UNIT_ERROR = "暂不支持单元数减小";
+ String UNIT_EXIST_HOUSES_ERROR = "单元下存在房屋，不可修改单元数";
String DOCUMENT_EXIST_ERROR = "文件中存在重复数据";
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java
index 94de07dbbc..e567bf017d 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java
@@ -188,7 +188,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener page(Map params) {
@@ -598,7 +599,22 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl ids = icBuildingUnitDao.getUnitIdByBuildingId(building.getId(), size);
+ if (!org.springframework.util.CollectionUtils.isEmpty(ids)){
+ Integer houseCount = icHouseDao.getHouseCountByUnitIds(ids);
+ if (houseCount.compareTo(NumConstant.ZERO) != NumConstant.ZERO){
+ info.setBuildingUnitNumStatus(true);
+ }else {
+ icBuildingUnitDao.delUnit(ids);
+ icBuildingService.updateBuilding(info);
+ }
+ }
}else {
info.setBuildingId(building.getId());
icBuildingService.updateBuilding(info);
From 2e0263fa3514696a7327ca032d165c96f949c69e Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 1 Jun 2022 10:20:11 +0800
Subject: [PATCH 4/8] remark
---
.../main/java/com/epmet/dto/result/IcHouseListResultDTO.java | 2 ++
.../gov-org-server/src/main/resources/mapper/IcHouseDao.xml | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
index 4c1b40288f..03a3431b68 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
@@ -79,6 +79,8 @@ public class IcHouseListResultDTO implements Serializable {
*/
private String ownerIdCard;
+ private String remark;
+
private Double sort;
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 a8222a88bb..54a455eac0 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
@@ -112,7 +112,8 @@
ag.ORGANIZATION_NAME agencyName,
c.GRID_ID as gridId,
gr.GRID_NAME,
- IFNULL(a.sort,0) as sort
+ IFNULL(a.sort,0) as sort,
+ IFNULL(a.REMARK,'') AS remark
from ic_house a
LEFT JOIN ic_building b on a.BUILDING_ID = b.ID and b.DEL_FLAG = '0'
LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0'
From 19f6e548ef85afde388b8bb2c80fed91e2b9601c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 1 Jun 2022 10:20:45 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=EF=BC=9Aremark?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/com/epmet/dto/result/IcHouseListResultDTO.java | 2 +-
.../gov-org-server/src/main/resources/mapper/IcHouseDao.xml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
index 4c1b40288f..1bcb7e45e9 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
@@ -80,6 +80,6 @@ public class IcHouseListResultDTO implements Serializable {
private String ownerIdCard;
private Double sort;
-
+ private String remark;
}
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 a8222a88bb..a1a37d1bc0 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
@@ -112,7 +112,8 @@
ag.ORGANIZATION_NAME agencyName,
c.GRID_ID as gridId,
gr.GRID_NAME,
- IFNULL(a.sort,0) as sort
+ IFNULL(a.sort,0) as sort,
+ a.REMARK as remark
from ic_house a
LEFT JOIN ic_building b on a.BUILDING_ID = b.ID and b.DEL_FLAG = '0'
LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0'
From 4a9d85f6c68f2c94196448172ca841c6c3b229c4 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 1 Jun 2022 10:21:53 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E5=86=B2=E7=AA=81=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
index 966514bec9..069318849c 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
@@ -82,6 +82,5 @@ public class IcHouseListResultDTO implements Serializable {
private String remark;
private Double sort;
- private String remark;
}
From a3fd5d51c2704c235a7e93dd7844a89ee5c2dc96 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 1 Jun 2022 10:44:37 +0800
Subject: [PATCH 7/8] building
---
.../service/impl/IcNeighborHoodServiceImpl.java | 1 +
.../src/main/resources/mapper/IcBuildingDao.xml | 16 ++++++++++++----
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
index 7520503af6..c54ea3a436 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
@@ -604,6 +604,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl ids = icBuildingUnitDao.getUnitIdByBuildingId(building.getId(), size);
if (!org.springframework.util.CollectionUtils.isEmpty(ids)){
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
index 7e0d3bde18..92c486f24a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
@@ -48,10 +48,18 @@
SET TOTAL_UNIT_NUM = #{totalUnitNum},
TOTAL_FLOOR_NUM = #{totalFloorNum},
TOTAL_HOUSE_NUM = #{totalHouseNum},
- BUILDING_LEADER_NAME = #{buildingLeaderName},
- BUILDING_LEADER_MOBILE = #{buildingLeaderMobile},
- SORT = #{sort},
- TYPE = #{type},
+
+ BUILDING_LEADER_NAME = #{buildingLeaderName},
+
+
+ BUILDING_LEADER_MOBILE = #{buildingLeaderMobile},
+
+
+ SORT = #{sort},
+
+
+ TYPE = #{type},
+
UPDATED_TIME = NOW()
WHERE ID = #{buildingId}
From d16de7541eefe28e2efb38dd53915d0757f55d04 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 2 Jun 2022 09:12:00 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/mapper/IcHouseDao.xml | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
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 54a455eac0..e907804e12 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
@@ -122,6 +122,7 @@
LEFT JOIN customer_agency ag on ag.ID = c.AGENCY_ID and d.DEL_FLAG = '0'
1 = 1
+ and a.del_flag = '0'
and case c.AGENCY_PIDS when '' then CONCAT(c.AGENCY_ID) like CONCAT(#{pids}, '%')
else CONCAT(c.AGENCY_PIDS, ':', c.AGENCY_ID) like CONCAT(#{pids}, '%') end
@@ -171,13 +172,16 @@
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') >= #{updateStartDate} AND DATE_FORMAT(a.CREATED_TIME,'%Y%m%d') #{updateEndDate})
+ OR (DATE_FORMAT(a.UPDATED_TIME,'%Y%m%d') >= #{updateStartDate} AND DATE_FORMAT(a.UPDATED_TIME,'%Y%m%d') #{updateEndDate}))
-
- AND ((DATE_FORMAT(a.CREATED_TIME,'%Y%m%d')) #{updateEndDate} OR (DATE_FORMAT(a.UPDATED_TIME,'%Y%m%d')) #{updateEndDate})
+
+ AND (DATE_FORMAT(a.CREATED_TIME,'%Y%m%d') #{updateEndDate}) OR ((DATE_FORMAT(a.UPDATED_TIME,'%Y%m%d')) #{updateEndDate})
+
+
+ AND (DATE_FORMAT(a.CREATED_TIME,'%Y%m%d') =]]> #{updateStartDate}) OR ((DATE_FORMAT(a.UPDATED_TIME,'%Y%m%d')) =]]> #{updateStartDate})
- and a.del_flag = '0'
#排序规则：根据小区、楼栋、单元、门牌号(分别按照数字和中文)分别升序排序
ORDER BY