新增用户字段初始学历、专业、院校、职称专业

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

@@ -101,6 +101,10 @@ public class SysUser extends BaseEntity
     @Excel(name = "技术职称", readConverterExp = "0=正高级工程师,1=高级工程师,2=中级工程师,3=助理工程师,4=高级会计师,5=会计师,6=助理会计师,7=高级经济师,8=经济师,9=助理经济师,10=工人高级工,11=工人中级工,12=工人初级工,13=无职称")
     private String titles;
 
+    /** 职称专业 */
+    @Excel(name = "职称专业")
+    private String titleProfession;
+
     /** 执业证书 */
     @Excel(name = "执业证书", readConverterExp = "0=注册测绘师,1=注册城乡规划师,2=注册岩土工程师,3=注册安全工程师,4=注册会计师")
     private String certificates;
@@ -137,18 +141,30 @@ public class SysUser extends BaseEntity
     @Excel(name = "民族")
     private String ethnic;
 
-    /** 毕业院校 */
-    @Excel(name = "毕业院校")
+    /** 最高学历院校 */
+    @Excel(name = "最高学历院校")
     private String graduateSchool;
 
-    /** 专业 */
-    @Excel(name = "专业")
+    /** 最高学历专业 */
+    @Excel(name = "最高学历专业")
     private String major;
 
-    /** 学历 */
-    @Excel(name = "学历", readConverterExp = "0=博士,1=硕士,2=本科,3=专科,4=高中,5=中专,6=初中")
+    /** 最高学历 */
+    @Excel(name = "最高学历", readConverterExp = "0=博士,1=硕士,2=本科,3=专科,4=高中,5=中专,6=初中")
     private String degree;
 
+    /** 初始学历院校 */
+    @Excel(name = "初始学历院校")
+    private String initialSchool;
+
+    /** 初始学历专业 */
+    @Excel(name = "初始学历专业")
+    private String initialMajor;
+
+    /** 初始学历 */
+    @Excel(name = "初始学历", readConverterExp = "0=博士,1=硕士,2=本科,3=专科,4=高中,5=中专,6=初中")
+    private String initialDegree;
+
     /** 合同签订 */
     @Excel(name = "合同签订", width = 30, dateFormat = "yyyy-MM-dd")
     private Date contractSign;
@@ -614,6 +630,42 @@ public class SysUser extends BaseEntity
     {
         return postNames;
     }
+    public void setInitialDegree(String initialDegree)
+    {
+        this.initialDegree = initialDegree;
+    }
+
+    public String getInitialDegree()
+    {
+        return initialDegree;
+    }
+    public void setInitialMajor(String initialMajor)
+    {
+        this.initialMajor = initialMajor;
+    }
+
+    public String getInitialMajor()
+    {
+        return initialMajor;
+    }
+    public void setInitialSchool(String initialSchool)
+    {
+        this.initialSchool = initialSchool;
+    }
+
+    public String getInitialSchool()
+    {
+        return initialSchool;
+    }
+    public void setTitleProfession(String titleProfession)
+    {
+        this.titleProfession = titleProfession;
+    }
+
+    public String getTitleProfession()
+    {
+        return titleProfession;
+    }
 
     @Override
     public String toString() {

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

@@ -45,6 +45,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="contractSign"    column="contract_sign"    />
 		<result property="contractExpire"    column="contract_expire"    />
 		<result property="homePlace"    column="home_place"    />
+		<result property="initialDegree"    column="initial_degree"    />
+		<result property="initialMajor"    column="initial_major"    />
+		<result property="initialSchool"    column="initial_school"    />
+		<result property="titleProfession"    column="title_profession"    />
         <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
         <association property="salary"    javaType="CmcPostSalary"         resultMap="CmcPostSalaryResult" />
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
@@ -81,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                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,
+               u.ethnic, u.graduate_school, u.major, u.degree, u.contract_sign, u.contract_expire, u.home_place, u.initial_degree, u.initial_major, u.initial_school, u.title_profession,
                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
@@ -96,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		       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
+		       u.home_place, d.dept_name, d.leader, ps.salary, u.initial_degree, u.initial_major, u.initial_school, u.title_profession 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' and u.user_id != 1
@@ -146,7 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		       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
+		       u.home_place, d.dept_name, d.leader, ps.salary, u.initial_degree, u.initial_major, u.initial_school, u.title_profession 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' and u.user_id != 1 AND (u.status = '0' or u.status = '3' or u.status = '4')
@@ -281,6 +285,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="contractExpire != null">contract_expire,</if>
 			<if test="homePlace != null">home_place,</if>
 			<if test="pinyin != null">pinyin,</if>
+			<if test="initialDegree != null">initial_degree,</if>
+			<if test="initialMajor != null">initial_major,</if>
+			<if test="initialSchool != null">initial_school,</if>
+			<if test="titleProfession != null">title_profession,</if>
  			create_time
  		)values(
  			<if test="userId != null and userId != ''">#{userId},</if>
@@ -317,6 +325,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="contractExpire != null">#{contractExpire},</if>
 			<if test="homePlace != null">#{homePlace},</if>
 			<if test="pinyin != null">#{pinyin},</if>
+			<if test="initialDegree != null">#{initialDegree},</if>
+			<if test="initialMajor != null">#{initialMajor},</if>
+			<if test="initialSchool != null">#{initialSchool},</if>
+			<if test="titleProfession != null">#{titleProfession},</if>
  			sysdate()
  		)
 	</insert>
