feat:编制情况

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/constant/UserStaffingTypeEnum.java

@@ -0,0 +1,26 @@
+package com.bsd.pjcloud.admin.api.constant;
+
+import cn.hutool.core.util.ObjectUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 用户在编情况
+ */
+@AllArgsConstructor
+@Getter
+public enum UserStaffingTypeEnum {
+    STAFFING("1", "在编"),
+    NONE_STAFFING("2", "非在编"),
+    ;
+    private final String type;
+    private final String description;
+
+    public static UserStaffingTypeEnum valueOfByType(String type) {
+        if (ObjectUtil.isEmpty(type)) return null;
+        return Arrays.stream(values()).filter(v -> ObjectUtil.equals(type, v.getType())).findFirst().orElse(null);
+    }
+
+}

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/SysUser.java

@@ -240,9 +240,21 @@ public class SysUser extends Model<SysUser> implements Serializable {
     @Schema(description = "员工浙政钉编码")
     private String dingtalkEmployeeCode;
 
+    /**
+     * 员工所属系统类型
+     */
     @Schema(description = "员工所属系统类型")
     private String systemType;
 
+    /**
+     * 是否为全局人脸
+     */
     @Schema(description = "是否为全局人脸")
     private String isGlobalFace;
+
+    /**
+     * 编制类型
+     */
+    @Schema(description = "编制类型")
+    private String staffingType;
 }

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/UserExcelVO.java

@@ -92,6 +92,12 @@ public class UserExcelVO implements Serializable {
     @ExcelProperty("岗位名称")
     private String postNameList;
 
+    /**
+     * 编制
+     */
+    @ExcelProperty("编制")
+    private String staffingType;
+
     /**
      * 锁定标记
      */

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/UserVO.java

@@ -241,4 +241,9 @@ public class UserVO implements BaseFacesInterface, Serializable {
      * 商户相关
      */
     private String merchantName;
+
+    /**
+     * 编制类型
+     */
+    private String staffingType;
 }