Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4

2025-09-23 11:33:03 +08:00
parent f8b1aa6398 88662caa57
commit 4013fd72e6
70 changed files with 3601 additions and 1142 deletions
@@ -0,0 +1,34 @@
+package com.budwk.app.sys.models;
+
+import com.budwk.app.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：Sys_data_dict
+ * @Date 2025/9/22 16:43
+ * @注释
+ */
+@Data
+@Table
+@EqualsAndHashCode(callSuper = true)
+public class Sys_data_dict extends BaseModel {
+
+    @Column
+    @Comment("父级编码")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String parentCode;
+
+    @Column
+    @Comment("名称")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String name;
+
+    @Column
+    @Comment("编码")
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    private String code;
+}
@@ -26,7 +26,7 @@ public class Sys_unit extends BaseModel implements Serializable {
    @Name
    @Comment("ID")
    @ColDefine(type = ColType.VARCHAR, width = 32)
-    @PrevInsert(uu32 = true)
+//    @PrevInsert(uu32 = true)
    private String id;

    @Column
@@ -110,4 +110,24 @@ public class Sys_unit extends BaseModel implements Serializable {
    @Comment("小组id")
    @ColDefine(type = ColType.VARCHAR, width = 32)
    private String unionGroupId;
+
+    @Column
+    @Comment("处级_院系单位号")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String divisionCollegeCode;
+
+    @Column
+    @Comment("机构类型")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String institutionType;
+
+    @Column
+    @Comment("部门类别")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String unitType;
+
+    @Column
+    @Comment("部门类别区分（部门类设置 1, 其他设置 0）")
+    @ColDefine(type = ColType.INT)
+    private Integer unitTypeCode;
 }
@@ -11,6 +11,7 @@ import org.nutz.dao.interceptor.annotation.PrevInsert;
 import org.nutz.json.JsonField;

 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
@@ -35,7 +36,7 @@ public class Sys_user extends BaseModel implements Serializable {
    @Column
    @Comment("工号")
    @ColDefine(type = ColType.VARCHAR, width = 120)
-    @DataCenterColumn(name = "工号", key = "zgh")
+    @DataCenterColumn(name = "工号", key = "gh")
    private String loginname;

    @Column
@@ -47,7 +48,6 @@ public class Sys_user extends BaseModel implements Serializable {
    @Column
    @Comment("性别")
    @ColDefine(type = ColType.VARCHAR, width = 10)
-    @DataCenterColumn(name = "性别", key = "xbmc")
    private String sex;

    @Column
@@ -69,37 +69,36 @@ public class Sys_user extends BaseModel implements Serializable {
    @Column
    @Comment("政治面貌")
    @ColDefine(type = ColType.VARCHAR, width = 100)
-    @DataCenterColumn(name = "政治面貌", key = "zzmmmc")
+    @DataCenterColumn(name = "政治面貌", key = "zzmmm", dict = "USER_POLITICAL")
    private String political;

    @Column
    @ColDefine(type = ColType.DATE)
    @Comment("入党时间")
-    @DataCenterColumn(name = "入党时间", key = "rdsj")
    private Date joinPartyDate;

    @Column
    @Comment("民族")
    @ColDefine(type = ColType.VARCHAR, width = 20)
-    @DataCenterColumn(name = "民族", key = "mzmc")
+    @DataCenterColumn(name = "民族", key = "mzm", dict = "USER_NATION")
    private String nation;

    @Column
    @Comment("籍贯")
    @ColDefine(type = ColType.VARCHAR, width = 100)
-    @DataCenterColumn(name = "籍贯", key = "jgmc")
+    @DataCenterColumn(name = "籍贯", key = "dqm")
    private String nativePlace;

    @Column
    @Comment("国籍")
    @ColDefine(type = ColType.VARCHAR, width = 20)
-    @DataCenterColumn(name = "国籍", key = "gjdqmc")
+    @DataCenterColumn(name = "国籍", key = "gjdqm", dict = "USER_NATIONALITY")
    private String nationality;

    @Column
    @Comment("证件类型")
    @ColDefine(type = ColType.VARCHAR, width = 30)
-    @DataCenterColumn(name = "证件类型", key = "sfzjlxmc")
+    @DataCenterColumn(name = "证件类型", key = "sfzjlxm", dict = "USER_IDENTITY_TYPE")
    private String idCardType;

    @Column
@@ -111,60 +110,79 @@ public class Sys_user extends BaseModel implements Serializable {
    @Column
    @Comment("手机号码")
    @ColDefine(type = ColType.VARCHAR, width = 32)
-    @DataCenterColumn(name = "手机号码", key = "sjh")
+//    @DataCenterColumn(name = "手机号码", key = "sjh")
    private String mobile;

    @Column
    @Comment("学历")
    @ColDefine(type = ColType.VARCHAR, width = 20)
-    @DataCenterColumn(name = "学历", key = "zgxlmc")
+//    @DataCenterColumn(name = "学历", key = "zgxlmc")
    private String education;

    @Column
    @Comment("婚姻状况")
    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @DataCenterColumn(name = "婚姻状况", key = "hyztm", dict = "USER_MARRIAGE")
    private String marriage;

    @Column
    @Comment("学位")
    @ColDefine(type = ColType.VARCHAR, width = 50)
-    @DataCenterColumn(name = "学位", key = "zgxwmc")
+//    @DataCenterColumn(name = "学位", key = "zgxwmc")
    private String academicDegree;

    @Column
-    @Comment("技术职称")
+    @Comment("岗位类别")
    @ColDefine(type = ColType.VARCHAR, width = 50)
-    @DataCenterColumn(name = "技术职称", key = "zyjszwmc")
-    private String technicalTitle;
+    @DataCenterColumn(name = "岗位类别", key = "prgw")
+    private String jobCategory;

    @Column
-    @Comment("技术职称级别")
+    @Comment("职称")
    @ColDefine(type = ColType.VARCHAR, width = 50)
-    @DataCenterColumn(name = "技术职称级别", key = "zyjszwjbmc")
-    private String technicalTitleLevel;
+    @DataCenterColumn(name = "职称", key = "zc")
+    private String professionalTitle;

    @Column
-    @Comment("职务")
+    @Comment("职级")
    @ColDefine(type = ColType.VARCHAR, width = 50)
-    @DataCenterColumn(name = "职务", key = "gbzw")
-    private String position;
+    @DataCenterColumn(name = "职级", key = "zj")
+    private String professionalLevel;

    @Column
-    @Comment("职务级别")
+    @Comment("职工来源")
    @ColDefine(type = ColType.VARCHAR, width = 50)
-    @DataCenterColumn(name = "职务级别", key = "gbzwjbmc")
+    @DataCenterColumn(name = "职工来源", key = "zgly")
+    private String employeeSource;
+
+    @Column
+    @Comment("行政级别（用于管理岗位）")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @DataCenterColumn(name = "行政级别（用于管理岗位）", key = "xzjb")
+    private String administrativeLevel;
+
+    @Column
+    @Comment("岗位系列")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @DataCenterColumn(name = "岗位系列", key = "gwxl")
+    private String positionSeries;
+
+    @Column
+    @Comment("岗级")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @DataCenterColumn(name = "岗级", key = "gj")
    private String positionLevel;

    @Column
-    @Comment("职员级别")
+    @Comment("行政岗级")
    @ColDefine(type = ColType.VARCHAR, width = 50)
-    @DataCenterColumn(name = "职员级别", key = "zydjmc")
-    private String employeeLevel;
+    @DataCenterColumn(name = "行政岗级", key = "xzgj")
+    private String administrativePositionLevel;

    @Column
    @Comment("来校时间")
    @ColDefine(type = ColType.VARCHAR, width = 10)
-    @DataCenterColumn(name = "来校时间", key = "lxny")
+    @DataCenterColumn(name = "来校时间", key = "lxrq")
    private String arrivalAtSchoolDate;

    @Column
@@ -176,21 +194,33 @@ public class Sys_user extends BaseModel implements Serializable {
    @Column
    @Comment("在职状态")
    @ColDefine(type = ColType.VARCHAR, width = 30)
-    @DataCenterColumn(name = "在职状态", key = "jzgdqztmc")
+    @DataCenterColumn(name = "在岗状态", key = "zgzt")
    private String userState;

    @Column
-    @Comment("人员类别")
+    @Comment("教职工类别码")
    @ColDefine(type = ColType.VARCHAR, width = 30)
-    @DataCenterColumn(name = "人员类别", key = "jzglbmc")
+    @DataCenterColumn(name = "教职工类别码", key = "jzglbm", dict = "USER_PERSON_TYPE")
    private String personType;

    @Column
-    @Comment("聘用方式")
+    @Comment("编制类别码")
    @ColDefine(type = ColType.VARCHAR, width = 30)
-    @DataCenterColumn(name = "聘用方式", key = "yrfsmc")
+    @DataCenterColumn(name = "编制类别码", key = "bzlxm", dict = "USER_PREPARED_BY_TYPE")
    private String preparedBy;

+    @Column
+    @Comment("从教年月")
+    @ColDefine(type = ColType.DATE)
+    @DataCenterColumn(name = "从教年月", key = "cjny")
+    private Date teachingTime;
+
+    @Column
+    @Comment("预计离校时间/最后离校时间")
+    @ColDefine(type = ColType.DATE)
+    @DataCenterColumn(name = "预计离校时间/最后离校时间", key = "yjlxsj")
+    private Date expectedLeaveSchoolDate;
+
    @Column
    @Comment("退休时间")
    @ColDefine(type = ColType.DATE)
@@ -199,7 +229,7 @@ public class Sys_user extends BaseModel implements Serializable {
    @Column
    @Comment("博士后进站时间")
    @ColDefine(type = ColType.DATE)
-    @DataCenterColumn(name = "博士后进站时间", key = "bhzjzsj")
+//    @DataCenterColumn(name = "博士后进站时间", key = "bhzjzsj")
    private Date postDoctoralJoinDate;

    @Column
@@ -252,6 +282,16 @@ public class Sys_user extends BaseModel implements Serializable {
    @ColDefine(type = ColType.DATETIME)
    private Date memberTime;

+    @Column
+    @Comment("编制会费")
+    @ColDefine(customType = "decimal(10,2)")
+    private BigDecimal preparationMemberFee;
+
+    @Column
+    @Comment("合同制会费")
+    @ColDefine(customType = "decimal(10,2)")
+    private BigDecimal contractMemberFee;
+
    @Column
    @Comment("是否福利会员")
    @ColDefine(type = ColType.BOOLEAN)
@@ -280,16 +320,6 @@ public class Sys_user extends BaseModel implements Serializable {
    @ColDefine(type = ColType.VARCHAR, customType = "text")
    private String personalData;

-    @Column
-    @Comment("是否是劳模")
-    @ColDefine(type = ColType.BOOLEAN)
-    @Default(value = "0")
-    private Boolean isModelWorker;
-
-    @Column
-    @Comment("劳模资料")
-    @ColDefine(type = ColType.MYSQL_JSON)
-    private List<JSONObject> modelWorkerFiles;

    @Column
    @Comment("常用审批意见")