新增员工导入

domain/src/main/java/com/dayou/entity/User.java

@@ -5,6 +5,8 @@ import com.dayou.common.BaseEntity;
 import java.time.LocalDate;
 import java.util.Date;
 
+import com.dayou.enums.SexEnum;
+import com.dayou.enums.UserTypeEnum;
 import com.github.liangbaika.validate.annations.AbcValidate;
 import com.github.liangbaika.validate.enums.Check;
 import lombok.Data;
@@ -32,72 +34,48 @@ public class User extends BaseEntity {
     /**
      * 姓名
      */
-    @ImportCell
+    @ImportCell(notNull = true)
     @ExportCell(columnName = "姓名")
     private String name;
 
     /**
      * 身份证号
      */
-    @ImportCell
+    @ImportCell(notNull = true)
     @ExportCell(columnName = "身份证号")
     private String idNo;
 
 
     /**
-     * 员工工号（登录账号）
-     */
-    @ImportCell
-    @ExportCell(columnName = "员工工号")
-    private String staffNo;
-    /**
-     * 用户类型
-     */
-    @ImportCell
-    @ExportCell(columnName = "用户类型")
-    private String userType;
-
-    /**
      * 手机号码
      */
-    @ImportCell
+    @ImportCell(notNull = true)
     @ExportCell(columnName = "手机号码")
     private String mobile;
 
+
+
     /**
      * 用户性别 男/女
      */
-    @ImportCell
-    @ExportCell(columnName = "用户性别 男/女")
+    @ImportCell(ref = SexEnum.class,notNull = true)
+    @ExportCell(columnName = "用户性别 男/女" )
     private String sex;
 
     /**
-     * 密码
-     */
-    @ImportCell
-    @ExportCell(columnName = "密码")
-    private String password;
-
-    /**
-     * 盐加密
+     * 员工类型
      */
-    @ImportCell
-    @ExportCell(columnName = "盐加密")
-    private String salt;
+    @ImportCell(notNull = true,ref = UserTypeEnum.class)
+    @ExportCell(columnName = "员工类型")
+    private String userType;
 
     /**
      * 出生日期
      */
-    @ImportCell
+    @ImportCell(notNull = true)
     @ExportCell(columnName = "出生日期")
     private LocalDate birthday;
 
-    /**
-     * 是否启用：1：启用 0：禁用
-     */
-    @ImportCell
-    @ExportCell(columnName = "是否启用：1：启用 0：禁用")
-    private Boolean enable;
 
     /**
      * 民族
@@ -128,29 +106,15 @@ public class User extends BaseEntity {
     private String homeAddress;
 
     /**
-     * 离职日期
-     */
-    @ImportCell
-    @ExportCell(columnName = "离职日期")
-    @TableField(fill = FieldFill.UPDATE)
-    private LocalDate resignDate;
-
-    /**
-     * 在职状态
-     */
-    @ImportCell
-    @ExportCell(columnName = "在职状态：0：在职 1：离职")
-    private Boolean resignState;
-
-    /**
      * 入职日期
      */
-    @ImportCell
+    @ImportCell(notNull = true)
     @ExportCell(columnName = "入职日期")
     @TableField(fill = FieldFill.UPDATE)
     @AbcValidate(required = true,message = "入职日期必填", fun = Check.NotNull)
     private LocalDate hireDate;
 
+
     /**
      * 备注
      */
@@ -159,9 +123,56 @@ public class User extends BaseEntity {
     private String remark;
 
     /**
+     * 密码
+     */
+    //@ImportCell
+    @ExportCell(columnName = "密码")
+    private String password;
+
+    /**
+     * 盐加密
+     */
+    //@ImportCell
+    @ExportCell(columnName = "盐加密")
+    private String salt;
+
+
+
+    /**
+     * 是否启用：1：启用 0：禁用
+     */
+    //@ImportCell
+    @ExportCell(columnName = "是否启用：1：启用 0：禁用")
+    private Boolean enable;
+
+
+
+    /**
+     * 离职日期
+     */
+    //@ImportCell
+    @ExportCell(columnName = "离职日期")
+    @TableField(fill = FieldFill.UPDATE)
+    private LocalDate resignDate;
+
+    /**
+     * 员工工号（登录账号）
+     */
+    //@ImportCell
+    @ExportCell(columnName = "员工工号")
+    private String staffNo;
+
+    /**
+     * 在职状态
+     */
+    //@ImportCell
+    @ExportCell(columnName = "在职状态：0：在职 1：离职")
+    private Boolean resignState;
+
+    /**
      * 初始密码状态
      */
-    @ImportCell
+    //@ImportCell
     @ExportCell(columnName = "初始密码状态")
     private Boolean passwordState;
 }

domain/src/main/java/com/dayou/enums/SexEnum.java

@@ -7,7 +7,7 @@ package com.dayou.enums;
  * @since: 2022/11/30
  * created with IntelliJ IDEA.
  */
-public enum SexEnum {
+public enum SexEnum implements CodeMsgEnumInterface<String,String>{
 
     MAN("男"),
     WOMAN("女")
@@ -22,4 +22,14 @@ public enum SexEnum {
     public String getSex() {
         return sex;
     }
+
+    @Override
+    public String getCode() {
+        return sex;
+    }
+
+    @Override
+    public String getMsg() {
+        return sex;
+    }
 }

domain/src/main/java/com/dayou/enums/UserTypeEnum.java

@@ -0,0 +1,36 @@
+package com.dayou.enums;
+
+/**
+ * 类说明：
+ *
+ * @author: wucl
+ * @since: 2022/12/30
+ * created with IntelliJ IDEA.
+ */
+public enum UserTypeEnum implements CodeMsgEnumInterface<String,String>{
+
+    NORMAL("正式员工"),
+    TRIAL("试用期员工"),
+    PRACTICE("实习员工")
+        ;
+
+    public String getUserType() {
+        return userType;
+    }
+
+    private String userType;
+
+    UserTypeEnum(String userType) {
+        this.userType = userType;
+    }
+
+    @Override
+    public String getCode() {
+        return userType;
+    }
+
+    @Override
+    public String getMsg() {
+        return userType;
+    }
+}

domain/src/main/java/com/dayou/vo/UserVO.java

@@ -3,6 +3,7 @@ package com.dayou.vo;
 import com.dayou.entity.User;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -16,7 +17,7 @@ import java.util.List;
 public class UserVO extends User {
 
     private List<DepartmentPostVO> departmentPostVOList;
-    private List<IdNameVO> userPosts;
+    private List<IdNameVO> userPosts = new ArrayList<>();
 
 
     private String keyword;

service/src/main/java/com/dayou/service/impl/UserServiceImpl.java

@@ -75,17 +75,16 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     static {
         userExcelTitles.add("姓名");
         userExcelTitles.add("身份证号");
-        userExcelTitles.add("用户类型");
-        userExcelTitles.add("员工工号");
-        userExcelTitles.add("用户邮箱");
         userExcelTitles.add("手机号码");
         userExcelTitles.add("用户性别 男/女");
-        userExcelTitles.add("头像路径");
-        userExcelTitles.add("登录账号");
-        userExcelTitles.add("密码");
-        userExcelTitles.add("盐加密");
+        userExcelTitles.add("员工类型");
         userExcelTitles.add("出生日期");
-        userExcelTitles.add("是否启用：1：启用 0：禁用");
+        userExcelTitles.add("民族");
+        userExcelTitles.add("政治面貌");
+        userExcelTitles.add("籍贯");
+        userExcelTitles.add("家庭住址");
+        userExcelTitles.add("入职日期");
+        userExcelTitles.add("备注");
     }
 
     @Autowired
@@ -119,7 +118,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
     @Override
     public Boolean add(User user) {
-        return this.save(user);
+        UserVO userVO = new UserVO();
+        BeanUtils.copyProperties(user,userVO);
+        return this.xSave(userVO);
     }
 
     @Override