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