From 0049861d4e8f79cbb8f33a4b2640403022eda724 Mon Sep 17 00:00:00 2001
From: zxc <954985705@qq.com>
Date: Thu, 30 Apr 2020 17:06:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?gridFullPath=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PartymemberInfoServiceImpl.java      | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

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..bbb512211c 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;
@@ -152,9 +153,16 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
 			certifiedResultDTO.setApplyTime(certifiedResultDTO.getApplyTime()*1000L);
 		}
 		Result<List<CertifiedResultDTO>> listResult = epmetUserFeignClient.selectUserHeadPhotoByUserId(certifiedResultDTOS);
-		Result<SelectGridNameByGridIdResultDTO> gridName = govOrgFeignClient.selectGridNameByGridId(certifiedFormDTO);
+		Result<GridInfoResultDTO> 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();
 	}
@@ -178,11 +186,16 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
 		//查询用户注册时间
 		Result<CreatedTimeByUserIdResultDTO> registerTime = epmetUserFeignClient.createdTimeByUserId(time);
 		certifiedDetail.setCertifyTime(registerTime.getData().getRegisterTime());
-		CertifiedFormDTO certifiedFormDTO = new CertifiedFormDTO();
-		certifiedFormDTO.setGridId(certifiedDetail.getGridId());
-		//查询网格名称
-		Result<SelectGridNameByGridIdResultDTO> gridName = govOrgFeignClient.selectGridNameByGridId(certifiedFormDTO);
-		certifiedDetail.setGridFullPath(gridName.getData().getGridName());
+		//查询gridFullName
+		Result<GridInfoResultDTO> 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;
 	}
 

From 90f2bf02d4129f8e7f89163b8d3b53b1d17be921 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 30 Apr 2020 17:09:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?parymember=E6=97=B6=E9=97=B4=E6=88=B3?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=A7=92=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PartymemberInfoServiceImpl.java            | 4 ++--
 .../resources/mapper/partymember/PartymemberBaseInfoDao.xml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

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 bbb512211c..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
@@ -150,7 +150,7 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
 			return new ArrayList<>();
 		}
 		for (CertifiedResultDTO certifiedResultDTO : certifiedResultDTOS) {
-			certifiedResultDTO.setApplyTime(certifiedResultDTO.getApplyTime()*1000L);
+			certifiedResultDTO.setApplyTime(certifiedResultDTO.getApplyTime());
 		}
 		Result<List<CertifiedResultDTO>> listResult = epmetUserFeignClient.selectUserHeadPhotoByUserId(certifiedResultDTOS);
 		Result<GridInfoResultDTO> gridInfoResult = govOrgFeignClient.queryGridInfo(certifiedFormDTO.getGridId());
@@ -180,7 +180,7 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
 		if (certifiedDetail==null){
 			return new CertifiedDetailResultDTO();
 		}
-		certifiedDetail.setApplyTime(certifiedDetail.getApplyTime() * 1000L);//时间戳转换毫秒级
+		certifiedDetail.setApplyTime(certifiedDetail.getApplyTime());
 		CreatedTimeByUserIdFormDTO time = new CreatedTimeByUserIdFormDTO();
 		time.setUserId(certifiedDetail.getUserId());
 		//查询用户注册时间
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,