磁贴日志增加员工编号和域账号

suishenbang-admin/src/main/resources/templates/system/magnetLog/magnetLog.html

@@ -18,6 +18,14 @@
                                 <p>访问者名称：</p>
                                 <input type="text" name="userName"/>
                             </li>
+                            <li>
+                                <p>域账号：</p>
+                                <input type="text" name="loginName"/>
+                            </li>
+                            <li>
+                                <p>员工编号：</p>
+                                <input type="text" name="sapEmployeeId"/>
+                            </li>
                             <li>
                                 <p>组织code：</p>
                                 <input type="text" name="orgCode"/>
@@ -98,6 +106,14 @@
                     field : 'userName', 
                     title : '访问者名称'
                 },
+                {
+                    field : 'loginName',
+                    title : '域账号'
+                },
+                {
+                    field : 'sapEmployeeId',
+                    title : '员工编号'
+                },
                 {
                     field : 'orgCode', 
                     title : '组织code'

suishenbang-system/src/main/java/com/dgtly/system/domain/SysMagnetLog.java

@@ -29,6 +29,14 @@ public class SysMagnetLog extends BaseEntity
     @Excel(name = "访问者名称")
     private String userName;
 
+    /** 域账号 */
+    @Excel(name = "域账号")
+    private String loginName;
+
+    /** 员工编号 */
+    @Excel(name = "员工编号")
+    private String sapEmployeeId;
+
     /** 组织code */
     @Excel(name = "组织code")
     private String orgCode;
@@ -90,7 +98,23 @@ public class SysMagnetLog extends BaseEntity
         this.orgName = orgName;
     }
 
-    public String getOrgName() 
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
+    public String getSapEmployeeId() {
+        return sapEmployeeId;
+    }
+
+    public void setSapEmployeeId(String sapEmployeeId) {
+        this.sapEmployeeId = sapEmployeeId;
+    }
+
+    public String getOrgName()
     {
         return orgName;
     }

suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysMagnetLogServiceImpl.java

@@ -2,6 +2,8 @@ package com.dgtly.system.service.impl;
 
 import java.util.List;
 import com.dgtly.common.utils.DateUtils;
+import com.dgtly.system.domain.SysUser;
+import com.dgtly.system.mapper.SysUserMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.dgtly.system.mapper.SysMagnetLogMapper;
@@ -20,6 +22,9 @@ public class SysMagnetLogServiceImpl implements ISysMagnetLogService
 {
     @Autowired
     private SysMagnetLogMapper sysMagnetLogMapper;
+    @Autowired
+    private SysUserMapper userMapper;
+
 
     /**
      * 查询磁铁日志
@@ -54,6 +59,9 @@ public class SysMagnetLogServiceImpl implements ISysMagnetLogService
     @Override
     public int insertSysMagnetLog(SysMagnetLog sysMagnetLog)
     {
+        SysUser user =userMapper.selectUserById(sysMagnetLog.getUserId());
+        sysMagnetLog.setLoginName(user.getLoginName());
+        sysMagnetLog.setSapEmployeeId(user.getSysUserExt().getSapEmployeeId());
         sysMagnetLog.setCreateTime(DateUtils.getNowDate());
         return sysMagnetLogMapper.insertSysMagnetLog(sysMagnetLog);
     }

suishenbang-system/src/main/resources/mapper/system/SysMagnetLogMapper.xml

@@ -16,18 +16,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="loginName"    column="login_name"    />
+        <result property="sapEmployeeId"    column="sap_employee_id"    />
     </resultMap>
 
     <sql id="selectSysMagnetLogVo">
-        select id, user_id, user_name, org_code, org_name, level, magnet_name, create_by, create_time, update_by, update_time from sys_magnet_log
+        select id, user_id, user_name, login_name,sap_employee_id,org_code, org_name, level, magnet_name, create_by, create_time, update_by, update_time from sys_magnet_log
     </sql>
 
     <select id="selectSysMagnetLogList" parameterType="SysMagnetLog" resultMap="SysMagnetLogResult">
-        select a.id, a.user_id, a.user_name, b.org_code, b.org_name, b.sales_level level, a.magnet_name, a.create_by, a.create_time, a.update_by, a.update_time
+        select a.id, a.user_id, a.user_name,a.login_name,a.sap_employee_id, b.org_code, b.org_name, b.sales_level level, a.magnet_name, a.create_by, a.create_time, a.update_by, a.update_time
         from sys_magnet_log a left join sys_user_ext b on a.user_id=b.user_id
         <where>
             <if test="userId != null "> and a.user_id = #{userId}</if>
             <if test="userName != null  and userName != ''"> and a.user_name like concat('%', #{userName}, '%')</if>
+            <if test="loginName != null  and loginName != ''"> and a.login_name like concat('%', #{loginName}, '%')</if>
+            <if test="sapEmployeeId != null  and sapEmployeeId != ''"> and a.sap_employee_id like concat('%', #{sapEmployeeId}, '%')</if>
             <if test="orgCode != null  and orgCode != ''"> and b.org_code = #{orgCode}</if>
             <if test="orgName != null  and orgName != ''"> and b.org_name like concat('%', #{orgName}, '%')</if>
             <if test="level != null  and level != ''"> and b.sales_level = #{level}</if>
@@ -52,6 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="userId != null ">user_id,</if>
             <if test="userName != null  and userName != ''">user_name,</if>
+            <if test="loginName != null  and loginName != ''">login_name,</if>
+            <if test="sapEmployeeId != null  and sapEmployeeId != ''">sap_employee_id,</if>
             <if test="orgCode != null  and orgCode != ''">org_code,</if>
             <if test="orgName != null  and orgName != ''">org_name,</if>
             <if test="level != null  and level != ''">level,</if>
@@ -63,6 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null ">#{userId},</if>
+            <if test="loginName != null  and loginName != ''"> #{loginName},</if>
+            <if test="sapEmployeeId != null  and sapEmployeeId != ''"> #{sapEmployeeId},</if>
             <if test="userName != null  and userName != ''">#{userName},</if>
             <if test="orgCode != null  and orgCode != ''">#{orgCode},</if>
             <if test="orgName != null  and orgName != ''">#{orgName},</if>
@@ -79,6 +87,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update sys_magnet_log
         <trim prefix="SET" suffixOverrides=",">
             <if test="userId != null ">user_id = #{userId},</if>
+            <if test="loginName != null  and loginName != ''">login_name = #{loginName},</if>
+            <if test="sapEmployeeId != null  and sapEmployeeId != ''"> sap_employee_id = #{sapEmployeeId},</if>
             <if test="userName != null  and userName != ''">user_name = #{userName},</if>
             <if test="orgCode != null  and orgCode != ''">org_code = #{orgCode},</if>
             <if test="orgName != null  and orgName != ''">org_name = #{orgName},</if>