From 5fe1ea51fba01515133b870145be95ff6b7f9722 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 2 Nov 2021 16:26:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=8D=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcBuildingDao.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 3f9fc515cf..2b55aaaeb8 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 @@ -292,11 +292,12 @@ From 1be87cef4c657bf7970c53f9cb295a6ccb0be817 Mon Sep 17 00:00:00 2001 From: lzh Date: Tue, 2 Nov 2021 16:41:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=88=97=E8=A1=A8=20=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=8C=E6=A5=BC=E5=AE=87=E5=8D=95=E5=85=83=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/BuildingController.java | 2 +- .../src/main/resources/mapper/IcBuildingDao.xml | 4 ++-- .../src/main/resources/mapper/IcHouseDao.xml | 8 ++++---- .../src/main/resources/mapper/IcNeighborHoodDao.xml | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java index 2e65729cab..e576abec7c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java @@ -209,7 +209,7 @@ public class BuildingController { @PostMapping("buildingunitlist") public Result buildingunitlist(@LoginUser TokenDto tokenDTO,@RequestBody IcBulidingUnitFormDTO icBulidingUnitFormDTO ){ ValidatorUtils.validateEntity(icBulidingUnitFormDTO); - List icBuildingUnitEntityList = icBuildingUnitDao.selectList(new QueryWrapper().lambda().eq(IcBuildingUnitEntity::getBuildingId, icBulidingUnitFormDTO.getBuildingId())); + List icBuildingUnitEntityList = icBuildingUnitDao.selectList(new QueryWrapper().lambda().eq(IcBuildingUnitEntity::getBuildingId, icBulidingUnitFormDTO.getBuildingId()).orderByAsc(IcBuildingUnitEntity::getUnitNum)); List result = new ArrayList<>(); icBuildingUnitEntityList.forEach(item->{ JSONObject jsonObject = new JSONObject(); 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 2b55aaaeb8..3d110df7bd 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 @@ -122,10 +122,10 @@ AND a.ID in (select distinct BUILDING_ID from ic_house e - AND e.OWNER_NAME = #{house.ownerName} + AND e.OWNER_NAME like concat('%',#{house.ownerName},'%') - AND e.OWNER_PHONE = #{house.ownerPhone} + AND e.OWNER_PHONE like concat('%',#{house.ownerPhone},'%') and e.DEL_FLAG='0' 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 f287cd7370..22aea14603 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 @@ -134,10 +134,10 @@ AND a.BUILDING_ID = #{house.buildingId} - AND a.OWNER_NAME = #{house.ownerName} + AND a.OWNER_NAME like concat('%',#{house.ownerName},'%') - AND a.OWNER_PHONE = #{house.ownerPhone} + AND a.OWNER_PHONE like concat('%',#{house.ownerPhone},'%') AND a.DEL_FLAG = #{house.delFlag} @@ -167,10 +167,10 @@ AND a.BUILDING_ID = #{house.buildingId} - AND a.OWNER_NAME = #{house.ownerName} + AND a.OWNER_NAME like concat('%',#{house.ownerName},'%') - AND a.OWNER_PHONE = #{house.ownerPhone} + AND a.OWNER_PHONE like concat('%',#{house.ownerPhone},'%') AND a.DEL_FLAG = #{house.delFlag} diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml index 8c00a943d6..342b567ba7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml @@ -91,10 +91,10 @@ AND a.ID in (select NEIGHBOR_HOOD_ID from ic_house e - AND e.OWNER_NAME = #{house.ownerName} + AND e.OWNER_NAME like concat('%',#{house.ownerName},'%') - AND e.OWNER_PHONE = #{house.ownerPhone} + AND e.OWNER_PHONE like concat('%',#{house.ownerPhone},'%') and e.DEL_FLAG='0' @@ -134,10 +134,10 @@ AND a.ID in (select distinct NEIGHBOR_HOOD_ID from ic_house e - AND e.OWNER_NAME = #{house.ownerName} + AND e.OWNER_NAME like concat('%',#{house.ownerName},'%') - AND e.OWNER_PHONE = #{house.ownerPhone} + AND e.OWNER_PHONE like concat('%',#{house.ownerPhone},'%') and e.DEL_FLAG='0' From 4f3bcda0a60030e32b377780593694788231ce7c Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 2 Nov 2021 16:50:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcHouseServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index a1811351c2..0a6f7f50c4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -115,12 +115,12 @@ public class IcHouseServiceImpl extends BaseServiceImpl getHouseOption(HouseFormDTO formDTO) { - if (StringUtils.isBlank(formDTO.getUnitId())) { - log.error("单元ID为空"); + if (StringUtils.isBlank(formDTO.getBuildingId()) && StringUtils.isBlank(formDTO.getUnitId())) { + log.error("楼栋和单元ID为空"); return Collections.emptyList(); } LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - //wrapper.eq(StringUtils.isNotBlank(formDTO.getBuildingId()), IcHouseEntity::getBuildingId, formDTO.getBuildingId()); + wrapper.eq(StringUtils.isNotBlank(formDTO.getBuildingId()), IcHouseEntity::getBuildingId, formDTO.getBuildingId()); wrapper.eq(StringUtils.isNotBlank(formDTO.getUnitId()), IcHouseEntity::getBuildingUnitId, formDTO.getUnitId()); wrapper.last("ORDER BY CONVERT ( HOUSE_NAME USING gbk ) ASC"); List list = baseDao.selectList(wrapper);