diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java index a6b52cfd48..37861ebcc4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java @@ -28,6 +28,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.CreatedTimeByUserIdFormDTO; import com.epmet.dto.result.CertifiedResultDTO; import com.epmet.dto.result.CreatedTimeByUserIdResultDTO; +import com.epmet.dto.result.GridInfoResultDTO; import com.epmet.dto.result.SelectGridNameByGridIdResultDTO; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.feign.GovOrgFeignClient; @@ -149,12 +150,19 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl(); } for (CertifiedResultDTO certifiedResultDTO : certifiedResultDTOS) { - certifiedResultDTO.setApplyTime(certifiedResultDTO.getApplyTime()*1000L); + certifiedResultDTO.setApplyTime(certifiedResultDTO.getApplyTime()); } Result> listResult = epmetUserFeignClient.selectUserHeadPhotoByUserId(certifiedResultDTOS); - Result gridName = govOrgFeignClient.selectGridNameByGridId(certifiedFormDTO); + Result gridInfoResult = govOrgFeignClient.queryGridInfo(certifiedFormDTO.getGridId()); + String gridFullPath = ""; + if (gridInfoResult.success() && null != gridInfoResult.getData()) { + gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName() == null?"":gridInfoResult.getData().getStreetName(), + gridInfoResult.getData().getCommnuityName() == null?"":gridInfoResult.getData().getCommnuityName(), + gridInfoResult.getData().getGridName() == null?"":gridInfoResult.getData().getGridName()); + gridFullPath = gridFullPath.replaceAll("--", "").trim(); + } for (CertifiedResultDTO datum : listResult.getData()) { - datum.setGridFullPath(gridName.getData().getGridName()); + datum.setGridFullPath(gridFullPath); } return listResult.getData(); } @@ -172,17 +180,22 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl registerTime = epmetUserFeignClient.createdTimeByUserId(time); certifiedDetail.setCertifyTime(registerTime.getData().getRegisterTime()); - CertifiedFormDTO certifiedFormDTO = new CertifiedFormDTO(); - certifiedFormDTO.setGridId(certifiedDetail.getGridId()); - //查询网格名称 - Result gridName = govOrgFeignClient.selectGridNameByGridId(certifiedFormDTO); - certifiedDetail.setGridFullPath(gridName.getData().getGridName()); + //查询gridFullName + Result gridInfoResult = govOrgFeignClient.queryGridInfo(certifiedDetail.getGridId()); + String gridFullPath = ""; + if (gridInfoResult.success() && null != gridInfoResult.getData()) { + gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName() == null?"":gridInfoResult.getData().getStreetName(), + gridInfoResult.getData().getCommnuityName() == null?"":gridInfoResult.getData().getCommnuityName(), + gridInfoResult.getData().getGridName() == null?"":gridInfoResult.getData().getGridName()); + gridFullPath = gridFullPath.replaceAll("--", "").trim(); + } + certifiedDetail.setGridFullPath(gridFullPath); return certifiedDetail; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml index bb97987577..2cbad32ae0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml @@ -60,7 +60,7 @@ SELECT pi.USER_ID AS userId, concat( pi.SURNAME, pi.NAME ) AS realName, - unix_timestamp(pi.CREATED_TIME)*1000 AS applyTime, + unix_timestamp(pi.CREATED_TIME) AS applyTime, pcm.READ_FLAG AS readFlag, pi.id as partyMemberId, pca.id as autoId, @@ -85,7 +85,7 @@ SELECT pi.USER_ID AS userId, concat( pi.SURNAME, pi.NAME ) AS realName, - unix_timestamp(pi.CREATED_TIME)*1000 AS applyTime, + unix_timestamp(pi.CREATED_TIME) AS applyTime, pi.CONFIRM_RESULT AS status, pi.id as partyMemberId, pca.id as autoId, @@ -102,7 +102,7 @@ SELECT pi.USER_ID AS userId, concat( pi.SURNAME, pi.NAME ) AS realName, - unix_timestamp(pi.CREATED_TIME)*1000 AS applyTime, + unix_timestamp(pi.CREATED_TIME) AS applyTime, pi.CONFIRM_RESULT AS status, pi.id as partyMemberId, pca.id as autoId,