From 041efbcbf6f8d333d924461e9fbdf2114b7b31be Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 29 Jul 2022 10:52:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=8F=82=E6=95=B0=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/user/result/GridUserInfoDTO.java     | 10 ++++++++++
 .../epmet/service/impl/DataReportingServiceImpl.java   |  4 ++++
 .../service/impl/GridstaffInfoPingyinServiceImpl.java  |  8 ++++++--
 .../com/epmet/dto/result/GridStaffUploadResultDTO.java | 10 ++++++++++
 .../src/main/resources/mapper/CustomerStaffDao.xml     |  4 +++-
 5 files changed, 33 insertions(+), 3 deletions(-)

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 71c7ded5b4..ce1a1c71ee 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
@@ -89,5 +89,15 @@ public class GridUserInfoDTO implements Serializable {
      */
     private String idCard;
 
+    /**
+     * 是否离职，格式为Y：是、N：否
+     */
+    private String isLeave;
+
+    /**
+     * 离职时间，格式为“YYYY-MM-DD”
+     */
+    private Date leaveDate;
+
 
 }
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 a7cceb6fa2..ff71165a8a 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
@@ -124,6 +124,10 @@ public class DataReportingServiceImpl implements DataReportingService {
 				st.setUpdateTime(dto.getUpdatedTime());
 				st.setIdCard(dto.getIdCard());
 				st.setStaffId(dto.getUserId());
+				st.setIsLeave("fulltime".equals(dto.getWorkType()) ? "N" : "Y");
+				if ("Y".equals(st.getIsLeave())) {
+					st.setLeaveDate(DateUtils.integrate(dto.getUpdatedTime(), DateUtils.DATE_PATTERN));
+				}
 			}
 		});
 
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 fc42fd2dda..3f7fffb0ec 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
@@ -4,6 +4,7 @@ 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;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.CustomerGridStaffListFormDTO;
 import com.epmet.dto.form.GridStaffUploadtFormDTO;
@@ -82,7 +83,9 @@ public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl<GridstaffIn
                     entity.setGridCode(gs.getGridCode());
                     entity.setGridName(gs.getGridName());
                     entity.setSex("0".equals(us.getSex()) ? "9" : us.getSex());
-                    entity.setIsLeave("N");
+                    if ("Y".equals(entity.getIsLeave())) {
+                        entity.setLeaveDate(us.getDate());
+                    }
                     entityList.add(entity);
                 }
             }
@@ -123,7 +126,8 @@ public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl<GridstaffIn
             entity.setQxMc("平阴县");
             entity.setGridCode(r.getCode());
             entity.setGridName(r.getGridName());
-            entity.setIsLeave("N");
+            entity.setIsLeave(r.getIsLeave());
+            entity.setLeaveDate(r.getLeaveDate());
             entity.setGridUserId(r.getStaffId());
             entity.setCardNum(r.getIdCard());
             //按网格查询人员是否存在，存在更新否则新增
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridStaffUploadResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridStaffUploadResultDTO.java
index 16d0d386f5..35e485df82 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridStaffUploadResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridStaffUploadResultDTO.java
@@ -45,4 +45,14 @@ public class GridStaffUploadResultDTO {
      */
     private Date updateTime;
 
+    /**
+     * 是否离职，格式为Y：是、N：否
+     */
+    private String isLeave;
+
+    /**
+     * 离职时间，格式为“YYYY-MM-DD”
+     */
+    private Date date;
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
index e5d2289e5b..31a3198808 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
@@ -464,7 +464,9 @@
             gender sex,
             mobile phonenumber,
             IF(work_type = 'fulltime', '01', '02') userType,
-            updated_time updateTime
+            updated_time updateTime,
+            IF(work_type = 'fulltime', 'N', 'Y') isLeave,
+            DATE_FORMAT(updated_time,'%Y-%m-%d') AS date
         FROM
             customer_staff
         WHERE