diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java index 29c968ba90..8644aa81c2 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java @@ -22,6 +22,10 @@ public class IcPartyActListResultDTO implements Serializable { * 活动类型,0:支部党员大会;1:支部委员会;2:党小组会;3:党课;4:主题党日;5:为民服务活动; */ private String actType; + /** + * 活动类型,0:支部党员大会;1:支部委员会;2:党小组会;3:党课;4:主题党日;5:为民服务活动; + */ + private String actTypeName; /** * 活动时间 */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 5bd4ea3bc8..702ed4ff31 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -694,6 +694,11 @@ public class IcPartyActServiceImpl extends BaseServiceImpl list = baseDao.selectresiPartyActList(formDTO); + + //3.封装数据 + List dict = actTypeList(formDTO.getCustomerId()); + list.forEach(u -> dict.stream().filter(r -> u.getActType().equals(r.getValue())).forEach(d -> u.setActTypeName(d.getLabel()))); + PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); }