更新数据字典

oa-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -87,6 +87,10 @@ public class SysUser extends BaseEntity
     @Excel(name = "工程师岗级", readConverterExp = "0=一级,1=二级,2=三级,3=四级,4=五级,5=六级")
     private String engineerLevel;
 
+    /** 技工等级（0一级、1二级、2三级） */
+    @Excel(name = "技工等级", readConverterExp = "0=一级、1二级、2三级")
+    private String operatorLevel;
+
     /** 技术职称 */
     @Excel(name = "技术职称", readConverterExp = "0=正高,1=副高,2=中级,3=助工")
     private String titles;
@@ -111,6 +115,46 @@ public class SysUser extends BaseEntity
     @Excel(name = "年龄")
     private Integer age;
 
+    /** 身份证号码 */
+    @Excel(name = "身份证号码")
+    private String idCard;
+
+    /** 籍贯 */
+    @Excel(name = "籍贯")
+    private String nativePlace;
+
+    /** 政治面貌 */
+    @Excel(name = "政治面貌")
+    private String politicalAffiliation;
+
+    /** 民族 */
+    @Excel(name = "民族")
+    private String ethnic;
+
+    /** 毕业院校 */
+    @Excel(name = "毕业院校")
+    private String graduateSchool;
+
+    /** 专业 */
+    @Excel(name = "专业")
+    private String major;
+
+    /** 学历 */
+    @Excel(name = "学历")
+    private String degree;
+
+    /** 合同签订 */
+    @Excel(name = "合同签订", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date contractSign;
+
+    /** 合同期满 */
+    @Excel(name = "合同期满", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date contractExpire;
+
+    /** 家庭住址 */
+    @Excel(name = "家庭住址")
+    private String homePlace;
+
     /** 部门对象 */
     @Excels({
         @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
@@ -328,6 +372,16 @@ public class SysUser extends BaseEntity
         this.salaryLevel = salaryLevel;
     }
 
+    public void setOperatorLevel(String operatorLevel)
+    {
+        this.operatorLevel = operatorLevel;
+    }
+
+    public String getOperatorLevel()
+    {
+        return operatorLevel;
+    }
+
     public String getTitles()
     {
         return titles;
@@ -445,6 +499,97 @@ public class SysUser extends BaseEntity
         this.roleId = roleId;
     }
 
+    public void setIdCard(String idCard)
+    {
+        this.idCard = idCard;
+    }
+
+    public String getIdCard()
+    {
+        return idCard;
+    }
+    public void setNativePlace(String nativePlace)
+    {
+        this.nativePlace = nativePlace;
+    }
+
+    public String getNativePlace()
+    {
+        return nativePlace;
+    }
+    public void setPoliticalAffiliation(String politicalAffiliation)
+    {
+        this.politicalAffiliation = politicalAffiliation;
+    }
+
+    public String getPoliticalAffiliation()
+    {
+        return politicalAffiliation;
+    }
+    public void setEthnic(String ethnic)
+    {
+        this.ethnic = ethnic;
+    }
+
+    public String getEthnic()
+    {
+        return ethnic;
+    }
+    public void setGraduateSchool(String graduateSchool)
+    {
+        this.graduateSchool = graduateSchool;
+    }
+
+    public String getGraduateSchool()
+    {
+        return graduateSchool;
+    }
+    public void setMajor(String major)
+    {
+        this.major = major;
+    }
+
+    public String getMajor()
+    {
+        return major;
+    }
+    public void setDegree(String degree)
+    {
+        this.degree = degree;
+    }
+
+    public String getDegree()
+    {
+        return degree;
+    }
+    public void setContractSign(Date contractSign)
+    {
+        this.contractSign = contractSign;
+    }
+
+    public Date getContractSign()
+    {
+        return contractSign;
+    }
+    public void setContractExpire(Date contractExpire)
+    {
+        this.contractExpire = contractExpire;
+    }
+
+    public Date getContractExpire()
+    {
+        return contractExpire;
+    }
+    public void setHomePlace(String homePlace)
+    {
+        this.homePlace = homePlace;
+    }
+
+    public String getHomePlace()
+    {
+        return homePlace;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

oa-back/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -30,9 +30,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="engineerLevel"       column="engineer_level"       />
         <result property="postLevel"       column="post_level"       />
         <result property="salaryLevel"       column="salary_level"       />
+		<result property="operatorLevel"    column="operator_level"    />
         <result property="entryDate"       column="entry_date"       />
         <result property="birthday"       column="birthday"       />
         <result property="age"       column="age"       />
+		<result property="idCard"    column="id_card"    />
+		<result property="nativePlace"    column="native_place"    />
+		<result property="politicalAffiliation"    column="political_affiliation"    />
+		<result property="ethnic"    column="ethnic"    />
+		<result property="graduateSchool"    column="graduate_school"    />
+		<result property="major"    column="major"    />
+		<result property="degree"    column="degree"    />
+		<result property="contractSign"    column="contract_sign"    />
+		<result property="contractExpire"    column="contract_expire"    />
+		<result property="homePlace"    column="home_place"    />
         <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
         <association property="salary"    javaType="CmcPostSalary"         resultMap="CmcPostSalaryResult" />
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
@@ -65,9 +76,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.pm_level, u.titles, u.certificates, u.update_reason, u.engineer_level, u.post_level, u.salary_level, u.entry_date, u.birthday, u.age,
-        d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
-        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status, ps.salary
+        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password,
+               u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+               u.pm_level, u.titles, u.certificates, u.update_reason, u.engineer_level, u.post_level, u.salary_level,
+               u.operator_level, u.entry_date, u.birthday, u.age, u.id_card, u.native_place, u.political_affiliation,
+               u.ethnic, u.graduate_school, u.major, u.degree, u.contract_sign, u.contract_expire, u.home_place,
+               d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
+               r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status, ps.salary
         from sys_user u
 		    left join sys_dept d on u.dept_id = d.dept_id
 		    left join cmc_post_salary ps on u.post_level = ps.post_level and u.salary_level = ps.salary_level
@@ -76,7 +91,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.pm_level, u.titles, u.certificates, u.update_reason, u.engineer_level, u.post_level, u.salary_level, u.entry_date, u.birthday, u.age, d.dept_name, d.leader, ps.salary from sys_user u
+		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag,
+		       u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.pm_level, u.titles, u.certificates, u.update_reason,
+		       u.engineer_level, u.post_level, u.salary_level, u.operator_level, u.entry_date, u.birthday, u.age,, u.id_card,
+		       u.native_place, u.political_affiliation, u.ethnic, u.graduate_school, u.major, u.degree, u.contract_sign, u.contract_expire,
+		       u.home_place d.dept_name, d.leader, ps.salary from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		left join cmc_post_salary ps on u.post_level = ps.post_level and u.salary_level = ps.salary_level
 		where u.del_flag = '0'
@@ -186,9 +205,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="engineerLevel != null and engineerLevel != ''">engineer_level,</if>
  			<if test="postLevel != null and postLevel != ''">post_level,</if>
  			<if test="salaryLevel != null and salaryLevel != ''">salary_level,</if>
+			<if test="operatorLevel != null">operator_level,</if>
  			<if test="entryDate != null and entryDate != ''">entry_date,</if>
  			<if test="birthday != null and birthday != ''">birthday,</if>
  			<if test="age != null and age != ''">age,</if>
+			<if test="idCard != null">id_card,</if>
+			<if test="nativePlace != null">native_place,</if>
+			<if test="politicalAffiliation != null">political_affiliation,</if>
+			<if test="ethnic != null">ethnic,</if>
+			<if test="graduateSchool != null">graduate_school,</if>
+			<if test="major != null">major,</if>
+			<if test="degree != null">degree,</if>
+			<if test="contractSign != null">contract_sign,</if>
+			<if test="contractExpire != null">contract_expire,</if>
+			<if test="homePlace != null">home_place,</if>
  			create_time
  		)values(
  			<if test="userId != null and userId != ''">#{userId},</if>
@@ -210,9 +240,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="engineerLevel != null and engineerLevel != ''">#{engineerLevel},</if>
  			<if test="postLevel != null and postLevel != ''">#{postLevel},</if>
  			<if test="salaryLevel != null and salaryLevel != ''">#{salaryLevel},</if>
+			<if test="operatorLevel != null">#{operatorLevel},</if>
  			<if test="entryDate != null and entryDate != ''">#{entryDate},</if>
  			<if test="birthday != null and birthday != ''">#{birthday},</if>
  			<if test="age != null and age != ''">#{age},</if>
+			<if test="idCard != null">#{idCard},</if>
+			<if test="nativePlace != null">#{nativePlace},</if>
+			<if test="politicalAffiliation != null">#{politicalAffiliation},</if>
+			<if test="ethnic != null">#{ethnic},</if>
+			<if test="graduateSchool != null">#{graduateSchool},</if>
+			<if test="major != null">#{major},</if>
+			<if test="degree != null">#{degree},</if>
+			<if test="contractSign != null">#{contractSign},</if>
+			<if test="contractExpire != null">#{contractExpire},</if>
+			<if test="homePlace != null">#{homePlace},</if>
  			sysdate()
  		)
 	</insert>
@@ -240,9 +281,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="engineerLevel != null">engineer_level = #{engineerLevel},</if>
  			<if test="postLevel != null">post_level = #{postLevel},</if>
  			<if test="salaryLevel != null">salary_level = #{salaryLevel},</if>
+			<if test="operatorLevel != null">operator_level = #{operatorLevel},</if>
  			<if test="entryDate != null">entry_date = #{entryDate},</if>
  			<if test="birthday != null">birthday = #{birthday},</if>
  			<if test="age != null">age = #{age},</if>
+			<if test="idCard != null">id_card = #{idCard},</if>
+			<if test="nativePlace != null">native_place = #{nativePlace},</if>
+			<if test="politicalAffiliation != null">political_affiliation = #{politicalAffiliation},</if>
+			<if test="ethnic != null">ethnic = #{ethnic},</if>
+			<if test="graduateSchool != null">graduate_school = #{graduateSchool},</if>
+			<if test="major != null">major = #{major},</if>
+			<if test="degree != null">degree = #{degree},</if>
+			<if test="contractSign != null">contract_sign = #{contractSign},</if>
+			<if test="contractExpire != null">contract_expire = #{contractExpire},</if>
+			<if test="homePlace != null">home_place = #{homePlace},</if>
  			update_time = sysdate()
  		</set>
  		where user_id = #{userId}

oa-back/sql/sql.sql

@@ -1004,13 +1004,16 @@ insert into sys_dict_type values (13, '岗级', 'sys_user_postlevel', '0', 'admi
 insert into sys_dict_type values (14, '薪档', 'sys_user_salarylevel', '0', 'admin', '2024-01-08 15:43:30', '', null, null);
 insert into sys_dict_type values (15, '技术职称', 'sys_user_titles', '0', 'admin', '2024-01-08 15:47:47', '', null, null);
 insert into sys_dict_type values (16, '执业证书', 'sys_user_certificates', '0', 'admin', '2024-01-08 15:47:47', '', null, null);
-insert into sys_dict_type values (17, '考核等级', 'cmc_accessment', '0', 'admin', '2024-01-08 15:58:22', '', null, null);
-insert into sys_dict_type values (18, '技能掌握', 'cmc_skill', '0', 'admin', '2024-01-08 16:07:43', '', null, null);
-insert into sys_dict_type values (19, '工作量', 'cmc_workload', '0', 'admin', '2024-01-08 16:08:51', '', null, null);
-insert into sys_dict_type values (20, '承担角色', 'cmc_role', '0', 'admin', '2024-01-08 16:10:07', '', null, null);
-insert into sys_dict_type values (21, '航飞机型', 'cmc_uav', '0', 'admin', '2024-01-12 15:34:18', '', null, null);
-insert into sys_dict_type values (22,'成果类型','cmc_achi_type','0','admin','2022-10-14 11:16:00','',null,null);
-insert into sys_dict_type values (23,'比例尺或等级','cmc_scale_grade','0','admin','2022-10-14 11:16:12','',null,null);
+insert into sys_dict_type values (17, '学历', 'sys_user_degree', '0', 'admin', '2022-10-14 11:16:12', '', NULL, NULL);
+insert into sys_dict_type values (18, '政治面貌', 'sys_user_political', '0', 'admin', '2022-10-14 11:16:12', '', NULL, NULL);
+insert into sys_dict_type values (19, '技工等级', 'sys_user_operatorlevel', '0', 'admin', '2022-10-14 11:16:12', '', NULL, NULL);
+insert into sys_dict_type values (20, '考核等级', 'cmc_accessment', '0', 'admin', '2024-01-08 15:58:22', '', NULL, NULL);
+insert into sys_dict_type values (21, '技能掌握', 'cmc_skill', '0', 'admin', '2024-01-08 16:07:43', '', NULL, NULL);
+insert into sys_dict_type values (22, '工作量', 'cmc_workload', '0', 'admin', '2024-01-08 16:08:51', '', NULL, NULL);
+insert into sys_dict_type values (23, '承担角色', 'cmc_role', '0', 'admin', '2024-01-08 16:10:07', '', NULL, NULL);
+insert into sys_dict_type values (24, '航飞机型', 'cmc_uav', '0', 'admin', '2024-01-12 15:34:18', '', NULL, NULL);
+insert into sys_dict_type values (25, '成果类型', 'cmc_achi_type', '0', 'admin', '2022-10-14 11:16:00', '', NULL, NULL);
+insert into sys_dict_type values (26, '比例尺或等级', 'cmc_scale_grade', '0', 'admin', '2022-10-14 11:16:12', '', NULL, NULL);
 
 -- ----------------------------
 -- 12、字典数据表
@@ -1094,57 +1097,89 @@ insert into sys_dict_data values (56, 0, '正高', '0', 'sys_user_titles', null,
 insert into sys_dict_data values (57, 1, '副高', '1', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:45', '', null, null);
 insert into sys_dict_data values (58, 2, '中级', '2', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:57', '', null, null);
 insert into sys_dict_data values (59, 3, '助工', '3', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:07', '', null, null);
-insert into sys_dict_data values (60, 0, '注册测绘师', '0', 'sys_user_certificates', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:30', '', null, null);
-insert into sys_dict_data values (61, 1, '注册城乡规划师', '1', 'sys_user_certificates', null, 'default', 'N', '0', 'admin', '2024-01-08 15:50:11', '', null, null);
-insert into sys_dict_data values (62, 2, '注册岩土工程师', '2', 'sys_user_certificates', null, 'default', 'N', '0', 'admin', '2024-01-08 15:50:58', '', null, null);
-insert into sys_dict_data values (63, 3, '注册安全工程师', '3', 'sys_user_certificates', null, 'default', 'N', '0', 'admin', '2024-01-08 15:51:13', '', null, null);
-insert into sys_dict_data values (64, 4, '注册会计师', '4', 'sys_user_certificates', null, 'default', 'N', '0', 'admin', '2024-01-08 15:51:36', '', null, null);
-insert into sys_dict_data values (65, 0, '不合格', '0', 'cmc_accessment', null, 'default', 'N', '0', 'admin', '2024-01-08 15:58:47', '', null, null);
-insert into sys_dict_data values (66, 1, '合格', '1', 'cmc_accessment', null, 'default', 'N', '0', 'admin', '2024-01-08 15:58:56', '', null, null);
-insert into sys_dict_data values (67, 2, '良好', '2', 'cmc_accessment', null, 'default', 'N', '0', 'admin', '2024-01-08 15:59:08', '', null, null);
-insert into sys_dict_data values (68, 3, '优秀', '3', 'cmc_accessment', null, 'default', 'N', '0', 'admin', '2024-01-08 15:59:23', '', null, null);
-insert into sys_dict_data values (69, 0, '生疏', '0', 'cmc_skill', null, 'default', 'N', '0', 'admin', '2024-01-08 16:08:12', '', null, null);
-insert into sys_dict_data values (70, 1, '较熟练', '1', 'cmc_skill', null, 'default', 'N', '0', 'admin', '2024-01-08 16:08:20', '', null, null);
-insert into sys_dict_data values (71, 2, '熟练', '2', 'cmc_skill', null, 'default', 'N', '0', 'admin', '2024-01-08 16:08:28', '', null, null);
-insert into sys_dict_data values (72, 3, '精通', '3', 'cmc_skill', null, 'default', 'N', '0', 'admin', '2024-01-08 16:09:06', '', null, null);
-insert into sys_dict_data values (73, 0, '较少', '0', 'cmc_workload', null, 'default', 'N', '0', 'admin', '2024-01-08 16:09:14', '', null, null);
-insert into sys_dict_data values (74, 1, '正常', '1', 'cmc_workload', null, 'default', 'N', '0', 'admin', '2024-01-08 16:09:22', '', null, null);
-insert into sys_dict_data values (75, 2, '较多', '2', 'cmc_workload', null, 'default', 'N', '0', 'admin', '2024-01-08 16:09:30', '', null, null);
-insert into sys_dict_data values (76, 0, '主办', '00', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-08 16:11:04', '', null, null);
-insert into sys_dict_data values (77, 1, '参与', '01', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-08 16:11:15', '', null, null);
-insert into sys_dict_data values (78, 2, '协办', '02', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-08 16:11:39', '', null, null);
-insert into sys_dict_data values (79, 3, '常规项目', '03', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:15:45', '', null, null);
-insert into sys_dict_data values (80, 4, '监测项目', '04', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:16:47', '', null, null);
-insert into sys_dict_data values (81, 5, '调查项目', '05', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:19:17', '', null, null);
-insert into sys_dict_data values (82, 6, '测量项目', '06', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:20:20', '', null, null);
-insert into sys_dict_data values (83, 7, '其他项目', '07', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:20:32', '', null, null);
-insert into sys_dict_data values (84, 8, '选点', '08', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:23:11', '', null, null);
-insert into sys_dict_data values (85, 9, '埋石', '09', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:23:28', '', null, null);
-insert into sys_dict_data values (86, 10, '观测', '10', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:23:44', '', null, null);
-insert into sys_dict_data values (87, 11, '计算', '11', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:24:21', '', null, null);
-insert into sys_dict_data values (88, 12, '检查', '12', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:24:33', '', null, null);
-insert into sys_dict_data values (89, 13, '负责', '13', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:24:41', '', null, null);
-insert into sys_dict_data values (90, 14, '前视', '14', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:48:05', '', null, null);
-insert into sys_dict_data values (91, 15, '后视', '15', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:48:14', '', null, null);
-insert into sys_dict_data values (92, 16, '水准', '16', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:48:38', '', null, null);
-insert into sys_dict_data values (93, 17, '三角高程', '17', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:48:52', '', null, null);
-insert into sys_dict_data values (94, 18, '实测', '18', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:49:09', '', null, null);
-insert into sys_dict_data values (95, 19, '相控', '19', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:49:29', '', null, null);
-insert into sys_dict_data values (96, 20, '调绘', '20', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:31:53', '', null, null);
-insert into sys_dict_data values (97, 21, '测量', '21', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:32:57', '', null, null);
-insert into sys_dict_data values (98, 22, '整理', '22', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:33:08', '', null, null);
-insert into sys_dict_data values (99, 23, '主飞', '23', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:35:22', '', null, null);
-insert into sys_dict_data values (100, 24, '协飞', '24', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:35:48', '', null, null);
-insert into sys_dict_data values (101, 25, '作业', '25', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:43:01', '', null, null);
-insert into sys_dict_data values (102, 26, '检查', '26', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:44:59', '', null, null);
-insert into sys_dict_data values (103, 27, '负责', '27', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:45:12', '', null, null);
-insert into sys_dict_data values (104, 28, '空三', '28', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:46:14', '', null, null);
-insert into sys_dict_data values (105, 29, '建模', '29', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:46:42', '', null, null);
-insert into sys_dict_data values (106, 30, '修模', '30', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:46:55', '', null, null);
-insert into sys_dict_data values (107, 0, '傲视', '0', 'cmc_uav', null, 'default', 'N', '0', 'admin', '2024-01-12 15:35:35', '', null, null);
-insert into sys_dict_data values (108, 1, '飞马', '1', 'cmc_uav', null, 'default', 'N', '0', 'admin', '2024-01-12 15:35:46', '', null, null);
-insert into sys_dict_data values (109, 2, '华测', '2', 'cmc_uav', null, 'default', 'N', '0', 'admin', '2024-01-12 15:35:56', '', null, null);
-insert into sys_dict_data values (110, 3, '其他', '3', 'cmc_uav', null, 'default', 'N', '0', 'admin', '2024-01-12 15:36:03', '', null, null);
+insert into sys_dict_data values (60, 4, '高级会计师', '4', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:08', '', null, null);
+insert into sys_dict_data values (61, 5, '中级会计师', '5', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:45', '', null, null);
+insert into sys_dict_data values (62, 6, '初级会计师', '6', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:57', '', null, null);
+insert into sys_dict_data values (63, 7, '高级经济师', '7', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:07', '', null, null);
+insert into sys_dict_data values (64, 8, '经济师', '8', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:07', '', null, null);
+insert into sys_dict_data values (65, 9, '工人高级工', '9', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:08', '', null, null);
+insert into sys_dict_data values (66, 10, '工人中级工', '10', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:08', '', null, null);
+insert into sys_dict_data values (67, 11, '无职称', '11', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:45', '', null, null);
+insert into sys_dict_data values (68, 0, '博士', '0', 'sys_user_degree', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:08', '', null, null);
+insert into sys_dict_data values (69, 1, '硕士', '1', 'sys_user_degree', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:45', '', null, null);
+insert into sys_dict_data values (70, 2, '本科', '2', 'sys_user_degree', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:57', '', null, null);
+insert into sys_dict_data values (71, 3, '专科', '3', 'sys_user_degree', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:07', '', null, null);
+insert into sys_dict_data values (72, 5, '高中', '4', 'sys_user_degree', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:08', '', null, null);
+insert into sys_dict_data values (73, 5, '中专', '5', 'sys_user_degree', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:08', '', null, null);
+insert into sys_dict_data values (74, 6, '初中', '6', 'sys_user_degree', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:45', '', null, null);
+insert into sys_dict_data values (75, 0, '党总支书记', '0', 'sys_user_political', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:57', '', null, null);
+insert into sys_dict_data values (76, 1, '党总支干事', '1', 'sys_user_political', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:07', '', null, null);
+insert into sys_dict_data values (77, 2, '党总支委员', '2', 'sys_user_political', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:57', '', null, null);
+insert into sys_dict_data values (78, 3, '第一党支部书记', '3', 'sys_user_political', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:07', '', null, null);
+insert into sys_dict_data values (79, 4, '第二党支部书记', '4', 'sys_user_political', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:57', '', null, null);
+insert into sys_dict_data values (80, 5, '第一党支部组织委员', '5', 'sys_user_political', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:07', '', null, null);
+insert into sys_dict_data values (81, 6, '第二党支部组织委员', '6', 'sys_user_political', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:57', '', null, null);
+insert into sys_dict_data values (82, 7, '第一党支部宣传委员', '7', 'sys_user_political', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:07', '', null, null);
+insert into sys_dict_data values (83, 8, '第二党支部宣传委员', '8', 'sys_user_political', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:57', '', null, null);
+insert into sys_dict_data values (84, 9, '第一党支部党员', '9', 'sys_user_political', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:07', '', null, null);
+insert into sys_dict_data values (85, 10, '第二党支部党员', '10', 'sys_user_political', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:57', '', null, null);
+insert into sys_dict_data values (86, 11, '预备党员', '11', 'sys_user_political', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:07', '', null, null);
+insert into sys_dict_data values (87, 12, '共青团员', '12', 'sys_user_political', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:57', '', null, null);
+insert into sys_dict_data values (88, 13, '群众', '13', 'sys_user_political', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:07', '', null, null);
+insert into sys_dict_data values (89, 0, '一级', '0', 'sys_user_operatorlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:07', '', null, null);
+insert into sys_dict_data values (90, 1, '二级', '1', 'sys_user_operatorlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:57', '', null, null);
+insert into sys_dict_data values (91, 2, '三级', '2', 'sys_user_operatorlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:07', '', null, null);
+insert into sys_dict_data values (92, 0, '注册测绘师', '0', 'sys_user_certificates', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:30', '', null, null);
+insert into sys_dict_data values (93, 1, '注册城乡规划师', '1', 'sys_user_certificates', null, 'default', 'N', '0', 'admin', '2024-01-08 15:50:11', '', null, null);
+insert into sys_dict_data values (94, 2, '注册岩土工程师', '2', 'sys_user_certificates', null, 'default', 'N', '0', 'admin', '2024-01-08 15:50:58', '', null, null);
+insert into sys_dict_data values (95, 3, '注册安全工程师', '3', 'sys_user_certificates', null, 'default', 'N', '0', 'admin', '2024-01-08 15:51:13', '', null, null);
+insert into sys_dict_data values (96, 4, '注册会计师', '4', 'sys_user_certificates', null, 'default', 'N', '0', 'admin', '2024-01-08 15:51:36', '', null, null);
+insert into sys_dict_data values (97, 0, '不合格', '0', 'cmc_accessment', null, 'default', 'N', '0', 'admin', '2024-01-08 15:58:47', '', null, null);
+insert into sys_dict_data values (98, 1, '合格', '1', 'cmc_accessment', null, 'default', 'N', '0', 'admin', '2024-01-08 15:58:56', '', null, null);
+insert into sys_dict_data values (99, 2, '良好', '2', 'cmc_accessment', null, 'default', 'N', '0', 'admin', '2024-01-08 15:59:08', '', null, null);
+insert into sys_dict_data values (100, 3, '优秀', '3', 'cmc_accessment', null, 'default', 'N', '0', 'admin', '2024-01-08 15:59:23', '', null, null);
+insert into sys_dict_data values (101, 0, '生疏', '0', 'cmc_skill', null, 'default', 'N', '0', 'admin', '2024-01-08 16:08:12', '', null, null);
+insert into sys_dict_data values (102, 1, '较熟练', '1', 'cmc_skill', null, 'default', 'N', '0', 'admin', '2024-01-08 16:08:20', '', null, null);
+insert into sys_dict_data values (103, 2, '熟练', '2', 'cmc_skill', null, 'default', 'N', '0', 'admin', '2024-01-08 16:08:28', '', null, null);
+insert into sys_dict_data values (104, 3, '精通', '3', 'cmc_skill', null, 'default', 'N', '0', 'admin', '2024-01-08 16:09:06', '', null, null);
+insert into sys_dict_data values (105, 0, '较少', '0', 'cmc_workload', null, 'default', 'N', '0', 'admin', '2024-01-08 16:09:14', '', null, null);
+insert into sys_dict_data values (106, 1, '正常', '1', 'cmc_workload', null, 'default', 'N', '0', 'admin', '2024-01-08 16:09:22', '', null, null);
+insert into sys_dict_data values (107, 2, '较多', '2', 'cmc_workload', null, 'default', 'N', '0', 'admin', '2024-01-08 16:09:30', '', null, null);
+insert into sys_dict_data values (108, 0, '主办', '00', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-08 16:11:04', '', null, null);
+insert into sys_dict_data values (109, 1, '参与', '01', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-08 16:11:15', '', null, null);
+insert into sys_dict_data values (110, 2, '协办', '02', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-08 16:11:39', '', null, null);
+insert into sys_dict_data values (111, 3, '常规项目', '03', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:15:45', '', null, null);
+insert into sys_dict_data values (112, 4, '监测项目', '04', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:16:47', '', null, null);
+insert into sys_dict_data values (113, 5, '调查项目', '05', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:19:17', '', null, null);
+insert into sys_dict_data values (114, 6, '测量项目', '06', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:20:20', '', null, null);
+insert into sys_dict_data values (115, 7, '其他项目', '07', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:20:32', '', null, null);
+insert into sys_dict_data values (116, 8, '选点', '08', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:23:11', '', null, null);
+insert into sys_dict_data values (117, 9, '埋石', '09', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:23:28', '', null, null);
+insert into sys_dict_data values (118, 10, '观测', '10', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:23:44', '', null, null);
+insert into sys_dict_data values (119, 11, '计算', '11', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:24:21', '', null, null);
+insert into sys_dict_data values (120, 12, '检查', '12', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:24:33', '', null, null);
+insert into sys_dict_data values (121, 13, '负责', '13', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:24:41', '', null, null);
+insert into sys_dict_data values (122, 14, '前视', '14', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:48:05', '', null, null);
+insert into sys_dict_data values (123, 15, '后视', '15', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:48:14', '', null, null);
+insert into sys_dict_data values (124, 16, '水准', '16', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:48:38', '', null, null);
+insert into sys_dict_data values (125, 17, '三角高程', '17', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:48:52', '', null, null);
+insert into sys_dict_data values (126, 18, '实测', '18', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:49:09', '', null, null);
+insert into sys_dict_data values (127, 19, '相控', '19', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:49:29', '', null, null);
+insert into sys_dict_data values (128, 20, '调绘', '20', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:31:53', '', null, null);
+insert into sys_dict_data values (129, 21, '测量', '21', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:32:57', '', null, null);
+insert into sys_dict_data values (130, 22, '整理', '22', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:33:08', '', null, null);
+insert into sys_dict_data values (131, 23, '主飞', '23', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:35:22', '', null, null);
+insert into sys_dict_data values (132, 24, '协飞', '24', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:35:48', '', null, null);
+insert into sys_dict_data values (133, 25, '作业', '25', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:43:01', '', null, null);
+insert into sys_dict_data values (134, 26, '检查', '26', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:44:59', '', null, null);
+insert into sys_dict_data values (135, 27, '负责', '27', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:45:12', '', null, null);
+insert into sys_dict_data values (136, 28, '空三', '28', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:46:14', '', null, null);
+insert into sys_dict_data values (137, 29, '建模', '29', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:46:42', '', null, null);
+insert into sys_dict_data values (138, 30, '修模', '30', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:46:55', '', null, null);
+insert into sys_dict_data values (139, 0, '傲视', '0', 'cmc_uav', null, 'default', 'N', '0', 'admin', '2024-01-12 15:35:35', '', null, null);
+insert into sys_dict_data values (140, 1, '飞马', '1', 'cmc_uav', null, 'default', 'N', '0', 'admin', '2024-01-12 15:35:46', '', null, null);
+insert into sys_dict_data values (141, 2, '华测', '2', 'cmc_uav', null, 'default', 'N', '0', 'admin', '2024-01-12 15:35:56', '', null, null);
+insert into sys_dict_data values (142, 3, '其他', '3', 'cmc_uav', null, 'default', 'N', '0', 'admin', '2024-01-12 15:36:03', '', null, null);
 insert into sys_dict_data values (203, 3, '经营流程', 'business', 'sys_process_category', null, 'default', 'N', '0', 'admin', '2024-01-23 10:59:48', '', null, null);
 insert into sys_dict_data values (204, 4, '生产流程', 'project', 'sys_process_category', null, 'default', 'N', '0', 'admin', '2024-01-23 10:59:48', '', null, null);
 insert into sys_dict_data values (205, 5, '考核流程', 'assess', 'sys_process_category', null, 'default', 'N', '0', 'admin', '2024-01-23 11:02:55', '', null, null);