From d4599288a80a1774c2020187a119a0cd97fd64d0 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 25 Jul 2022 17:35:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/DataReportingServiceImpl.java  | 1 +
 .../opendata/service/impl/GridstaffInfoPingyinServiceImpl.java | 3 +++
 2 files changed, 4 insertions(+)

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 f993b0d3c4..bf042e7c91 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
@@ -120,6 +120,7 @@ public class DataReportingServiceImpl implements DataReportingService {
 				st.setSex(0 == dto.getGender() ? "9" : dto.getGender().toString());
 				st.setUpdateTime(dto.getUpdatedTime());
 				st.setIdCard(dto.getIdCard());
+				st.setStaffId(dto.getUserId());
 			}
 		});
 
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 a4a9909efa..95a48de722 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
@@ -1,5 +1,6 @@
 package com.epmet.opendata.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -103,6 +104,7 @@ public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl<GridstaffIn
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void getStaffBaseInfo(StaffBaseInfoFormDTO formDTO) {
+        log.info("网格工作人员信息同步,入参对象值:  " + JSON.toJSONString(formDTO, true));
         //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);
@@ -122,6 +124,7 @@ public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl<GridstaffIn
             entity.setCardNum(r.getIdCard());
             //按网格查询人员是否存在，存在更新否则新增
             GridstaffInfoPingyinEntity gs = baseDao.selectByCodeAndStaffId(r.getCode(), r.getStaffId());
+            log.info(String.format("网格工作人员信息同步，当前操作人员信息，姓名:%s   staffId:%s", entity.getNickName(), entity.getGridUserId()));
             if (null != gs) {
                 baseDao.edit(entity);
             } else {