Merge remote-tracking branch 'remotes/origin/dev_pingyin_7_22' into pingyin_master

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;
+
 
 }

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));
+				}
 			}
 		});
 

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java

@@ -5,6 +5,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.constant.DataSourceConstant;
 import com.epmet.dto.form.CustomerGridStaffListFormDTO;
@@ -85,7 +86,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);
                 }
             }
@@ -126,7 +129,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());
             //按网格查询人员是否存在，存在更新否则新增

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;
+
 }

epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml

@@ -484,7 +484,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