Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master

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;

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<IcPartyUnitDao, IcPa
             d.setLatitude(e.getLatitude());
             d.setLongitude(e.getLongitude());
             d.setOrgName(e.getUnitName());
+            d.setOrgId(e.getId());
             return d;
         }).collect(Collectors.toList());
     }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/LingShanScreenPartyObjectByTypeRstDTO.java

@@ -5,6 +5,7 @@ import lombok.Data;
 @Data
 public class LingShanScreenPartyObjectByTypeRstDTO {
 
+    private String orgId;
     private String orgName;
     private String longitude;
     private String latitude;

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java

@@ -270,12 +270,12 @@ public class IcPartyServiceCenterController {
      * @Date: 2023/5/12 2:14 PM
      */
     @GetMapping("/lingshan/partyServiceCenterList")
-    public Result<List<LingShanPartyUnitRstDTO>> partyServiceCenterList(
+    public Result<List<LingShanScreenPartyObjectByTypeRstDTO>> partyServiceCenterList(
                                                                 @RequestParam(value = "objType", required = false) String objType,
                                                                 @RequestParam(value = "orgId", required = false) String orgId) {
 
-        List<LingShanPartyUnitRstDTO> l = icPartyServiceCenterService.lingshanPartyServiceCenterList(objType, orgId);
-        return new Result<List<LingShanPartyUnitRstDTO>>().ok(l);
+        List<LingShanScreenPartyObjectByTypeRstDTO> l = icPartyServiceCenterService.lingshanPartyServiceCenterList(objType, orgId);
+        return new Result<List<LingShanScreenPartyObjectByTypeRstDTO>>().ok(l);
     }
 
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPartyServiceCenterService.java

@@ -191,5 +191,5 @@ public interface IcPartyServiceCenterService extends BaseService<IcPartyServiceC
 
     List<LingShanPartyServiceCenterQtyRstDTO> partyServiceCenterQtyStats(String orgId, String orgType);
 
-    List<LingShanPartyUnitRstDTO> lingshanPartyServiceCenterList(String objType, String orgId);
+    List<LingShanScreenPartyObjectByTypeRstDTO> lingshanPartyServiceCenterList(String objType, String orgId);
 }

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<IcPartyServ
     }
 
     @Override
-    public List<LingShanPartyUnitRstDTO> lingshanPartyServiceCenterList(String objType, String orgId) {
+    public List<LingShanScreenPartyObjectByTypeRstDTO> lingshanPartyServiceCenterList(String objType, String orgId) {
         LambdaQueryWrapper<IcPartyServiceCenterEntity> q = new LambdaQueryWrapper<>();;
         if (objType.equals("party_service_center")) {
             // 党群服务中心
@@ -795,10 +795,11 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
 
         List<IcPartyServiceCenterEntity> 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());
     }

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;

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<com.epmet.dto.result.LingShanScreenPartyObjectByTypeRstDTO> 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<LingShanPartyUnitRstDTO> rsts = getResultDataOrReturnNull(heartOpenFeignClient.lingshanPartyUnitList(orgId), ServiceConstant.EPMET_HEART_SERVER);