Commit 6e21cc82 authored by hongguangwu's avatar hongguangwu

MVP1.6.9-社保士兵配置

parent 56a26ee2
...@@ -83,5 +83,27 @@ public class FailReasonConfig extends BaseEntity { ...@@ -83,5 +83,27 @@ public class FailReasonConfig extends BaseEntity {
@Schema(description = "更新人") @Schema(description = "更新人")
private String updateName; private String updateName;
/**
* 是否截取:0否;1是
*/
@ExcelAttribute(name = "是否截取")
@ExcelProperty("是否截取")
@Schema(description = "是否截取")
private String isReplace;
/**
* 截取标识左
*/
@ExcelAttribute(name = "截取标识左")
@ExcelProperty("截取标识左")
@Schema(description = "截取标识左")
private String replaceLeft;
/**
* 截取标识右
*/
@ExcelAttribute(name = "截取标识右")
@ExcelProperty("截取标识右")
@Schema(description = "截取标识右")
private String replaceRight;
} }
\ No newline at end of file
...@@ -84,6 +84,14 @@ public class TSocialDeadlineInfo extends BaseEntity { ...@@ -84,6 +84,14 @@ public class TSocialDeadlineInfo extends BaseEntity {
@Schema(description = "县") @Schema(description = "县")
@TableField(updateStrategy = FieldStrategy.IGNORED) @TableField(updateStrategy = FieldStrategy.IGNORED)
private String town; private String town;
/**
* 社保起始日
*/
@ExcelAttribute(name = "社保起始日", isNotEmpty = true, errorInfo = "社保起始日不能为空", isDate = true)
@NotBlank(message = "社保起始日不能为空")
@ExcelProperty("社保起始日")
@Schema(description = "社保起始日")
private Date socialStartDate;
/** /**
* 社保截止日 * 社保截止日
*/ */
...@@ -92,6 +100,14 @@ public class TSocialDeadlineInfo extends BaseEntity { ...@@ -92,6 +100,14 @@ public class TSocialDeadlineInfo extends BaseEntity {
@ExcelProperty("社保截止日") @ExcelProperty("社保截止日")
@Schema(description = "社保截止日") @Schema(description = "社保截止日")
private Date socialEndDate; private Date socialEndDate;
/**
* 医疗起始日
*/
@ExcelAttribute(name = "医疗起始日", isNotEmpty = true, errorInfo = "医疗起始日不能为空", isDate = true)
@NotBlank(message = "医疗起始日不能为空")
@ExcelProperty("医疗起始日")
@Schema(description = "医疗起始日")
private Date medicalStartDate;
/** /**
* 医疗截止日 * 医疗截止日
*/ */
......
...@@ -14,6 +14,9 @@ ...@@ -14,6 +14,9 @@
<result property="updateTime" column="UPDATE_TIME"/> <result property="updateTime" column="UPDATE_TIME"/>
<result property="updateBy" column="UPDATE_BY"/> <result property="updateBy" column="UPDATE_BY"/>
<result property="updateName" column="UPDATE_NAME"/> <result property="updateName" column="UPDATE_NAME"/>
<result property="isReplace" column="IS_REPLACE"/>
<result property="replaceLeft" column="REPLACE_LEFT"/>
<result property="replaceRight" column="REPLACE_RIGHT"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -27,7 +30,10 @@ ...@@ -27,7 +30,10 @@
a.CREATE_BY, a.CREATE_BY,
a.UPDATE_TIME, a.UPDATE_TIME,
a.UPDATE_BY, a.UPDATE_BY,
a.UPDATE_NAME a.UPDATE_NAME,
a.IS_REPLACE,
a.REPLACE_LEFT,
a.REPLACE_RIGHT
</sql> </sql>
<sql id="failReasonConfig_where"> <sql id="failReasonConfig_where">
<if test="failReasonConfig != null"> <if test="failReasonConfig != null">
...@@ -46,6 +52,9 @@ ...@@ -46,6 +52,9 @@
<if test="failReasonConfig.status != null and failReasonConfig.status.trim() != ''"> <if test="failReasonConfig.status != null and failReasonConfig.status.trim() != ''">
AND a.STATUS = #{failReasonConfig.status} AND a.STATUS = #{failReasonConfig.status}
</if> </if>
<if test="failReasonConfig.isReplace != null and failReasonConfig.isReplace.trim() != ''">
AND a.IS_REPLACE = #{failReasonConfig.isReplace}
</if>
</if> </if>
</sql> </sql>
<!--failReasonConfig简单分页查询--> <!--failReasonConfig简单分页查询-->
......
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
<result property="updateTime" column="UPDATE_TIME"/> <result property="updateTime" column="UPDATE_TIME"/>
<result property="status" column="STATUS"/> <result property="status" column="STATUS"/>
<result property="type" column="TYPE"/> <result property="type" column="TYPE"/>
<result property="socialStartDate" column="SOCIAL_START_DATE"/>
<result property="medicalStartDate" column="MEDICAL_START_DATE"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -54,7 +56,8 @@ ...@@ -54,7 +56,8 @@
a.UPDATE_BY, a.UPDATE_BY,
a.UPDATE_NAME, a.UPDATE_NAME,
a.UPDATE_TIME, a.UPDATE_TIME,
a.STATUS,a.TYPE a.STATUS,a.TYPE,
a.SOCIAL_START_DATE,a.MEDICAL_START_DATE
</sql> </sql>
<sql id="tSocialDeadlineInfo_where"> <sql id="tSocialDeadlineInfo_where">
<if test="tSocialDeadlineInfo != null"> <if test="tSocialDeadlineInfo != null">
......
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