diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/LingShanPartyUnitRstDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/LingShanPartyUnitRstDTO.java index 01115d45c7..5d619ae98b 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/LingShanPartyUnitRstDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/LingShanPartyUnitRstDTO.java @@ -9,7 +9,7 @@ import lombok.Data; */ @Data public class LingShanPartyUnitRstDTO { - + private String orgId; private String orgName; private String longitude; private String latitude; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java index a70be9590d..4c0dccc881 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java @@ -743,6 +743,7 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl> partyServiceCenterList( + public Result> partyServiceCenterList( @RequestParam(value = "objType", required = false) String objType, @RequestParam(value = "orgId", required = false) String orgId) { - List l = icPartyServiceCenterService.lingshanPartyServiceCenterList(objType, orgId); - return new Result>().ok(l); + List l = icPartyServiceCenterService.lingshanPartyServiceCenterList(objType, orgId); + return new Result>().ok(l); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPartyServiceCenterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPartyServiceCenterService.java index 96f8e57f14..66a67407bd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPartyServiceCenterService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPartyServiceCenterService.java @@ -191,5 +191,5 @@ public interface IcPartyServiceCenterService extends BaseService partyServiceCenterQtyStats(String orgId, String orgType); - List lingshanPartyServiceCenterList(String objType, String orgId); + List lingshanPartyServiceCenterList(String objType, String orgId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java index f0aa18203f..537543bbd8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java @@ -781,7 +781,7 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl lingshanPartyServiceCenterList(String objType, String orgId) { + public List lingshanPartyServiceCenterList(String objType, String orgId) { LambdaQueryWrapper q = new LambdaQueryWrapper<>();; if (objType.equals("party_service_center")) { // 党群服务中心 @@ -795,10 +795,11 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl es = icPartyServiceCenterDao.selectList(q); return es.stream().map(e -> { - LingShanPartyUnitRstDTO d = new LingShanPartyUnitRstDTO(); + LingShanScreenPartyObjectByTypeRstDTO d = new LingShanScreenPartyObjectByTypeRstDTO(); d.setLatitude(e.getLatitude()); d.setLongitude(e.getLongitude()); d.setOrgName(e.getCenterName()); + d.setOrgId(e.getOrgId()); return d; }).collect(Collectors.toList()); } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/LingShanScreenPartyObjectByTypeRstDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/LingShanScreenPartyObjectByTypeRstDTO.java index 079c96f13d..e88525a75e 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/LingShanScreenPartyObjectByTypeRstDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/LingShanScreenPartyObjectByTypeRstDTO.java @@ -1,6 +1,8 @@ package com.epmet.resi.partymember.dto.partyOrg.result; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; /** * @Description 灵山街道:按照党类型查询党相关对象 @@ -8,6 +10,8 @@ import lombok.Data; * @Time 2023/5/12 1:16 PM */ @Data +@NoArgsConstructor +@AllArgsConstructor public class LingShanScreenPartyObjectByTypeRstDTO { private String id; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/LingShanPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/LingShanPartyOrgServiceImpl.java index 88e1f53606..9cca135881 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/LingShanPartyOrgServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/LingShanPartyOrgServiceImpl.java @@ -143,7 +143,10 @@ public class LingShanPartyOrgServiceImpl implements LingShanPartyOrgService, Res // 党群服务中心 List rsts = getResultDataOrReturnNull(govOrgOpenFeignClient.lingshanPartyServiceCenterList(objType, orgId), ServiceConstant.GOV_ORG_SERVER); - return ConvertUtils.sourceToTarget(rsts, LingShanScreenPartyObjectByTypeRstDTO.class); + + return rsts.stream() + .map(e -> new LingShanScreenPartyObjectByTypeRstDTO(e.getOrgId(), e.getOrgName(), e.getLongitude(), e.getLatitude(), 0)) + .collect(Collectors.toList()); } else if (LingShanPartyObjEnums.PARTY_UNIT.getCode().equals(objType)) { // 联建单位 List rsts = getResultDataOrReturnNull(heartOpenFeignClient.lingshanPartyUnitList(orgId), ServiceConstant.EPMET_HEART_SERVER);