MVP1.6.9-社保士兵配置

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/FailReasonConfig.java

@@ -83,5 +83,27 @@ public class FailReasonConfig extends BaseEntity {
 	@Schema(description = "更新人")
 	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

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialDeadlineInfo.java

@@ -84,6 +84,14 @@ public class TSocialDeadlineInfo extends BaseEntity {
 	@Schema(description = "县")
 	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	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 {
 	@ExcelProperty("社保截止日")
 	@Schema(description = "社保截止日")
 	private Date socialEndDate;
+	/**
+	 * 医疗起始日
+	 */
+	@ExcelAttribute(name = "医疗起始日", isNotEmpty = true, errorInfo = "医疗起始日不能为空", isDate = true)
+	@NotBlank(message = "医疗起始日不能为空")
+	@ExcelProperty("医疗起始日")
+	@Schema(description = "医疗起始日")
+	private Date medicalStartDate;
 	/**
 	 * 医疗截止日
 	 */

yifu-social/yifu-social-biz/src/main/resources/mapper/FailReasonConfigMapper.xml

@@ -14,6 +14,9 @@
 		<result property="updateTime" column="UPDATE_TIME"/>
 		<result property="updateBy" column="UPDATE_BY"/>
 		<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>
 	<sql id="Base_Column_List">
 		a.ID,
@@ -27,7 +30,10 @@
 				a.CREATE_BY,
                 a.UPDATE_TIME,
                 a.UPDATE_BY,
-				a.UPDATE_NAME
+				a.UPDATE_NAME,
+				a.IS_REPLACE,
+				a.REPLACE_LEFT,
+				a.REPLACE_RIGHT
 	</sql>
 	<sql id="failReasonConfig_where">
 		<if test="failReasonConfig != null">
@@ -46,6 +52,9 @@
 			<if test="failReasonConfig.status != null and failReasonConfig.status.trim() != ''">
 				AND a.STATUS = #{failReasonConfig.status}
 			</if>
+			<if test="failReasonConfig.isReplace != null and failReasonConfig.isReplace.trim() != ''">
+				AND a.IS_REPLACE = #{failReasonConfig.isReplace}
+			</if>
 		</if>
 	</sql>
 	<!--failReasonConfig简单分页查询-->

yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialDeadlineInfoMapper.xml

@@ -39,6 +39,8 @@
     <result property="updateTime" column="UPDATE_TIME"/>
     <result property="status" column="STATUS"/>
 	<result property="type" column="TYPE"/>
+	<result property="socialStartDate" column="SOCIAL_START_DATE"/>
+	<result property="medicalStartDate" column="MEDICAL_START_DATE"/>
   </resultMap>
     <sql id="Base_Column_List">
                 a.ID,
@@ -54,7 +56,8 @@
                 a.UPDATE_BY,
                 a.UPDATE_NAME,
                 a.UPDATE_TIME,
-                a.STATUS,a.TYPE
+                a.STATUS,a.TYPE,
+                a.SOCIAL_START_DATE,a.MEDICAL_START_DATE
     </sql>
     <sql id="tSocialDeadlineInfo_where">
         <if test="tSocialDeadlineInfo != null">