员工状态修复

src/main/java/cn/hnthyy/thmz/controller/LoginController.java

@@ -10,6 +10,7 @@ import cn.hnthyy.thmz.entity.his.Employee;
 import cn.hnthyy.thmz.entity.his.XtUser;
 import cn.hnthyy.thmz.entity.thmz.User;
 import cn.hnthyy.thmz.enums.WorkingStatusEnum;
+import cn.hnthyy.thmz.enums.YesNoEnum;
 import cn.hnthyy.thmz.service.his.EmployeeService;
 import cn.hnthyy.thmz.service.impl.his.XtUserServiceImpl;
 import cn.hnthyy.thmz.service.thmz.TokenService;
@@ -72,8 +73,11 @@ public class LoginController {
                 resultMap.put("message", "登录失败,用户不存在,请联系管理员");
                 return resultMap;
             }
-            user = new User(employee.getEmployeeCode(),userParam.getUserCode(), employee.getEmployeeName(),
-                    Integer.valueOf(0).equals(employee.getDelFlag()) ? WorkingStatusEnum.WORKING.code : WorkingStatusEnum.LEAVE.code);
+            Integer workStatus = employee.getMark();
+            if(workStatus==null){
+                workStatus=YesNoEnum.YES.code.equals(employee.getDelFlag()) ? WorkingStatusEnum.CIZHI.code : WorkingStatusEnum.WORKING.code;
+            }
+            user = new User(employee.getEmployeeCode(),userParam.getUserCode(), employee.getEmployeeName(),workStatus);
             userService.saveUser(user);
         }
         try {

src/main/java/cn/hnthyy/thmz/entity/his/Employee.java

@@ -15,4 +15,6 @@ public class Employee {
     private String employeeName;
     //删除标记  0 未删除 1 已删除
     private Integer delFlag;
+    //工作状态
+    private Integer mark;
 }

src/main/java/cn/hnthyy/thmz/enums/WorkingStatusEnum.java

@@ -6,30 +6,34 @@ import java.util.List;
 /**
  * 工作状态枚举
  */
-public enum  WorkingStatusEnum {
-
-    WORKING(0,"在职"),
-    UNPAID_LEAVE(1,"停薪留职"),
-    LEAVE(2,"离职"),
-    RETIRE(3,"退休");
-
+public enum WorkingStatusEnum {
+    WORKING(1, "在职"),
+    UNPAID_LEAVE(2, "退休"),
+    LEAVE(3, "调离"),
+    RETIRE(4, "编码"),
+    LIXIU(5, "离休"),
+    CHUGUO(6, "出国"),
+    LIUDONG(7, "流动"),
+    CIZHI(8, "离职(辞职)"),
+    CITUI(9, "离职(辞退)");
     public Integer code;
     public String name;
 
-    WorkingStatusEnum(Integer code, String name){
-        this.code=code;
-        this.name=name;
+    WorkingStatusEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
     }
 
     /**
      * 根据编码查询对应的类型
+     *
      * @param code
      * @return
      */
-    public static WorkingStatusEnum getWorkingStatusByCode(String code){
-        List<WorkingStatusEnum> reportTypeList= Arrays.asList(values());
-        for (WorkingStatusEnum reportType:reportTypeList){
-            if(reportType.code.equals(code)){
+    public static WorkingStatusEnum getWorkingStatusByCode(String code) {
+        List<WorkingStatusEnum> reportTypeList = Arrays.asList(values());
+        for (WorkingStatusEnum reportType : reportTypeList) {
+            if (reportType.code.equals(code)) {
                 return reportType;
             }
         }

src/main/java/cn/hnthyy/thmz/mapper/his/EmployeeMapper.java

@@ -13,7 +13,7 @@ public interface EmployeeMapper {
      * @param codeRs
      * @return
      */
-    @Select(" select top 1 rtrim(code) employeeCode,rtrim(name) employeeName,del_flag from a_employee_mi  where  code_rs =#{codeRs}")
+    @Select(" select top 1 rtrim(code) employeeCode,rtrim(name) employeeName,del_flag,rtrim(mark) mark from a_employee_mi  where  code_rs =#{codeRs}")
     Employee selectByCodeRs(@Param("codeRs") String codeRs);
 
 
@@ -24,7 +24,7 @@ public interface EmployeeMapper {
      * @return
      */
     @Select({"<script>",
-            "select rtrim(code) employee_code,rtrim(name) employee_name,del_flag from a_employee_mi ",
+            "select rtrim(code) employee_code,rtrim(name) employee_name,del_flag,rtrim(mark) mark from a_employee_mi ",
             "<when test='depts!=null'>",
             " where dept_code in",
             "<foreach item='item' index='index' collection='depts' open='(' separator=',' close=')'>",
@@ -42,7 +42,7 @@ public interface EmployeeMapper {
      * @return
      */
     @Select({"<script>",
-            "select rtrim(code) employee_code,rtrim(name) employee_name,del_flag from a_employee_mi",
+            "select rtrim(code) employee_code,rtrim(name) employee_name,del_flag,rtrim(mark) mark from a_employee_mi",
             "<when test='dept!=null'>",
             " where dept_code =#{dept}",
             "</when>",
@@ -56,7 +56,7 @@ public interface EmployeeMapper {
      * @param name
      * @return
      */
-    @Select(" select top 1 rtrim(code) employeeCode,rtrim(name) employeeName,del_flag from a_employee_mi  where  name =#{name}")
+    @Select(" select top 1 rtrim(code) employeeCode,rtrim(name) employeeName,del_flag,rtrim(mark) mark from a_employee_mi  where  name =#{name}")
     Employee selectByUserName(@Param("name") String name);
 
 
@@ -66,7 +66,7 @@ public interface EmployeeMapper {
      * @param code
      * @return
      */
-    @Select(" select top 1 rtrim(code) employeeCode,rtrim(name) employeeName,del_flag from a_employee_mi  where  code =#{code}")
+    @Select(" select top 1 rtrim(code) employeeCode,rtrim(name) employeeName,del_flag,rtrim(mark) mark from a_employee_mi  where  code =#{code}")
     Employee selectByUserCode(@Param("code") String code);
 
 
@@ -76,7 +76,7 @@ public interface EmployeeMapper {
      * @return
      */
     @Select({"<script>",
-            "select rtrim(code) employeeCode,rtrim(name) employeeName,del_flag from a_employee_mi  where  code in",
+            "select rtrim(code) employeeCode,rtrim(name) employeeName,del_flag,rtrim(mark) mark from a_employee_mi  where  code in",
             "<foreach item='item' index='index' collection='codes' open='(' separator=',' close=')'>",
             "#{item}",
             "</foreach>",