添加员工登录用户名与密码

attendance-performance-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java

@@ -90,12 +90,9 @@ public class AuthTokenServiceImpl implements IAuthTokenService {
                 Claims claims = parseToken(token);
                 String uuid = (String) claims.get(SysConstains.LOGIN_USER_KEY);
                 String userKey = getTokenKey(uuid);
-//                Rest<String> rest = userFeign.getToken(userKey);
-//                String userStr = rest.getData();
-                cacheService.select(portalDb);
-                 String userStr = cacheService.get(userKey);
-
-                cacheService.select(db);
+                //cacheService.select(portalDb);
+                String userStr = cacheService.get(userKey);
+                //cacheService.select(db);
                 if (StringUtils.isNotEmpty(userStr)) {
                     UserEntity userEntity = JSONObject.parseObject(userStr, UserEntity.class);
                     userEntity.setToken(token);

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/BaseReq.java

+package com.mortals.xhx.busiz;
+
+
+import com.mortals.xhx.common.code.CommentTypeEnum;
+import com.mortals.xhx.common.code.ProcessStatusEnum;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public abstract class BaseReq implements Serializable {
+
+
+    /**
+     * 当前页
+     */
+    private Integer page;
+    /**
+     * 每页条数
+     */
+    private Integer size;
+
+
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/AppealReq.java

+package com.mortals.xhx.busiz.req;
+
+import com.mortals.xhx.busiz.BaseReq;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+@Data
+public class AppealReq extends BaseReq {
+
+    //绩效开始时间
+    private String performStartDate;
+    //绩效结束时间
+    private String performEndDate;
+
+    //绩效类型
+    private String performType;
+
+    /**
+     * 当前员工id
+     */
+    private Long staffId;
+
+    private Long Id;
+
+
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/PerformReq.java

+package com.mortals.xhx.busiz.req;
+
+import com.mortals.xhx.busiz.BaseReq;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class PerformReq extends BaseReq {
+
+    //绩效开始时间
+    private String performStartDate;
+    //绩效结束时间
+    private String performEndDate;
+
+    //绩效类型
+    private String performType;
+
+    private Long id;
+
+
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/PerformDetailInfo.java

+package com.mortals.xhx.busiz.rsp;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class PerformDetailInfo {
+    
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
+     */
+    private Integer subMethod;
+    /**
+     * 扣分时间
+     */
+    private Date errorTime;
+    /**
+     * 绩效规则id
+     */
+    private Long ruleId;
+    /**
+     * 规则名称
+     */
+    private String ruleName;
+    /**
+     * 增减类型(1.增加,2.扣除)
+     */
+    private Integer subAddType;
+    /**
+     * 扣分或增加分值
+     */
+    private BigDecimal score;
+
+
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/PerformInfo.java

+package com.mortals.xhx.busiz.rsp;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class PerformInfo {
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)
+     */
+    private Integer subMethod;
+    /**
+     * 扣分时间
+     */
+    private Date errorTime;
+    /**
+     * 绩效规则id
+     */
+    private Long ruleId;
+    /**
+     * 规则名称
+     */
+    private String ruleName;
+    /**
+     * 增减类型(1.增加,2.扣除)
+     */
+    private Integer subAddType;
+    /**
+     * 扣分或增加分值
+     */
+    private BigDecimal score;
+
+
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/PerformStatInfo.java

+package com.mortals.xhx.busiz.rsp;
+
+import lombok.Data;
+
+@Data
+public class PerformStatInfo {
+
+
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/AppealApiController.java

+package com.mortals.xhx.busiz.web;
+
+
+import cn.hutool.core.date.DateUtil;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.web.BaseJsonBodyController;
+import com.mortals.xhx.busiz.req.AppealReq;
+import com.mortals.xhx.busiz.req.PerformReq;
+import com.mortals.xhx.busiz.rsp.PerformDetailInfo;
+import com.mortals.xhx.busiz.rsp.PerformInfo;
+import com.mortals.xhx.busiz.rsp.PerformStatInfo;
+import com.mortals.xhx.common.code.PerformTypeEnum;
+import com.mortals.xhx.module.check.service.*;
+import com.mortals.xhx.module.perform.model.PerformAttendAppealEntity;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * h5 申诉
+ *
+ * @author: zxfei
+ * @date: 2023/7/7 15:08
+ */
+@RestController
+@Slf4j
+@RequestMapping("/api/v1/")
+public class AppealApiController extends BaseJsonBodyController {
+
+    @Autowired
+    private CheckAttendRecordService checkAttendRecordService;
+    @Autowired
+    private CheckReviewRecordService checkReviewRecordService;
+    @Autowired
+    private CheckComplainRecordService checkComplainRecordService;
+    @Autowired
+    private CheckEffectRecordService checkEffectRecordService;
+    @Autowired
+    private CheckGoworkRecordService checkGoworkRecordService;
+    @Autowired
+    private CheckOtherRecordService checkOtherRecordService;
+
+
+    /**
+     * 申诉列表
+     */
+    @PostMapping(value = "appeal/list")
+    public Rest<List<PerformAttendAppealEntity>> performList(@RequestBody AppealReq appealReq) {
+        String busiDesc = "个人申诉列表";
+        Rest<List<PerformAttendAppealEntity>> rest = Rest.ok(busiDesc + " 【成功】");
+        try {
+            if (ObjectUtils.isEmpty(appealReq.getPerformStartDate())) {
+                //未设置时间的情况，默认为当月
+                appealReq.setPerformStartDate(DateUtil.beginOfMonth(new Date()).toDateStr());
+                appealReq.setPerformEndDate(DateUtil.today());
+            }
+
+            recordSysLog(request, busiDesc + " 【成功】");
+        } catch (Exception e) {
+            log.error(busiDesc, e);
+            rest = Rest.fail(super.convertException(e));
+        }
+        return rest;
+    }
+
+
+    /**
+     * 申诉详细
+     */
+    @PostMapping(value = "appeal/detail")
+    public Rest<PerformAttendAppealEntity> performDetail(@RequestBody AppealReq appealReq) {
+        String busiDesc = "个人申诉详细";
+        Rest<PerformAttendAppealEntity> rest = Rest.ok(busiDesc + " 【成功】");
+        try {
+            if (ObjectUtils.isEmpty(appealReq.getId())) {
+                throw new AppException("详细查询id不能为空!");
+            }
+
+            recordSysLog(request, busiDesc + " 【成功】");
+        } catch (Exception e) {
+            log.error(busiDesc, e);
+            rest = Rest.fail(super.convertException(e));
+        }
+        return rest;
+    }
+
+
+    /**
+     * 申诉新增
+     */
+    @PostMapping(value = "appeal/save")
+    public Rest<String> appealSave(@RequestBody PerformAttendAppealEntity appealEntity) {
+        String busiDesc = "个人申诉新增";
+        Rest<String> rest = Rest.ok(busiDesc + " 【成功】");
+        try {
+
+            recordSysLog(request, busiDesc + " 【成功】");
+        } catch (Exception e) {
+            log.error(busiDesc, e);
+            rest = Rest.fail(super.convertException(e));
+        }
+        return rest;
+    }
+
+
+    public static void main(String[] args) {
+
+    }
+
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/PerformApiController.java

+package com.mortals.xhx.busiz.web;
+
+
+import cn.hutool.core.date.DateUtil;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.web.BaseJsonBodyController;
+import com.mortals.xhx.busiz.req.AppealReq;
+import com.mortals.xhx.busiz.req.PerformReq;
+import com.mortals.xhx.busiz.rsp.PerformDetailInfo;
+import com.mortals.xhx.busiz.rsp.PerformInfo;
+import com.mortals.xhx.busiz.rsp.PerformStatInfo;
+import com.mortals.xhx.common.code.PerformTypeEnum;
+import com.mortals.xhx.module.check.service.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ *  h5 绩效
+ * @author: zxfei
+ * @date: 2023/7/7 13:20
+ */
+@RestController
+@Slf4j
+@RequestMapping("/api/v1/")
+public class PerformApiController extends BaseJsonBodyController {
+
+    @Autowired
+    private CheckAttendRecordService checkAttendRecordService;
+    @Autowired
+    private CheckReviewRecordService checkReviewRecordService;
+    @Autowired
+    private CheckComplainRecordService checkComplainRecordService;
+    @Autowired
+    private CheckEffectRecordService checkEffectRecordService;
+    @Autowired
+    private CheckGoworkRecordService checkGoworkRecordService;
+    @Autowired
+    private CheckOtherRecordService checkOtherRecordService;
+
+
+    /**
+     * 个人当天绩效统计
+     */
+    @PostMapping(value = "perform/stat")
+    public Rest<PerformStatInfo> performStat() {
+        String busiDesc = "H5 个人绩效统计";
+        Rest<PerformStatInfo> rest = Rest.ok(busiDesc + " 【成功】");
+        try {
+            //todo 查询当前登录人的绩效分数
+            recordSysLog(request, busiDesc + " 【成功】");
+        } catch (Exception e) {
+            log.error(busiDesc, e);
+            rest = Rest.fail(super.convertException(e));
+        }
+        return rest;
+    }
+
+
+    /**
+     * 个人当月绩效加分扣分列表
+     */
+    @PostMapping(value = "perform/list")
+    public Rest<List<PerformInfo>> performList(@RequestBody PerformReq performReq) {
+        String busiDesc = "个人绩效列表";
+        Rest<List<PerformInfo>> rest = Rest.ok(busiDesc + " 【成功】");
+        try {
+            if (ObjectUtils.isEmpty(performReq.getPerformStartDate())) {
+                //未设置时间的情况，默认为当月
+                performReq.setPerformStartDate(DateUtil.beginOfMonth(new Date()).toDateStr());
+                performReq.setPerformEndDate(DateUtil.today());
+            }
+            //todo 查询全部扣分绩效
+            if (PerformTypeEnum.全部.getValue().equals(performReq.getPerformType())) {
+
+            } else if (PerformTypeEnum.考勤绩效.getValue().equals(performReq.getPerformType())) {
+
+            } else if (PerformTypeEnum.评价差评绩效.getValue().equals(performReq.getPerformType())) {
+
+            } else if (PerformTypeEnum.评价投诉绩效.getValue().equals(performReq.getPerformType())) {
+
+            } else if (PerformTypeEnum.办件绩效.getValue().equals(performReq.getPerformType())) {
+
+            } else if (PerformTypeEnum.效能绩效.getValue().equals(performReq.getPerformType())) {
+
+            } else if (PerformTypeEnum.其它绩效.getValue().equals(performReq.getPerformType())) {
+
+            } else {
+                throw new AppException("不支持当前绩效类型");
+            }
+
+
+            recordSysLog(request, busiDesc + " 【成功】");
+        } catch (Exception e) {
+            log.error(busiDesc, e);
+            rest = Rest.fail(super.convertException(e));
+        }
+        return rest;
+    }
+
+
+    /**
+     * 扣分加分详细
+     */
+    @PostMapping(value = "perform/detail")
+    public Rest<PerformDetailInfo> performDetail(@RequestBody PerformReq performReq) {
+        String busiDesc = "个人绩效增减详细";
+        Rest<PerformDetailInfo> rest = Rest.ok(busiDesc + " 【成功】");
+        try {
+            if (ObjectUtils.isEmpty(performReq.getId())) {
+                throw new AppException("详细查询id不能为空!");
+            }
+            //todo 查询全部扣分绩效详细
+            if (PerformTypeEnum.考勤绩效.getValue().equals(performReq.getPerformType())) {
+
+            } else if (PerformTypeEnum.评价差评绩效.getValue().equals(performReq.getPerformType())) {
+
+            } else if (PerformTypeEnum.评价投诉绩效.getValue().equals(performReq.getPerformType())) {
+
+            } else if (PerformTypeEnum.办件绩效.getValue().equals(performReq.getPerformType())) {
+
+            } else if (PerformTypeEnum.效能绩效.getValue().equals(performReq.getPerformType())) {
+
+            } else if (PerformTypeEnum.其它绩效.getValue().equals(performReq.getPerformType())) {
+
+            } else {
+                throw new AppException("不支持当前绩效类型");
+            }
+
+
+            recordSysLog(request, busiDesc + " 【成功】");
+        } catch (Exception e) {
+            log.error(busiDesc, e);
+            rest = Rest.fail(super.convertException(e));
+        }
+        return rest;
+    }
+
+    public static void main(String[] args) {
+
+    }
+
+
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/PerformTypeEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * @author: finegirl
+ * @date: 2021/7/16 11:50
+ * @description: 组件枚举类
+ **/
+public enum PerformTypeEnum {
+    全部("all", "全部"),
+    考勤绩效("attend", "考勤绩效"),
+    评价差评绩效("review", "评价好差评绩效"),
+    评价投诉绩效("complain", "评价投诉绩效"),
+    办件绩效("gowork", "办件绩效"),
+    效能绩效("effect", "效能绩效"),
+    其它绩效("other", "其它绩效");
+
+    private String value;
+    private String desc;
+
+    PerformTypeEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static PerformTypeEnum getByValue(String value) {
+        for (PerformTypeEnum componentEnum : PerformTypeEnum.values()) {
+            if (componentEnum.getValue() == value) {
+                return componentEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 获取Map集合
+     *
+     * @param eItem 不包含项
+     * @return
+     */
+    public static Map<String, String> getEnumMap(String... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (PerformTypeEnum item : PerformTypeEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (String e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+            }
+        }
+        return resultMap;
+    }
+}
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
  * 员工基本信息实体对象
  *
  * @author zxfei
- * @date 2023-05-16
+ * @date 2023-07-07
  */
 @Data
 public class StaffEntity extends StaffVo {
@@ -114,6 +114,18 @@ public class StaffEntity extends StaffVo {
      * 绩效分数
      */
     private BigDecimal score;
+    /**
+     * 员工登录名
+     */
+    private String loginName;
+    /**
+     * 员工登录密码
+     */
+    private String loginPwd;
+    /**
+     * 最后登录时间
+     */
+    private Date lastLoginTime;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -179,5 +191,11 @@ public class StaffEntity extends StaffVo {
         this.serverIndexCode = "";
 
         this.score = new BigDecimal(0);
+
+        this.loginName = "";
+
+        this.loginPwd = "";
+
+        this.lastLoginTime = null;
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffQuery.java

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.staff.model.StaffEntity;
  * 员工基本信息查询对象
  *
  * @author zxfei
- * @date 2023-05-16
+ * @date 2023-07-07
  */
 public class StaffQuery extends StaffEntity {
     /** 开始 序号，主键，自增长 */
@@ -272,6 +272,22 @@ public class StaffQuery extends StaffEntity {
     /** 绩效分数排除列表 */
     private List <BigDecimal> scoreNotList;
 
+    /** 员工登录名 */
+    private List<String> loginNameList;
+
+    /** 员工登录名排除列表 */
+    private List <String> loginNameNotList;
+    /** 员工登录密码 */
+    private List<String> loginPwdList;
+
+    /** 员工登录密码排除列表 */
+    private List <String> loginPwdNotList;
+    /** 开始 最后登录时间 */
+    private String lastLoginTimeStart;
+
+    /** 结束 最后登录时间 */
+    private String lastLoginTimeEnd;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<StaffQuery> orConditionList;
 
@@ -1747,6 +1763,102 @@ public class StaffQuery extends StaffEntity {
     }
 
 
+    /**
+     * 获取 员工登录名
+     * @return loginNameList
+     */
+    public List<String> getLoginNameList(){
+        return this.loginNameList;
+    }
+
+    /**
+     * 设置 员工登录名
+     * @param loginNameList
+     */
+    public void setLoginNameList(List<String> loginNameList){
+        this.loginNameList = loginNameList;
+    }
+
+    /**
+     * 获取 员工登录名
+     * @return loginNameNotList
+     */
+    public List<String> getLoginNameNotList(){
+        return this.loginNameNotList;
+    }
+
+    /**
+     * 设置 员工登录名
+     * @param loginNameNotList
+     */
+    public void setLoginNameNotList(List<String> loginNameNotList){
+        this.loginNameNotList = loginNameNotList;
+    }
+
+    /**
+     * 获取 员工登录密码
+     * @return loginPwdList
+     */
+    public List<String> getLoginPwdList(){
+        return this.loginPwdList;
+    }
+
+    /**
+     * 设置 员工登录密码
+     * @param loginPwdList
+     */
+    public void setLoginPwdList(List<String> loginPwdList){
+        this.loginPwdList = loginPwdList;
+    }
+
+    /**
+     * 获取 员工登录密码
+     * @return loginPwdNotList
+     */
+    public List<String> getLoginPwdNotList(){
+        return this.loginPwdNotList;
+    }
+
+    /**
+     * 设置 员工登录密码
+     * @param loginPwdNotList
+     */
+    public void setLoginPwdNotList(List<String> loginPwdNotList){
+        this.loginPwdNotList = loginPwdNotList;
+    }
+
+    /**
+     * 获取 开始 最后登录时间
+     * @return lastLoginTimeStart
+     */
+    public String getLastLoginTimeStart(){
+        return this.lastLoginTimeStart;
+    }
+
+    /**
+     * 设置 开始 最后登录时间
+     * @param lastLoginTimeStart
+     */
+    public void setLastLoginTimeStart(String lastLoginTimeStart){
+        this.lastLoginTimeStart = lastLoginTimeStart;
+    }
+
+    /**
+     * 获取 结束 最后登录时间
+     * @return lastLoginTimeEnd
+     */
+    public String getLastLoginTimeEnd(){
+        return this.lastLoginTimeEnd;
+    }
+
+    /**
+     * 设置 结束 最后登录时间
+     * @param lastLoginTimeEnd
+     */
+    public void setLastLoginTimeEnd(String lastLoginTimeEnd){
+        this.lastLoginTimeEnd = lastLoginTimeEnd;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -2575,6 +2687,45 @@ public class StaffQuery extends StaffEntity {
         return this;
     }
 
+
+    /**
+     * 设置 员工登录名
+     * @param loginName
+     */
+    public StaffQuery loginName(String loginName){
+        setLoginName(loginName);
+        return this;
+    }
+
+    /**
+     * 设置 员工登录名
+     * @param loginNameList
+     */
+    public StaffQuery loginNameList(List<String> loginNameList){
+        this.loginNameList = loginNameList;
+        return this;
+    }
+
+
+    /**
+     * 设置 员工登录密码
+     * @param loginPwd
+     */
+    public StaffQuery loginPwd(String loginPwd){
+        setLoginPwd(loginPwd);
+        return this;
+    }
+
+    /**
+     * 设置 员工登录密码
+     * @param loginPwdList
+     */
+    public StaffQuery loginPwdList(List<String> loginPwdList){
+        this.loginPwdList = loginPwdList;
+        return this;
+    }
+
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

attendance-performance-manager/src/main/resources/sqlmap/module/staff/StaffMapper.xml

@@ -34,6 +34,9 @@
         <result property="picUri" column="picUri" />
         <result property="serverIndexCode" column="serverIndexCode" />
         <result property="score" column="score" />
+        <result property="loginName" column="loginName" />
+        <result property="loginPwd" column="loginPwd" />
+        <result property="lastLoginTime" column="lastLoginTime" />
 
     </resultMap>
 
@@ -128,23 +131,32 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('score') or colPickMode == 1 and data.containsKey('score')))">
                 a.score,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('loginName') or colPickMode == 1 and data.containsKey('loginName')))">
+                a.loginName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('loginPwd') or colPickMode == 1 and data.containsKey('loginPwd')))">
+                a.loginPwd,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('lastLoginTime') or colPickMode == 1 and data.containsKey('lastLoginTime')))">
+                a.lastLoginTime,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="StaffEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_staff
-        (name,gender,birthday,photoPath,phoneNumber,idCard,workNum,politicalstatus,deptId,deptName,positionId,positionName,staffType,status,source,registerPath,entryDate,regularDate,leaveDate,remark,createUserId,createTime,updateUserId,updateTime,remarkId,picUri,serverIndexCode,score)
+        (name,gender,birthday,photoPath,phoneNumber,idCard,workNum,politicalstatus,deptId,deptName,positionId,positionName,staffType,status,source,registerPath,entryDate,regularDate,leaveDate,remark,createUserId,createTime,updateUserId,updateTime,remarkId,picUri,serverIndexCode,score,loginName,loginPwd,lastLoginTime)
         VALUES
-        (#{name},#{gender},#{birthday},#{photoPath},#{phoneNumber},#{idCard},#{workNum},#{politicalstatus},#{deptId},#{deptName},#{positionId},#{positionName},#{staffType},#{status},#{source},#{registerPath},#{entryDate},#{regularDate},#{leaveDate},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{remarkId},#{picUri},#{serverIndexCode},#{score})
+        (#{name},#{gender},#{birthday},#{photoPath},#{phoneNumber},#{idCard},#{workNum},#{politicalstatus},#{deptId},#{deptName},#{positionId},#{positionName},#{staffType},#{status},#{source},#{registerPath},#{entryDate},#{regularDate},#{leaveDate},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{remarkId},#{picUri},#{serverIndexCode},#{score},#{loginName},#{loginPwd},#{lastLoginTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_staff
-        (name,gender,birthday,photoPath,phoneNumber,idCard,workNum,politicalstatus,deptId,deptName,positionId,positionName,staffType,status,source,registerPath,entryDate,regularDate,leaveDate,remark,createUserId,createTime,updateUserId,updateTime,remarkId,picUri,serverIndexCode,score)
+        (name,gender,birthday,photoPath,phoneNumber,idCard,workNum,politicalstatus,deptId,deptName,positionId,positionName,staffType,status,source,registerPath,entryDate,regularDate,leaveDate,remark,createUserId,createTime,updateUserId,updateTime,remarkId,picUri,serverIndexCode,score,loginName,loginPwd,lastLoginTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.name},#{item.gender},#{item.birthday},#{item.photoPath},#{item.phoneNumber},#{item.idCard},#{item.workNum},#{item.politicalstatus},#{item.deptId},#{item.deptName},#{item.positionId},#{item.positionName},#{item.staffType},#{item.status},#{item.source},#{item.registerPath},#{item.entryDate},#{item.regularDate},#{item.leaveDate},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.remarkId},#{item.picUri},#{item.serverIndexCode},#{item.score})
+            (#{item.name},#{item.gender},#{item.birthday},#{item.photoPath},#{item.phoneNumber},#{item.idCard},#{item.workNum},#{item.politicalstatus},#{item.deptId},#{item.deptName},#{item.positionId},#{item.positionName},#{item.staffType},#{item.status},#{item.source},#{item.registerPath},#{item.entryDate},#{item.regularDate},#{item.leaveDate},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.remarkId},#{item.picUri},#{item.serverIndexCode},#{item.score},#{item.loginName},#{item.loginPwd},#{item.lastLoginTime})
         </foreach>
     </insert>
 
@@ -268,6 +280,15 @@
             <if test="(colPickMode==0 and data.containsKey('scoreIncrement')) or (colPickMode==1 and !data.containsKey('scoreIncrement'))">
                 a.score=ifnull(a.score,0) + #{data.scoreIncrement},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('loginName')) or (colPickMode==1 and !data.containsKey('loginName'))">
+                a.loginName=#{data.loginName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('loginPwd')) or (colPickMode==1 and !data.containsKey('loginPwd'))">
+                a.loginPwd=#{data.loginPwd},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('lastLoginTime')) or (colPickMode==1 and !data.containsKey('lastLoginTime'))">
+                a.lastLoginTime=#{data.lastLoginTime},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -526,6 +547,27 @@
                     </choose>
                 </foreach>
             </trim>
+            <trim prefix="loginName=(case" suffix="ELSE loginName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('loginName')) or (colPickMode==1 and !item.containsKey('loginName'))">
+                        when a.id=#{item.id} then #{item.loginName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="loginPwd=(case" suffix="ELSE loginPwd end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('loginPwd')) or (colPickMode==1 and !item.containsKey('loginPwd'))">
+                        when a.id=#{item.id} then #{item.loginPwd}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="lastLoginTime=(case" suffix="ELSE lastLoginTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('lastLoginTime')) or (colPickMode==1 and !item.containsKey('lastLoginTime'))">
+                        when a.id=#{item.id} then #{item.lastLoginTime}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1281,6 +1323,63 @@
             ${_conditionType_} a.score <![CDATA[ <= ]]> #{${_conditionParam_}.scoreEnd}
         </if>
 
+
+        <if test="conditionParamRef.containsKey('loginName')">
+            <if test="conditionParamRef.loginName != null and conditionParamRef.loginName != ''">
+                ${_conditionType_} a.loginName like #{${_conditionParam_}.loginName}
+            </if>
+            <if test="conditionParamRef.loginName == null">
+                ${_conditionType_} a.loginName is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('loginNameList') and conditionParamRef.loginNameList.size() > 0">
+            ${_conditionType_} a.loginName in
+            <foreach collection="conditionParamRef.loginNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('loginNameNotList') and conditionParamRef.loginNameNotList.size() > 0">
+            ${_conditionType_} a.loginName not in
+            <foreach collection="conditionParamRef.loginNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('loginPwd')">
+            <if test="conditionParamRef.loginPwd != null and conditionParamRef.loginPwd != ''">
+                ${_conditionType_} a.loginPwd like #{${_conditionParam_}.loginPwd}
+            </if>
+            <if test="conditionParamRef.loginPwd == null">
+                ${_conditionType_} a.loginPwd is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('loginPwdList') and conditionParamRef.loginPwdList.size() > 0">
+            ${_conditionType_} a.loginPwd in
+            <foreach collection="conditionParamRef.loginPwdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('loginPwdNotList') and conditionParamRef.loginPwdNotList.size() > 0">
+            ${_conditionType_} a.loginPwd not in
+            <foreach collection="conditionParamRef.loginPwdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('lastLoginTime')">
+            <if test="conditionParamRef.lastLoginTime != null ">
+                ${_conditionType_} a.lastLoginTime = #{${_conditionParam_}.lastLoginTime}
+            </if>
+            <if test="conditionParamRef.lastLoginTime == null">
+                ${_conditionType_} a.lastLoginTime is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('lastLoginTimeStart') and conditionParamRef.lastLoginTimeStart != null and conditionParamRef.lastLoginTimeStart!=''">
+            ${_conditionType_} a.lastLoginTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.lastLoginTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
+        <if test="conditionParamRef.containsKey('lastLoginTimeEnd') and conditionParamRef.lastLoginTimeEnd != null and conditionParamRef.lastLoginTimeEnd!=''">
+            ${_conditionType_} a.lastLoginTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.lastLoginTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1439,6 +1538,21 @@
                     <if test='orderCol.score != null and "DESC".equalsIgnoreCase(orderCol.score)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('loginName')">
+                    a.loginName
+                    <if test='orderCol.loginName != null and "DESC".equalsIgnoreCase(orderCol.loginName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('loginPwd')">
+                    a.loginPwd
+                    <if test='orderCol.loginPwd != null and "DESC".equalsIgnoreCase(orderCol.loginPwd)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('lastLoginTime')">
+                    a.lastLoginTime
+                    <if test='orderCol.lastLoginTime != null and "DESC".equalsIgnoreCase(orderCol.lastLoginTime)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>

db/module.sql

@@ -28,40 +28,45 @@ PRIMARY KEY  (`id`)
 -- ----------------------------
 DROP TABLE IF EXISTS `mortals_xhx_staff`;
 CREATE TABLE mortals_xhx_staff(
-                                  `id` bigint(20)   AUTO_INCREMENT   COMMENT '序号，主键，自增长',
-                                  `name` varchar(64) NOT NULL     COMMENT '员工姓名',
-                                  `gender` tinyint(2)    DEFAULT '1'  COMMENT '性别(1.男,2.女)',
-                                  `birthday` datetime      COMMENT '出生日期',
-                                  `photoPath` varchar(255)      COMMENT '照片',
-                                  `phoneNumber` varchar(128)      COMMENT '联系电话',
-                                  `idCard` varchar(128)      COMMENT '身份证号码',
-                                  `workNum` varchar(128)      COMMENT '工号',
-                                  `politicalstatus` tinyint(2)    DEFAULT '1'  COMMENT '政治面貌 (1.中共党员，2.中共预备党员，3.共青团员，4.群众，5.其它)',
-                                  `deptId` bigint(20)      COMMENT '所属部门',
-                                  `deptName` varchar(128)      COMMENT '所属部门名称',
-                                  `positionId` bigint(20)      COMMENT '职位ID',
-                                  `positionName` varchar(128)      COMMENT '职位名称',
-                                  `staffType` tinyint(2)    DEFAULT '1'  COMMENT '员工类型（1.全职,2.兼职,3.实习)',
-                                  `status` tinyint(2)    DEFAULT '1'  COMMENT '员工状态(1.正式,2.试用,3.离职)',
-                                  `registerPath` varchar(255)      COMMENT '入职登记表',
-                                  `entryDate` datetime      COMMENT '入职时间',
-                                  `regularDate` datetime      COMMENT '转正时间',
-                                  `leaveDate` datetime      COMMENT '离职时间',
-                                  `remark` varchar(255)      COMMENT '备注',
-                                  `createUserId` bigint(20) NOT NULL     COMMENT '创建用户',
-                                  `createTime` datetime NOT NULL     COMMENT '创建时间',
-                                  `updateUserId` bigint(20)      COMMENT '更新用户',
-                                  `updateTime` datetime      COMMENT '更新时间',
-                                  `remarkId` varchar(255)      COMMENT '备注id',
-                                  `source` tinyint(2)    DEFAULT '1'  COMMENT '员工来源(1.外部,2.内部)',
-                                  `picUri` varchar(255)      COMMENT '相对图片pic',
-                                  `serverIndexCode` varchar(255)      COMMENT '图片资源唯一标识',
-                                  PRIMARY KEY  (`id`)
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '序号，主键，自增长',
+    `name` varchar(64) NOT NULL     COMMENT '员工姓名',
+    `gender` tinyint(2)    DEFAULT '1'  COMMENT '性别(1.男,2.女)',
+    `birthday` datetime      COMMENT '出生日期',
+    `photoPath` varchar(255)      COMMENT '照片',
+    `phoneNumber` varchar(128)      COMMENT '联系电话',
+    `idCard` varchar(128)      COMMENT '身份证号码',
+    `workNum` varchar(128)      COMMENT '工号',
+    `politicalstatus` tinyint(2)    DEFAULT '1'  COMMENT '政治面貌 (1.中共党员，2.中共预备党员，3.共青团员，4.群众，5.其它)',
+    `deptId` bigint(20)      COMMENT '所属部门',
+    `deptName` varchar(128)      COMMENT '所属部门名称',
+    `positionId` bigint(20)      COMMENT '职位ID',
+    `positionName` varchar(128)      COMMENT '职位名称',
+    `staffType` tinyint(2)    DEFAULT '1'  COMMENT '员工类型（1.全职,2.兼职,3.实习)',
+    `status` tinyint(2)    DEFAULT '1'  COMMENT '员工状态(1.正式,2.试用,3.离职)',
+    `source` tinyint(2)    DEFAULT '1'  COMMENT '员工来源(1.外部,2.内部)',
+    `registerPath` varchar(255)      COMMENT '入职登记表',
+    `entryDate` datetime      COMMENT '入职时间',
+    `regularDate` datetime      COMMENT '转正时间',
+    `leaveDate` datetime      COMMENT '离职时间',
+    `remark` varchar(255)      COMMENT '备注',
+    `createUserId` bigint(20) NOT NULL     COMMENT '创建用户',
+    `createTime` datetime NOT NULL     COMMENT '创建时间',
+    `updateUserId` bigint(20)      COMMENT '更新用户',
+    `updateTime` datetime      COMMENT '更新时间',
+    `remarkId` varchar(255)      COMMENT '备注',
+    `picUri` varchar(255)      COMMENT '相对图片pic',
+    `serverIndexCode` varchar(255)      COMMENT '图片资源唯一标识',
+    `score` decimal(10,2)      COMMENT '绩效分数',
+    `loginName` varchar(64) NOT NULL     COMMENT '员工登录名',
+    `loginPwd` varchar(64) NOT NULL     COMMENT '员工登录密码',
+    `lastLoginTime` datetime      COMMENT '最后登录时间',
+PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工基本信息';
 
 
 
 
+
 -- ----------------------------
 -- 员工关怀信息表
 -- ----------------------------