Commit 570ba99d authored by hongguangwu's avatar hongguangwu

MVP1.7.3-shuiyou 减员日期

parent 44aed374
...@@ -85,37 +85,69 @@ public class TSocialDeadlineInfo extends BaseEntity { ...@@ -85,37 +85,69 @@ public class TSocialDeadlineInfo extends BaseEntity {
@TableField(updateStrategy = FieldStrategy.IGNORED) @TableField(updateStrategy = FieldStrategy.IGNORED)
private String town; private String town;
/** /**
* 社保起始日 * 社保增员起始日期
*/ */
@ExcelAttribute(name = "社保起始日", isNotEmpty = true, errorInfo = "社保起始日不能为空", isDate = true) @ExcelAttribute(name = "社保增员起始日期", isNotEmpty = true, errorInfo = "社保增员起始日期不能为空", isDate = true)
@NotBlank(message = "社保起始日不能为空") @NotBlank(message = "社保增员起始日期不能为空")
@ExcelProperty("社保起始日") @ExcelProperty("社保增员起始日期")
@Schema(description = "社保起始日") @Schema(description = "社保增员起始日期")
private Date socialStartDate; private Date socialStartDate;
/** /**
* 社保截止日 * 社保增员截止日期
*/ */
@ExcelAttribute(name = "社保截止日", isNotEmpty = true, errorInfo = "社保截止日不能为空", isDate = true) @ExcelAttribute(name = "社保增员截止日期", isNotEmpty = true, errorInfo = "社保增员截止日期不能为空", isDate = true)
@NotBlank(message = "社保截止日不能为空") @NotBlank(message = "社保增员截止日期不能为空")
@ExcelProperty("社保截止日") @ExcelProperty("社保增员截止日期")
@Schema(description = "社保截止日") @Schema(description = "社保增员截止日期")
private Date socialEndDate; private Date socialEndDate;
/** /**
* 医疗起始日 * 社保减员起始日期
*/ */
@ExcelAttribute(name = "医疗起始日", isNotEmpty = true, errorInfo = "医疗起始日不能为空", isDate = true) @ExcelAttribute(name = "社保减员起始日期", isNotEmpty = true, errorInfo = "社保减员起始日期不能为空", isDate = true)
@NotBlank(message = "医疗起始日不能为空") @NotBlank(message = "社保减员起始日期不能为空")
@ExcelProperty("医疗起始日") @ExcelProperty("社保减员起始日期")
@Schema(description = "医疗起始日") @Schema(description = "社保减员起始日期")
private Date socialStartDateReduce;
/**
* 社保减员截止日期
*/
@ExcelAttribute(name = "社保减员截止日期", isNotEmpty = true, errorInfo = "社保减员截止日期不能为空", isDate = true)
@NotBlank(message = "社保减员截止日期不能为空")
@ExcelProperty("社保减员截止日期")
@Schema(description = "社保减员截止日期")
private Date socialEndDateReduce;
/**
* 医保增员起始日期
*/
@ExcelAttribute(name = "医保增员起始日期", isNotEmpty = true, errorInfo = "医保增员起始日期不能为空", isDate = true)
@NotBlank(message = "医保增员起始日期不能为空")
@ExcelProperty("医保增员起始日期")
@Schema(description = "医保增员起始日期")
private Date medicalStartDate; private Date medicalStartDate;
/** /**
* 医疗截止日 * 医保增员截止日期
*/ */
@ExcelAttribute(name = "医疗截止日", isNotEmpty = true, errorInfo = "医疗截止日不能为空", isDate = true) @ExcelAttribute(name = "医保增员截止日期", isNotEmpty = true, errorInfo = "医保增员截止日期不能为空", isDate = true)
@NotBlank(message = "医疗截止日不能为空") @NotBlank(message = "医保增员截止日期不能为空")
@ExcelProperty("医疗截止日") @ExcelProperty("医保增员截止日期")
@Schema(description = "医疗截止日") @Schema(description = "医保增员截止日期")
private Date medicalEndDate; private Date medicalEndDate;
/**
* 医保减员起始日期
*/
@ExcelAttribute(name = "医保减员起始日期", isNotEmpty = true, errorInfo = "医保减员起始日期不能为空", isDate = true)
@NotBlank(message = "医保减员起始日期不能为空")
@ExcelProperty("医保减员起始日期")
@Schema(description = "医保减员起始日期")
private Date medicalStartDateReduce;
/**
* 医保减员截止日期
*/
@ExcelAttribute(name = "医保减员截止日期", isNotEmpty = true, errorInfo = "医保减员截止日期不能为空", isDate = true)
@NotBlank(message = "医保减员截止日期不能为空")
@ExcelProperty("医保减员截止日期")
@Schema(description = "医保减员截止日期")
private Date medicalEndDateReduce;
/** /**
* 更新人 * 更新人
*/ */
......
...@@ -375,6 +375,10 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -375,6 +375,10 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
if (socialSet != null) { if (socialSet != null) {
Date start = socialSet.getSocialStartDate(); Date start = socialSet.getSocialStartDate();
Date end = socialSet.getSocialEndDate(); Date end = socialSet.getSocialEndDate();
if ("派减".equals(vo.getType())) {
start = socialSet.getSocialStartDateReduce();
end = socialSet.getSocialEndDateReduce();
}
if (Common.isNotNull(start) && Common.isNotNull(end)) { if (Common.isNotNull(start) && Common.isNotNull(end)) {
if (nowTime.before(start)) { if (nowTime.before(start)) {
canPushType = 0; canPushType = 0;
...@@ -424,6 +428,10 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -424,6 +428,10 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
if (socialSet != null) { if (socialSet != null) {
Date start = socialSet.getMedicalStartDate(); Date start = socialSet.getMedicalStartDate();
Date end = socialSet.getMedicalEndDate(); Date end = socialSet.getMedicalEndDate();
if ("派减".equals(vo.getType())) {
start = socialSet.getMedicalStartDateReduce();
end = socialSet.getMedicalEndDateReduce();
}
if (Common.isNotNull(start) && Common.isNotNull(end)) { if (Common.isNotNull(start) && Common.isNotNull(end)) {
if (nowTime.before(start)) { if (nowTime.before(start)) {
canPushType = 0; canPushType = 0;
......
...@@ -41,6 +41,11 @@ ...@@ -41,6 +41,11 @@
<result property="type" column="TYPE"/> <result property="type" column="TYPE"/>
<result property="socialStartDate" column="SOCIAL_START_DATE"/> <result property="socialStartDate" column="SOCIAL_START_DATE"/>
<result property="medicalStartDate" column="MEDICAL_START_DATE"/> <result property="medicalStartDate" column="MEDICAL_START_DATE"/>
<result property="socialStartDateReduce" column="SOCIAL_START_DATE_REDUCE"/>
<result property="medicalStartDateReduce" column="MEDICAL_START_DATE_REDUCE"/>
<result property="socialEndDateReduce" column="SOCIAL_END_DATE_REDUCE"/>
<result property="medicalEndDateReduce" column="MEDICAL_END_DATE_REDUCE"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -57,7 +62,12 @@ ...@@ -57,7 +62,12 @@
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 a.SOCIAL_START_DATE,
a.MEDICAL_START_DATE,
a.SOCIAL_START_DATE_REDUCE,
a.MEDICAL_START_DATE_REDUCE,
a.SOCIAL_END_DATE_REDUCE,
a.MEDICAL_END_DATE_REDUCE
</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