diff --git a/code/smart-community/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java b/code/smart-community/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java index d80fa318..e0018dfa 100644 --- a/code/smart-community/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java +++ b/code/smart-community/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java @@ -30,6 +30,7 @@ import com.epmet.dto.form.IcPartyMemberListFormDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; import com.epmet.dto.result.UploadImgResultDTO; +import com.epmet.dto.result.resi.ResiPortrayalResultDTO; import com.epmet.feign.*; import com.epmet.modules.partyOrg.dao.IcPartyOrgDao; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; @@ -407,9 +408,18 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl Integer.parseInt(item.getValue())).sum(); } + + /** + * 构造”其他“编码 + */ + DictListResultDTO otherDic = new DictListResultDTO(); + otherDic.setLabel("其他"); + otherDic.setValue(null); + dictResult.getData().add(otherDic); + Map finalMap = map; int finalTotal = total; - return dictResult.getData().stream().map(item -> { + List optionDataResultDTOS = dictResult.getData().stream().map(item -> { OptionDataResultDTO dto = new OptionDataResultDTO(); dto.setCode(item.getValue()); dto.setLabel(item.getLabel()); @@ -424,6 +434,8 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl AND (SSZB = #{orgId} OR ORG_PIDS LIKE CONCAT('%',#{orgId},'%'))