@@ -359,6 +371,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="contractExpire != null">contract_expire = #{contractExpire},</if>
 			<if test="homePlace != null">home_place = #{homePlace},</if>
 			<if test="pinyin != null">pinyin = #{pinyin},</if>
+			<if test="initialDegree != null">initial_degree = #{initialDegree},</if>
+			<if test="initialMajor != null">initial_major = #{initialMajor},</if>
+			<if test="initialSchool != null">initial_school = #{initialSchool},</if>
+			<if test="titleProfession != null">title_profession = #{titleProfession},</if>
  			update_time = sysdate()
  		</set>
  		where user_id = #{userId}

oa-back/sql/sq.sql

@@ -1,58 +1,7 @@
-INSERT INTO sys_role VALUES (15, '项目负责人', 'projectLeader', 15, '1', 1, 1, '0', '0', 'admin', '2024-12-30 11:20:35', 'admin', '2024-12-30 11:21:07', NULL);
-INSERT INTO sys_role_menu VALUES (15, 4);
-INSERT INTO sys_role_menu VALUES (15, 15);
-INSERT INTO sys_role_menu VALUES (15, 146);
-INSERT INTO sys_role_menu VALUES (15, 147);
-INSERT INTO sys_role_menu VALUES (15, 1160);
-INSERT INTO sys_role_menu VALUES (15, 1161);
-INSERT INTO sys_role_menu VALUES (15, 1162);
-INSERT INTO sys_role_menu VALUES (15, 1163);
-INSERT INTO sys_role_menu VALUES (15, 1164);
-insert into sys_user_role values(33,15);
-insert into sys_user_role values(66,15);
-insert into sys_user_role values(84,15);
-insert into sys_user_role values(116,15);
-insert into sys_user_role values(144,15);
-insert into sys_user_role values(15,15);
-insert into sys_user_role values(32,15);
-insert into sys_user_role values(101,15);
-insert into sys_user_role values(112,15);
-insert into sys_user_role values(61,15);
-insert into sys_user_role values(138,15);
-insert into sys_user_role values(71,15);
-insert into sys_user_role values(102,15);
-insert into sys_user_role values(80,15);
-insert into sys_user_role values(59,15);
-insert into sys_user_role values(83,15);
-insert into sys_user_role values(143,15);
-insert into sys_user_role values(76,15);
-insert into sys_user_role values(94,15);
-insert into sys_user_role values(60,15);
-insert into sys_user_role values(63,15);
-insert into sys_user_role values(72,15);
-insert into sys_user_role values(120,15);
-insert into sys_user_role values(121,15);
-insert into sys_user_role values(122,15);
-insert into sys_user_role values(109,15);
-insert into sys_user_role values(145,15);
-insert into sys_user_role values(39,15);
-insert into sys_user_role values(35,15);
-insert into sys_user_role values(46,15);
-insert into sys_user_role values(149,15);
-insert into sys_user_role values(81,15);
-insert into sys_user_role values(142,15);
-insert into sys_user_role values(113,15);
-insert into sys_user_role values(95,15);
-insert into sys_user_role values(50,15);
-insert into sys_user_role values(20,15);
-insert into sys_user_role values(34,15);
-insert into sys_user_role values(49,15);
-insert into sys_user_role values(47,15);
-insert into sys_user_role values(139,15);
-insert into sys_user_role values(21,15);
-insert into sys_user_role values(70,15);
-insert into sys_user_role values(11,15);
-insert into sys_user_role values(51,15);
-insert into sys_user_role values(55,15);
-insert into sys_user_role values(9,15);
-insert into sys_user_role values(13,15);
+alter table sys_user modify column degree char(1) default null comment '最高学历';
+alter table sys_user modify column major varchar(20) default null comment '最高学历专业';
+alter table sys_user modify column graduate_school varchar(20) default null comment '最高学历院校';
+alter table sys_user add column initial_degree char(1) default null comment '初始学历';
+alter table sys_user add column initial_major varchar(20) default null comment '初始学历专业';
+alter table sys_user add column initial_school varchar(20) default null comment '初始学历院校';
+alter table sys_user add column title_profession varchar(20) default null comment '职称专业';