删除staff_login_history，改为staff_agency_history

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffLoginHistoryDTO.java → epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffAgencyHistoryDTO.java

@@ -24,13 +24,13 @@ import java.util.Date;
 
 
 /**
- * 工作人员登录日志表
+ * 工作人员登录组织日志表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-04-20
  */
 @Data
-public class StaffLoginHistoryDTO implements Serializable {
+public class StaffAgencyHistoryDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -64,11 +64,6 @@ public class StaffLoginHistoryDTO implements Serializable {
      */
 	private String orgId;
 
-    /**
-     * 网格表Id (CUSTOMER_GRID.id)
-     */
-	private String gridId;
-
     /**
      * 删除标识：0.未删除 1.已删除
      */

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffLoginHistoryEntity.java → epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffAgencyHistoryEntity.java

@@ -18,20 +18,23 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
- * 工作人员登录日志表
+ * 工作人员登录组织日志表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-04-20
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("staff_login_history")
-public class StaffLoginHistoryEntity extends BaseEpmetEntity {
+@TableName("staff_agency_history")
+public class StaffAgencyHistoryEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 
@@ -60,9 +63,4 @@ public class StaffLoginHistoryEntity extends BaseEpmetEntity {
      */
 	private String orgId;
 
-    /**
-     * 网格表Id (CUSTOMER_GRID.id)
-     */
-	private String gridId;
-
 }

epmet-user/epmet-user-server/src/main/resources/mapper/StaffLoginHistoryDao.xml → epmet-user/epmet-user-server/src/main/resources/mapper/StaffAgencyHistoryDao.xml

@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.StaffLoginHistoryDao">
+<mapper namespace="com.epmet.dao.StaffAgencyHistoryDao">
 
-    <resultMap type="com.epmet.entity.StaffLoginHistoryEntity" id="staffLoginHistoryMap">
+    <resultMap type="com.epmet.entity.StaffAgencyHistoryEntity" id="staffAgencyHistoryMap">
         <result property="id" column="ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="staffId" column="STAFF_ID"/>
         <result property="wxOpenId" column="WX_OPEN_ID"/>
         <result property="mobile" column="MOBILE"/>
         <result property="orgId" column="ORG_ID"/>
-        <result property="gridId" column="GRID_ID"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>
         <result property="createdBy" column="CREATED_BY"/>
@@ -18,23 +17,22 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+
     <!--   获取当前微信上次登录的账号信息  -->
-    <select id="selectLatestStaffWechatLoginRecord" parameterType="java.lang.String"  resultType="com.epmet.dto.result.LatestStaffWechatLoginResultDTO">
+    <select id="selectLatestStaffWechatLoginRecord" parameterType="java.lang.String"  resultType="com.epmet.dto.result.StaffLatestAgencyResultDTO">
         SELECT
-            slh.CUSTOMER_ID,
-            slh.STAFF_ID,
-            slh.WX_OPEN_ID,
-            slh.MOBILE,
-            slh.ORG_ID,
-            slh.GRID_ID
+            sah.CUSTOMER_ID,
+            sah.STAFF_ID,
+            sah.WX_OPEN_ID,
+            sah.MOBILE,
+            sah.ORG_ID
         FROM
-            staff_login_history slh
+            staff_agency_history sah
         WHERE
-            slh.DEL_FLAG = '0'
-            AND slh.WX_OPEN_ID =#{openId}
+            sah.DEL_FLAG = '0'
+            AND sah.WX_OPEN_ID =#{openId}
         ORDER BY
-            slh.CREATED_TIME DESC
+            sah.CREATED_TIME DESC
             LIMIT 1
     </select>
-
 </mapper>