Commit bb26ebcc authored by hongguangwu's avatar hongguangwu

1.7.22-发薪日

parent 2a899af0
...@@ -569,4 +569,11 @@ public class TAutoContractScheme extends BaseEntity { ...@@ -569,4 +569,11 @@ public class TAutoContractScheme extends BaseEntity {
@Schema(description = "其他工作时间 (工作方式为第二种方式)") @Schema(description = "其他工作时间 (工作方式为第二种方式)")
private String otherWorkDay; private String otherWorkDay;
// MVP1.7.22版本新字段:
@ExcelAttribute(name = "发薪日", maxLength = 2)
@Length(max = 2, message = "发薪日不能超过2个字符")
@ExcelProperty("发薪日")
@Schema(description = "发薪日")
private String salaryDay;
} }
package com.yifu.cloud.plus.v1.yifu.archives.entity; package com.yifu.cloud.plus.v1.yifu.archives.entity;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
...@@ -8,6 +9,7 @@ import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity; ...@@ -8,6 +9,7 @@ import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
...@@ -377,4 +379,11 @@ public class TEmployeeContractPre extends BaseEntity { ...@@ -377,4 +379,11 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema(description = "是否已确认离职: 0 是 1 ") @Schema(description = "是否已确认离职: 0 是 1 ")
private String isLeave; private String isLeave;
// MVP1.7.22版本新字段:
@ExcelAttribute(name = "发薪日", maxLength = 2)
@Length(max = 2, message = "发薪日不能超过2个字符")
@ExcelProperty("发薪日")
@Schema(description = "发薪日")
private String salaryDay;
} }
...@@ -735,4 +735,11 @@ public class TEmployeeContractPreNew extends BaseEntity { ...@@ -735,4 +735,11 @@ public class TEmployeeContractPreNew extends BaseEntity {
@ExcelAttribute(name = "邮箱") @ExcelAttribute(name = "邮箱")
private String empEmail; private String empEmail;
// MVP1.7.22版本新字段:
@ExcelAttribute(name = "发薪日", maxLength = 2)
@Length(max = 2, message = "发薪日不能超过2个字符")
@ExcelProperty("发薪日")
@Schema(description = "发薪日")
private String salaryDay;
} }
...@@ -574,4 +574,11 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable { ...@@ -574,4 +574,11 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
@ExcelProperty("法大大模版ID") @ExcelProperty("法大大模版ID")
private String fadadaTemplateId; private String fadadaTemplateId;
// MVP1.7.22版本新字段:
@ExcelAttribute(name = "发薪日", maxLength = 2)
@Length(max = 2, message = "发薪日不能超过2个字符")
@ExcelProperty("发薪日")
@Schema(description = "发薪日")
private String salaryDay;
} }
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
<result property="workDay" column="WORK_DAY"/> <result property="workDay" column="WORK_DAY"/>
<result property="workHours" column="WORK_HOURS"/> <result property="workHours" column="WORK_HOURS"/>
<result property="otherWorkDay" column="OTHER_WORK_DAY"/> <result property="otherWorkDay" column="OTHER_WORK_DAY"/>
<result property="salaryDay" column="SALARY_DAY"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -137,7 +138,8 @@ ...@@ -137,7 +138,8 @@
a.WORK_DAY_COUNT, a.WORK_DAY_COUNT,
a.WORK_DAY, a.WORK_DAY,
a.WORK_HOURS, a.WORK_HOURS,
a.OTHER_WORK_DAY a.OTHER_WORK_DAY,
a.SALARY_DAY
</sql> </sql>
<sql id="tAutoContractScheme_where"> <sql id="tAutoContractScheme_where">
<if test="tAutoContractScheme != null"> <if test="tAutoContractScheme != null">
...@@ -300,6 +302,9 @@ ...@@ -300,6 +302,9 @@
<if test="tAutoContractScheme.workHours != null and tAutoContractScheme.workHours.trim() != ''"> <if test="tAutoContractScheme.workHours != null and tAutoContractScheme.workHours.trim() != ''">
AND a.WORK_HOURS = #{tAutoContractScheme.workHours} AND a.WORK_HOURS = #{tAutoContractScheme.workHours}
</if> </if>
<if test="tAutoContractScheme.salaryDay != null and tAutoContractScheme.salaryDay.trim() != ''">
AND a.SALARY_DAY = #{tAutoContractScheme.salaryDay}
</if>
</if> </if>
</sql> </sql>
<!--tAutoContractScheme简单分页查询--> <!--tAutoContractScheme简单分页查询-->
......
...@@ -93,5 +93,6 @@ ...@@ -93,5 +93,6 @@
<result property="changeTypeUser" column="change_type_user"/> <result property="changeTypeUser" column="change_type_user"/>
<result property="changeTypeTime" column="change_type_time"/> <result property="changeTypeTime" column="change_type_time"/>
<result property="archivesIsCreate" column="archives_is_create"/> <result property="archivesIsCreate" column="archives_is_create"/>
<result property="salaryDay" column="SALARY_DAY"/>
</resultMap> </resultMap>
</mapper> </mapper>
...@@ -93,6 +93,7 @@ ...@@ -93,6 +93,7 @@
<result property="changeTypeUser" column="change_type_user"/> <result property="changeTypeUser" column="change_type_user"/>
<result property="changeTypeTime" column="change_type_time"/> <result property="changeTypeTime" column="change_type_time"/>
<result property="archivesIsCreate" column="archives_is_create"/> <result property="archivesIsCreate" column="archives_is_create"/>
<result property="salaryDay" column="SALARY_DAY"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.id a.id
...@@ -175,7 +176,7 @@ ...@@ -175,7 +176,7 @@
,a.TASK_TYPE ,a.TASK_TYPE
,a.TASK_END_STANDARD,a.contract_flag,a.CONTRACT_SUB_NAME ,a.TASK_END_STANDARD,a.contract_flag,a.CONTRACT_SUB_NAME
,a.request_id ,a.request_id
,a.request_msg,a.over_flag,a.change_type_reason,a.change_type_user,a.change_type_time ,a.request_msg,a.over_flag,a.change_type_reason,a.change_type_user,a.change_type_time,a.SALARY_DAY
</sql> </sql>
<sql id="tEmployeeContractPre_where"> <sql id="tEmployeeContractPre_where">
<if test="tEmployeeContractPre != null"> <if test="tEmployeeContractPre != null">
...@@ -262,6 +263,9 @@ ...@@ -262,6 +263,9 @@
<if test="tEmployeeContractPre.revokeReason != null and tEmployeeContractPre.revokeReason.trim() != ''"> <if test="tEmployeeContractPre.revokeReason != null and tEmployeeContractPre.revokeReason.trim() != ''">
AND a.revoke_reason = #{tEmployeeContractPre.revokeReason} AND a.revoke_reason = #{tEmployeeContractPre.revokeReason}
</if> </if>
<if test="tEmployeeContractPre.salaryDay != null and tEmployeeContractPre.salaryDay.trim() != ''">
AND a.SALARY_DAY = #{tEmployeeContractPre.salaryDay}
</if>
<if test="tEmployeeContractPre.expectedConfirmTime != null"> <if test="tEmployeeContractPre.expectedConfirmTime != null">
AND DATE_FORMAT(a.expected_confirm_time,"%Y-%m-%d") = AND DATE_FORMAT(a.expected_confirm_time,"%Y-%m-%d") =
DATE_FORMAT(#{tEmployeeContractPre.expectedConfirmTime},"%Y-%m-%d") DATE_FORMAT(#{tEmployeeContractPre.expectedConfirmTime},"%Y-%m-%d")
......
...@@ -110,6 +110,7 @@ ...@@ -110,6 +110,7 @@
<result property="createName" column="create_name"/> <result property="createName" column="create_name"/>
<result property="createTime" column="create_time"/> <result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/> <result property="updateBy" column="update_by"/>
<result property="salaryDay" column="SALARY_DAY"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.id, a.id,
...@@ -196,7 +197,8 @@ ...@@ -196,7 +197,8 @@
a.create_by, a.create_by,
a.create_name, a.create_name,
a.create_time, a.create_time,
a.update_by a.update_by,
a.SALARY_DAY
</sql> </sql>
<sql id="tEmpContractAlert_where"> <sql id="tEmpContractAlert_where">
<if test="tEmpContractAlert != null"> <if test="tEmpContractAlert != null">
...@@ -638,6 +640,9 @@ ...@@ -638,6 +640,9 @@
<if test="tEmployeeContractPreNew.updateBy != null and tEmployeeContractPreNew.updateBy.trim() != ''"> <if test="tEmployeeContractPreNew.updateBy != null and tEmployeeContractPreNew.updateBy.trim() != ''">
AND a.update_by = #{tEmployeeContractPreNew.updateBy} AND a.update_by = #{tEmployeeContractPreNew.updateBy}
</if> </if>
<if test="tEmployeeContractPreNew.salaryDay != null and tEmployeeContractPreNew.salaryDay.trim() != ''">
AND a.SALARY_DAY = #{tEmployeeContractPreNew.salaryDay}
</if>
</if> </if>
</sql> </sql>
<!--tEmployeeContractPreNew简单分页查询--> <!--tEmployeeContractPreNew简单分页查询-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment