From 5254a4acb939525e4b35f6effa396b7dacc556c0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 28 Oct 2021 14:45:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?houseType:=E6=88=BF=E5=B1=8B=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=EF=BC=8C1=E6=A5=BC=E6=88=BF=EF=BC=8C2=E5=B9=B3?= =?UTF-8?q?=E6=88=BF=EF=BC=8C3=E5=88=AB=E5=A2=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dataaggre/dto/govorg/result/HouseInfoDTO.java | 2 +- .../dataaggre/service/epmetuser/impl/IcResiUserServiceImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/HouseInfoDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/HouseInfoDTO.java index 4855629190..fc98843047 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/HouseInfoDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/HouseInfoDTO.java @@ -54,7 +54,7 @@ public class HouseInfoDTO implements Serializable { private String doorName; /** - * 房屋类型，这里存储字典value就可以 + * 房屋类型，1楼房，2平房，3别墅 */ private String houseType; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiUserServiceImpl.java index 93b728957c..993598f4ef 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiUserServiceImpl.java @@ -102,6 +102,7 @@ public class IcResiUserServiceImpl implements IcResiUserService { resultDTO.setVallageName(houseInfoMap.get(resultDTO.getHomeId()).getNeighborHoodName()); resultDTO.setUnitName(houseInfoMap.get(resultDTO.getHomeId()).getUnitName()); resultDTO.setHomeName(houseInfoMap.get(resultDTO.getHomeId()).getDoorName()); + resultDTO.setHouseType(houseInfoMap.get(resultDTO.getHomeId()).getHouseType()); } } pageInfo.setList(list); From 552d384c2d31729ba807a847d6b57c3e21253126 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 28 Oct 2021 14:48:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/epmetuser/result/IcResiUserPageResultDTO.java | 5 +++-- .../src/main/resources/mapper/epmetuser/IcResiUserDao.xml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserPageResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserPageResultDTO.java index 3c8774abf9..e737bcec54 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserPageResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserPageResultDTO.java @@ -3,7 +3,6 @@ package com.epmet.dataaggre.dto.epmetuser.result; import lombok.Data; import java.io.Serializable; -import java.util.List; /** * @Description 居民信息分页查询表单返参 @@ -160,7 +159,9 @@ public class IcResiUserPageResultDTO implements Serializable { */ private Boolean isSpecial; - private List demandCategoryIds; + + // 以下属性都需要单独处理，不是直接取数据库的字段 + private String demandCategoryIds; private String demandName; diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml index f951feaacc..0069d6864f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml @@ -32,8 +32,8 @@ ${column.columnName} , - GROUP_CONCAT(ic_resi_demand.CATEGORY_CODE), - GROUP_CONCAT(ic_resi_demand_dict.CATEGORY_NAME) + GROUP_CONCAT(ic_resi_demand.CATEGORY_CODE) as demandCategoryIds, + GROUP_CONCAT(ic_resi_demand_dict.CATEGORY_NAME) as demandName FROM ic_resi_user From 7cd30f318cedf941061e47bc2d1363cdac82c901 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 28 Oct 2021 15:37:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?childGroup=E5=A4=96=E5=B1=82=E7=9A=84table?= =?UTF-8?q?=5Fname=E4=B8=8E=E7=BB=84=E4=BB=B6=E9=87=8C=E7=9A=84table=5Fnam?= =?UTF-8?q?e=E8=A6=81=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcFormDao.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml index 67f137634a..7215f7e5ce 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml @@ -159,7 +159,7 @@