diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java index 8d0e09b..4938dfb 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; @@ -21,6 +22,7 @@ import com.epmet.plugin.power.dto.axis.form.PowerKernelHouseHoldViewListFormDTO; import com.epmet.plugin.power.dto.axis.form.PowerKernelListPostitionFormDTO; import com.epmet.plugin.power.dto.axis.result.PowerKernelHouseHoldViewListResultDTO; import com.epmet.plugin.power.dto.axis.result.PowerKernelListPostitionResultDTO; +import com.epmet.plugin.power.dto.axis.result.PowerkernelMemberListResultDTO; import com.epmet.plugin.power.modules.axis.dao.PowerKernelHouseholdDao; import com.epmet.plugin.power.modules.axis.entity.PowerKernelHouseholdEntity; import com.epmet.plugin.power.modules.axis.service.PowerKernelHouseholdService; @@ -32,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.*; +import java.util.stream.Collectors; /** * 动力主轴党员中心户 @@ -59,6 +62,10 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl list = baseDao.getPage(params); + for (PowerKernelHouseholdDTO dto : list) { + List nameList = dto.getKernelMemberList().stream().map(PowerkernelMemberListResultDTO::getKernelMemberName).distinct().collect(Collectors.toList()); + dto.setKernelMemberNameConcat(StringUtils.join(nameList, StrConstant.COMMA)); + } return getPageData(list, page.getTotal(), PowerKernelHouseholdDTO.class); @@ -118,8 +125,12 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl getList(PowerKernelHouseHoldViewListFormDTO form) { form.setPageNo((form.getPageNo() - 1) * form.getPageSize()); form.setCustomerId(loginUserUtil.getLoginUserCustomerId()); - List dto = baseDao.getList(form); - return dto; + List list = baseDao.getList(form); + for (PowerKernelHouseHoldViewListResultDTO dto : list) { + List nameList = dto.getKernelMemberList().stream().map(PowerkernelMemberListResultDTO::getKernelMemberName).distinct().collect(Collectors.toList()); + dto.setKernelMemberNameConcat(StringUtils.join(nameList, StrConstant.COMMA)); + } + return list; } @Override diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml index 8a79a2a..9efc8c9 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml @@ -55,7 +55,6 @@ - @@ -68,8 +67,7 @@ k.HOUSE_ID, k.ADDRESS, m.KERNEL_MEMBER_ID, - m.KERNEL_MEMBER_NAME, - concat_ws( ',', m.KERNEL_MEMBER_NAME ) AS kernelMemberNameConcat + m.KERNEL_MEMBER_NAME FROM pli_power_kernel_household k LEFT JOIN pli_power_axis_struct s ON s.id = k.STRUCT_REFERENCE_ID @@ -137,7 +135,6 @@ - @@ -155,7 +152,6 @@ h.LATITUDE, m.KERNEL_MEMBER_ID, m.KERNEL_MEMBER_NAME, - CONCAT_WS( ',', KERNEL_MEMBER_NAME ) AS kernelMemberNameConcat, h.HOUSE_ID, h.ADDRESS FROM