From bb0da98c51ecf970ab7610b1fd0916141271270e Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 25 Jul 2022 10:42:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/user/result/CustomerStaffDTO.java | 5 +++++
 .../java/com/epmet/dto/user/result/GridUserInfoDTO.java  | 5 ++++-
 .../com/epmet/service/impl/DataReportingServiceImpl.java | 1 +
 .../service/impl/GridstaffInfoPingyinServiceImpl.java    | 9 +++++----
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/CustomerStaffDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/CustomerStaffDTO.java
index a5458793dd..7328788cb6 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/CustomerStaffDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/CustomerStaffDTO.java
@@ -134,4 +134,9 @@ public class CustomerStaffDTO implements Serializable {
 	 */
 	private String roleName;
 
+	/**
+	 * 身份证号
+	 */
+	private String idCard;
+
 }
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/GridUserInfoDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/GridUserInfoDTO.java
index 0cec8927b6..71c7ded5b4 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/GridUserInfoDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/GridUserInfoDTO.java
@@ -84,7 +84,10 @@ public class GridUserInfoDTO implements Serializable {
      */
     private Date updateTime;
 
-
+    /**
+     * 身份证号
+     */
+    private String idCard;
 
 
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
index 6b75d8d8d7..f993b0d3c4 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
@@ -119,6 +119,7 @@ public class DataReportingServiceImpl implements DataReportingService {
 				st.setPhonenumber(dto.getMobile());
 				st.setSex(0 == dto.getGender() ? "9" : dto.getGender().toString());
 				st.setUpdateTime(dto.getUpdatedTime());
+				st.setIdCard(dto.getIdCard());
 			}
 		});
 
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java
index 6c58d2565a..a1a5df7991 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java
@@ -73,11 +73,13 @@ public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl<GridstaffIn
         if (!CollectionUtils.isEmpty(orgList.getData()) && !CollectionUtils.isEmpty(userList.getData())) {
             for (CustomerGridStaffListResultDTO gs : orgList.getData()) {
                 if (map.containsKey(gs.getGridUserId())) {
-                    GridstaffInfoPingyinEntity entity = ConvertUtils.sourceToTarget(map.get(gs.getGridUserId()), GridstaffInfoPingyinEntity.class);
+                    GridStaffUploadResultDTO us = map.get(gs.getGridUserId());
+                    GridstaffInfoPingyinEntity entity = ConvertUtils.sourceToTarget(us, GridstaffInfoPingyinEntity.class);
                     entity.setQxBm("370124");
                     entity.setQxMc("平阴县");
                     entity.setGridCode(gs.getGridCode());
                     entity.setGridName(gs.getGridName());
+                    entity.setSex("0".equals(us.getSex()) ? "9" : us.getSex());
                     entity.setIsLeave("N");
                     entityList.add(entity);
                 }
@@ -101,7 +103,7 @@ public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl<GridstaffIn
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void getStaffBaseInfo(StaffBaseInfoFormDTO formDTO) {
-        //1.查询网格基础信息
+        //1.查询工作人员网格信息和基础信息
         com.epmet.dto.user.form.StaffBaseInfoFormDTO formDTO1 = ConvertUtils.sourceToTarget(formDTO, com.epmet.dto.user.form.StaffBaseInfoFormDTO.class);
         Result<List<GridUserInfoDTO>> result = dataStatisticalOpenFeignClient.getStaffBaseInfo(formDTO1);
         if (!result.success()) {
@@ -115,9 +117,9 @@ public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl<GridstaffIn
             entity.setQxMc("平阴县");
             entity.setGridCode(r.getCode());
             entity.setGridName(r.getGridName());
-            entity.setUserType("01");
             entity.setIsLeave("N");
             entity.setGridUserId(r.getStaffId());
+            entity.setCardNum(r.getIdCard());
             if (!"staff_create".equals(formDTO.getType())) {
                 baseDao.edit(entity);
             }else {
@@ -125,7 +127,6 @@ public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl<GridstaffIn
             }
         });
 
-
     }