用户表添加工资相关字段

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

@@ -2,6 +2,7 @@ package com.ruoyi.common.core.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.ColumnType;
 import com.ruoyi.common.annotation.Excel.Type;
@@ -12,6 +13,7 @@ import com.ruoyi.common.xss.Xss;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -214,26 +216,88 @@ public class SysUser extends BaseEntity {
      */
     private String jdSubjectName;
 
+    /**
+     * 10实习员工、20试用员工、30正式员工
+     */
+    private String employeeType;
+    /**
+     * 试用期薪资比例
+     */
+    private Integer probationRatio;
+    /**
+     * 实习期薪资比例
+     */
+    private Integer internshipRatio;
+    /**
+     * 薪资合计
+     */
+    private BigDecimal amount;
+    /**
+     * 学历
+     */
+    private String education;
+    /**
+     * 岗位
+     */
+    private String post;
+    /**
+     * 试用期
+     */
+    private Integer probationPeriod;
+    /**
+     * 生效日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date effectiveDate;
+    /**
+     * 转正日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date fullTimeDate;
+    /**
+     * 月休
+     */
+    private Integer monthRest;
+    /**
+     * 日工作时长
+     */
+    private Integer dailyHours;
+    /**
+     * 上午开始工作时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "HH:mm:ss")
+    private Date morningBeginTime;
+    /**
+     * 上午结束工作时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "HH:mm:ss")
+    private Date morningEndTime;
+    /**
+     * 下午开始工作时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "HH:mm:ss")
+    private Date afternoonBeginTime;
+    /**
+     * 下午结束工作时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "HH:mm:ss")
+    private Date afternoonEndTime;
+    /**
+     * 薪资结算方式
+     */
+    private String settleMethod;
+    /**
+     * 薪资说明
+     */
+    private String salaryRemark;
+    /**
+     * 入职时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date entryDate;
 
-    //==================================================
-
-
-    public String getJdSubjectCode() {
-        return jdSubjectCode;
-    }
-
-    public void setJdSubjectCode(String jdSubjectCode) {
-        this.jdSubjectCode = jdSubjectCode;
-    }
-
-    public String getJdSubjectName() {
-        return jdSubjectName;
-    }
-
-    public void setJdSubjectName(String jdSubjectName) {
-        this.jdSubjectName = jdSubjectName;
-    }
 
+    //==================================================
     @TableField(exist = false)
     private List<SysUserIdentity> identityList;
 
@@ -257,6 +321,165 @@ public class SysUser extends BaseEntity {
 
     //================================================================
 
+    public Date getEntryDate() {
+        return entryDate;
+    }
+
+    public void setEntryDate(Date entryDate) {
+        this.entryDate = entryDate;
+    }
+
+    public String getJdSubjectCode() {
+        return jdSubjectCode;
+    }
+
+    public void setJdSubjectCode(String jdSubjectCode) {
+        this.jdSubjectCode = jdSubjectCode;
+    }
+
+    public String getJdSubjectName() {
+        return jdSubjectName;
+    }
+
+    public void setJdSubjectName(String jdSubjectName) {
+        this.jdSubjectName = jdSubjectName;
+    }
+
+    public String getEmployeeType() {
+        return employeeType;
+    }
+
+    public void setEmployeeType(String employeeType) {
+        this.employeeType = employeeType;
+    }
+
+    public Integer getProbationRatio() {
+        return probationRatio;
+    }
+
+    public void setProbationRatio(Integer probationRatio) {
+        this.probationRatio = probationRatio;
+    }
+
+    public Integer getInternshipRatio() {
+        return internshipRatio;
+    }
+
+    public void setInternshipRatio(Integer internshipRatio) {
+        internshipRatio = internshipRatio;
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public String getEducation() {
+        return education;
+    }
+
+    public void setEducation(String education) {
+        this.education = education;
+    }
+
+    public String getPost() {
+        return post;
+    }
+
+    public void setPost(String post) {
+        this.post = post;
+    }
+
+    public Integer getProbationPeriod() {
+        return probationPeriod;
+    }
+
+    public void setProbationPeriod(Integer probationPeriod) {
+        this.probationPeriod = probationPeriod;
+    }
+
+    public Date getEffectiveDate() {
+        return effectiveDate;
+    }
+
+    public void setEffectiveDate(Date effectiveDate) {
+        this.effectiveDate = effectiveDate;
+    }
+
+    public Date getFullTimeDate() {
+        return fullTimeDate;
+    }
+
+    public void setFullTimeDate(Date fullTimeDate) {
+        this.fullTimeDate = fullTimeDate;
+    }
+
+    public Integer getMonthRest() {
+        return monthRest;
+    }
+
+    public void setMonthRest(Integer monthRest) {
+        this.monthRest = monthRest;
+    }
+
+    public Integer getDailyHours() {
+        return dailyHours;
+    }
+
+    public void setDailyHours(Integer dailyHours) {
+        this.dailyHours = dailyHours;
+    }
+
+    public Date getMorningBeginTime() {
+        return morningBeginTime;
+    }
+
+    public void setMorningBeginTime(Date morningBeginTime) {
+        this.morningBeginTime = morningBeginTime;
+    }
+
+    public Date getMorningEndTime() {
+        return morningEndTime;
+    }
+
+    public void setMorningEndTime(Date morningEndTime) {
+        this.morningEndTime = morningEndTime;
+    }
+
+    public Date getAfternoonBeginTime() {
+        return afternoonBeginTime;
+    }
+
+    public void setAfternoonBeginTime(Date afternoonBeginTime) {
+        this.afternoonBeginTime = afternoonBeginTime;
+    }
+
+    public Date getAfternoonEndTime() {
+        return afternoonEndTime;
+    }
+
+    public void setAfternoonEndTime(Date afternoonEndTime) {
+        this.afternoonEndTime = afternoonEndTime;
+    }
+
+    public String getSettleMethod() {
+        return settleMethod;
+    }
+
+    public void setSettleMethod(String settleMethod) {
+        this.settleMethod = settleMethod;
+    }
+
+    public String getSalaryRemark() {
+        return salaryRemark;
+    }
+
+    public void setSalaryRemark(String salaryRemark) {
+        this.salaryRemark = salaryRemark;
+    }
 
     public List<SysUserIdentity> getIdentityList() {
         return identityList;

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

@@ -116,7 +116,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader_id,
 		d.director_id, d.type,u.job_number,u.user_type,u.tenant_id,u.user_code,u.company_id,u.company_set,
 		u.account_name,u.account_bank,u.account_number,u.purchase_range,u.sale_lv,u.identity,
-		u.jd_subject_code,u.jd_subject_name
+		u.jd_subject_code,u.jd_subject_name,
+		u.employee_type,
+		u.probation_ratio,
+		u.internship_ratio,
+		u.amount,
+		u.education,
+		u.post,
+		u.probation_period,
+		u.entry_date,
+		u.effective_date,
+		u.full_time_date,
+		u.month_rest,
+		u.daily_hours,
+		u.morning_begin_time,
+		u.morning_end_time,
+		u.afternoon_begin_time,
+		u.afternoon_end_time,
+		u.settle_method,
+		u.salary_remark
 		from
 		sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
@@ -353,6 +371,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="identity != null">identity,</if>
 		<if test="jdSubjectCode != null">jd_subject_code,</if>
 		<if test="jdSubjectName != null">jd_subject_name,</if>
+
+		<if test="employeeType != null and employeeType != ''">employee_type,</if>
+		<if test="probationRatio != null and probationRatio != ''">probation_ratio,</if>
+		<if test="internshipRatio != null and internshipRatio != ''">internship_ratio,</if>
+		<if test="amount != null and amount != ''">amount,</if>
+		<if test="education != null and education != ''">education,</if>
+		<if test="post != null and post != ''">post,</if>
+		<if test="probationPeriod != null and probationPeriod != ''">probation_period,</if>
+		<if test="entryDate != null">entry_date,</if>
+		<if test="effectiveDate != null">effective_date,</if>
+		<if test="fullTimeDate != null">full_time_date,</if>
+		<if test="monthRest != null and monthRest != ''">month_rest,</if>
+		<if test="dailyHours != null and dailyHours != ''">daily_hours,</if>
+		<if test="morningBeginTime != null">morning_begin_time,</if>
+		<if test="morningEndTime != null">morning_end_time,</if>
+		<if test="afternoonBeginTime != null">afternoon_begin_time,</if>
+		<if test="afternoonEndTime != null">afternoon_end_time,</if>
+		<if test="settleMethod != null and settleMethod != ''">settle_method,</if>
+		<if test="salaryRemark != null and salaryRemark != ''">salary_remark,</if>
 		create_time
         )values(
         <if test="userId != null and userId != ''">#{userId},</if>
@@ -382,6 +419,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="identity != null">#{identity},</if>
 		<if test="jdSubjectCode != null">#{jdSubjectCode},</if>
 		<if test="jdSubjectName != null">#{jdSubjectName},</if>
+
+		<if test="employeeType != null and employeeType != ''">#{employeeType},</if>
+		<if test="probationRatio != null and probationRatio != ''">#{probationRatio},</if>
+		<if test="internshipRatio != null and internshipRatio != ''">#{internshipRatio},</if>
+		<if test="amount != null and amount != ''">#{amount},</if>
+		<if test="education != null and education != ''">#{education},</if>
+		<if test="post != null and post != ''">#{post},</if>
+		<if test="probationPeriod != null and probationPeriod != ''">#{probationPeriod},</if>
+		<if test="entryDate != null">#{entryDate},</if>
+		<if test="effectiveDate != null">#{effectiveDate},</if>
+		<if test="fullTimeDate != null">#{fullTimeDate},</if>
+		<if test="monthRest != null and monthRest != ''">#{monthRest},</if>
+		<if test="dailyHours != null and dailyHours != ''">#{dailyHours},</if>
+		<if test="morningBeginTime != null">#{morningBeginTime},</if>
+		<if test="morningEndTime != null">#{morningEndTime},</if>
+		<if test="afternoonBeginTime != null">#{afternoonBeginTime},</if>
+		<if test="afternoonEndTime != null">#{afternoonEndTime},</if>
+		<if test="settleMethod != null and settleMethod != ''">#{settleMethod},</if>
+		<if test="salaryRemark != null and salaryRemark != ''">#{salaryRemark},</if>
 		sysdate()
         )
     </insert>
@@ -420,6 +476,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 			<if test="jdSubjectCode != null">jd_subject_code = #{jdSubjectCode},</if>
 			<if test="jdSubjectName != null">jd_subject_name = #{jdSubjectName},</if>
+
+			<if test="employeeType != null and employeeType != ''">employee_type = #{employeeType},</if>
+			<if test="probationRatio != null and probationRatio != ''">probation_ratio = #{probationRatio},</if>
+			<if test="internshipRatio != null and internshipRatio != ''">internship_ratio = #{internshipRatio},</if>
+			<if test="amount != null and amount != ''">amount = #{amount},</if>
+			<if test="education != null and education != ''">education = #{education},</if>
+			<if test="post != null and post != ''">post = #{post},</if>
+			<if test="probationPeriod != null and probationPeriod != ''">probation_period = #{probationPeriod},</if>
+			<if test="entryDate != null">entry_date = #{entryDate},</if>
+			<if test="effectiveDate != null">effective_date = #{effectiveDate},</if>
+			<if test="fullTimeDate != null">full_time_date = #{fullTimeDate},</if>
+			<if test="monthRest != null and monthRest != ''">month_rest = #{monthRest},</if>
+			<if test="dailyHours != null and dailyHours != ''">daily_hours = #{dailyHours},</if>
+			<if test="morningBeginTime != null">morning_begin_time = #{morningBeginTime},</if>
+			<if test="morningEndTime != null">morning_end_time = #{morningEndTime},</if>
+			<if test="afternoonBeginTime != null">afternoon_begin_time = #{afternoonBeginTime},</if>
+			<if test="afternoonEndTime != null">afternoon_end_time = #{afternoonEndTime},</if>
+			<if test="settleMethod != null and settleMethod != ''">settle_method = #{settleMethod},</if>
+			<if test="salaryRemark != null and salaryRemark != ''">salary_remark = #{salaryRemark},</if>
 			update_time = sysdate()
         </set>
         where user_id = #{userId}