薪资管理调整

hx-oa/src/main/java/com/fjhx/oa/entity/user/po/UserSalaryManage.java

@@ -1,6 +1,6 @@
 package com.fjhx.oa.entity.user.po;
 
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,7 +12,6 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@TableName("sys_user")
 public class UserSalaryManage {
 
     private Long userId;
@@ -49,12 +48,19 @@ public class UserSalaryManage {
      */
     private Integer probationPeriod;
     /**
+     * 入职时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date entryDate;
+    /**
      * 生效日期
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date effectiveDate;
     /**
      * 转正日期
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date fullTimeDate;
     /**
      * 月休
@@ -67,18 +73,22 @@ public class UserSalaryManage {
     /**
      * 上午开始工作时间
      */
+    @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;
     /**
      * 薪资结算方式

hx-oa/src/main/resources/mapper/user/UserSalaryManageMapper.xml

@@ -43,18 +43,15 @@
             <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="effectiveDate != null and effectiveDate != ''">effective_date = #{effectiveDate},</if>
-            <if test="fullTimeDate != null and fullTimeDate != ''">full_time_date = #{fullTimeDate},</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 and morningBeginTime != ''">morning_begin_time = #{morningBeginTime},
-            </if>
-            <if test="morningEndTime != null and morningEndTime != ''">morning_end_time = #{morningEndTime},</if>
-            <if test="afternoonBeginTime != null and afternoonBeginTime != ''">afternoon_begin_time
-                =#{afternoonBeginTime},
-            </if>
-            <if test="afternoonEndTime != null and afternoonEndTime != ''">afternoon_end_time = #{afternoonEndTime},
-            </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()