Commit b8d58f64 authored by hongguangwu's avatar hongguangwu

MVP1.7.13-工伤保险允许重复参保

parent 78b65e5d
...@@ -1011,11 +1011,20 @@ public class TSocialInfo extends BaseEntity { ...@@ -1011,11 +1011,20 @@ public class TSocialInfo extends BaseEntity {
* 医保起缴日期顺延到次月 * 医保起缴日期顺延到次月
* 2025-3-13 17:22:35 hgw * 2025-3-13 17:22:35 hgw
*/ */
@ExcelAttribute(name = "医保起缴日期顺延到次月", isDate = true) @ExcelAttribute(name = "医保顺延时间", isDate = true)
@Schema(description = "医保起缴日期顺延到次月" ) @Schema(description = "医保顺延时间" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保起缴日期顺延到次月" ) @ExcelProperty("医保顺延时间" )
private Date ysdSocialStartDateNext; private Date ysdSocialStartDateNext;
/**
* 社保起缴日期顺延到次月
* 2025-7-11 11:42:01 hgw
*/
@ExcelAttribute(name = "社保顺延时间", isDate = true)
@Schema(description = "社保顺延时间" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保顺延时间" )
private Date ygsSocialStartDateNext;
/** /**
* 养工失反馈-原反馈 * 养工失反馈-原反馈
*/ */
......
...@@ -525,5 +525,23 @@ public class SocialSoldierExportVo implements Serializable { ...@@ -525,5 +525,23 @@ public class SocialSoldierExportVo implements Serializable {
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保请求ID") @ExcelProperty("医保请求ID")
private String ysdRequestId; private String ysdRequestId;
/**
* 医保起缴日期顺延到次月
* 2025-3-13 17:22:35 hgw
*/
@ExcelAttribute(name = "医保顺延时间", isDate = true)
@Schema(description = "医保顺延时间" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保顺延时间" )
private String ysdSocialStartDateNext;
/**
* 社保起缴日期顺延到次月
* 2025-7-11 11:42:01 hgw
*/
@ExcelAttribute(name = "社保顺延时间", isDate = true)
@Schema(description = "社保顺延时间" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保顺延时间" )
private String ygsSocialStartDateNext;
} }
...@@ -25,6 +25,7 @@ import lombok.Data; ...@@ -25,6 +25,7 @@ import lombok.Data;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import java.util.Date;
/** /**
* 社保士兵列表查询 * 社保士兵列表查询
...@@ -111,5 +112,23 @@ public class TSocialSoldierPageVo extends TDispatchInfo { ...@@ -111,5 +112,23 @@ public class TSocialSoldierPageVo extends TDispatchInfo {
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保请求ID" ) @ExcelProperty("医保请求ID" )
private String ysdRequestId; private String ysdRequestId;
/**
* 医保起缴日期顺延到次月
* 2025-3-13 17:22:35 hgw
*/
@ExcelAttribute(name = "医保顺延时间", isDate = true)
@Schema(description = "医保顺延时间" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保顺延时间" )
private Date ysdSocialStartDateNext;
/**
* 社保起缴日期顺延到次月
* 2025-7-11 11:42:01 hgw
*/
@ExcelAttribute(name = "社保顺延时间", isDate = true)
@Schema(description = "社保顺延时间" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保顺延时间" )
private Date ygsSocialStartDateNext;
} }
...@@ -239,6 +239,22 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T ...@@ -239,6 +239,22 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
// failConfig.getReplay() 1 继续办理 2 中止办理 3 人工办理 // failConfig.getReplay() 1 继续办理 2 中止办理 3 人工办理
// setYgsHandleStatus 3继续办理、4终止办理、5人工处理 // setYgsHandleStatus 3继续办理、4终止办理、5人工处理
if (CommonConstants.ONE_STRING.equals(failConfig.getReplay())) { if (CommonConstants.ONE_STRING.equals(failConfig.getReplay())) {
// 社保起缴月顺延:
if ("工伤保险允许重复参保".equals(failConfig.getReasonKey())) {
Date nextDate;
Date nextMonth = DateUtil.addMonthByDate(new Date(), CommonConstants.ONE_INT);
if (Common.isNotNull(socialInfo.getYgsSocialStartDateNext())) {
nextDate = DateUtil.addMonthByDateToOne(socialInfo.getYgsSocialStartDateNext(), CommonConstants.ONE_INT);
if (nextDate.before(nextMonth)) {
updateSocial.setYgsSocialStartDateNext(nextDate);
}
} else if (Common.isNotNull(socialInfo.getSocialStartDate())) {
nextDate = DateUtil.addMonthByDateToOne(socialInfo.getSocialStartDate(), CommonConstants.ONE_INT);
if (nextDate.before(nextMonth)) {
updateSocial.setYgsSocialStartDateNext(nextDate);
}
}
}
ygsHandleStatus = CommonConstants.THREE_STRING; ygsHandleStatus = CommonConstants.THREE_STRING;
// 新增流程进展明细 // 新增流程进展明细
if (CommonConstants.ZERO_STRING.equals(socialInfo.getDispatchType())) { if (CommonConstants.ZERO_STRING.equals(socialInfo.getDispatchType())) {
......
...@@ -1139,6 +1139,8 @@ ...@@ -1139,6 +1139,8 @@
<result property="ysdRemark" column="YSD_REMARK"/> <result property="ysdRemark" column="YSD_REMARK"/>
<result property="ygsRequestId" column="YGS_REQUEST_ID"/> <result property="ygsRequestId" column="YGS_REQUEST_ID"/>
<result property="ysdRequestId" column="YSD_REQUEST_ID"/> <result property="ysdRequestId" column="YSD_REQUEST_ID"/>
<result property="ygsSocialStartDateNext" column="YGS_SOCIAL_START_DATE_NEXT"/>
<result property="ysdSocialStartDateNext" column="YSD_SOCIAL_START_DATE_NEXT"/>
</resultMap> </resultMap>
...@@ -1355,6 +1357,8 @@ ...@@ -1355,6 +1357,8 @@
,s.YGS_REMARK ,s.YGS_REMARK
,s.YSD_REMARK ,s.YSD_REMARK
,s.YGS_REQUEST_ID,s.YSD_REQUEST_ID ,s.YGS_REQUEST_ID,s.YSD_REQUEST_ID
,if(a.type ='0',DATE_FORMAT(YGS_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"),'') YGS_SOCIAL_START_DATE_NEXT
,if(a.type ='0',DATE_FORMAT(YSD_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"),'') YSD_SOCIAL_START_DATE_NEXT
FROM t_dispatch_info a FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id left join t_social_info s on a.SOCIAL_ID = s.id
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
...@@ -1425,6 +1429,8 @@ ...@@ -1425,6 +1429,8 @@
,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REMARK, s.YSD_REMARK) YSD_REMARK ,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REMARK, s.YSD_REMARK) YSD_REMARK
,if(a.type ='0' and s.add_ygs_Handle_Status != '0', s.add_YGS_REQUEST_ID, s.YGS_REQUEST_ID) YGS_REQUEST_ID ,if(a.type ='0' and s.add_ygs_Handle_Status != '0', s.add_YGS_REQUEST_ID, s.YGS_REQUEST_ID) YGS_REQUEST_ID
,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REQUEST_ID, s.YSD_REQUEST_ID) YSD_REQUEST_ID ,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REQUEST_ID, s.YSD_REQUEST_ID) YSD_REQUEST_ID
,if(a.type ='0',DATE_FORMAT(YGS_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"),'') YGS_SOCIAL_START_DATE_NEXT
,if(a.type ='0',DATE_FORMAT(YSD_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"),'') YSD_SOCIAL_START_DATE_NEXT
FROM t_dispatch_info a FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id left join t_social_info s on a.SOCIAL_ID = s.id
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
...@@ -1506,6 +1512,8 @@ ...@@ -1506,6 +1512,8 @@
<result property="ysdRemarkOld" column="YSD_REMARK_OLD"/> <result property="ysdRemarkOld" column="YSD_REMARK_OLD"/>
<result property="ygsRequestId" column="YGS_REQUEST_ID"/> <result property="ygsRequestId" column="YGS_REQUEST_ID"/>
<result property="ysdRequestId" column="YSD_REQUEST_ID"/> <result property="ysdRequestId" column="YSD_REQUEST_ID"/>
<result property="ygsSocialStartDateNext" column="YGS_SOCIAL_START_DATE_NEXT"/>
<result property="ysdSocialStartDateNext" column="YSD_SOCIAL_START_DATE_NEXT"/>
</resultMap> </resultMap>
<!-- hgw 2024-5-10 10:42:33 社保士兵列表查询 --> <!-- hgw 2024-5-10 10:42:33 社保士兵列表查询 -->
...@@ -1592,6 +1600,8 @@ ...@@ -1592,6 +1600,8 @@
,a.SOCIAL_HOUSEHOLD_NAME,s.YGS_HANDLE_STATUS,s.YSD_HANDLE_STATUS ,a.SOCIAL_HOUSEHOLD_NAME,s.YGS_HANDLE_STATUS,s.YSD_HANDLE_STATUS
,s.YGS_REMARK,s.YSD_REMARK,s.YGS_REMARK_OLD,s.YSD_REMARK_OLD ,s.YGS_REMARK,s.YSD_REMARK,s.YGS_REMARK_OLD,s.YSD_REMARK_OLD
,s.YGS_REQUEST_ID,s.YSD_REQUEST_ID ,s.YGS_REQUEST_ID,s.YSD_REQUEST_ID
,if(a.type ='0',YGS_SOCIAL_START_DATE_NEXT,'') YGS_SOCIAL_START_DATE_NEXT
,if(a.type ='0',YSD_SOCIAL_START_DATE_NEXT,'') YSD_SOCIAL_START_DATE_NEXT
FROM t_dispatch_info a FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id left join t_social_info s on a.SOCIAL_ID = s.id
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
...@@ -1689,6 +1699,8 @@ ...@@ -1689,6 +1699,8 @@
,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REMARK, s.YSD_REMARK) YSD_REMARK ,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REMARK, s.YSD_REMARK) YSD_REMARK
,if(a.type ='0' and s.add_ygs_Handle_Status != '0', s.add_YGS_REQUEST_ID, s.YGS_REQUEST_ID) YGS_REQUEST_ID ,if(a.type ='0' and s.add_ygs_Handle_Status != '0', s.add_YGS_REQUEST_ID, s.YGS_REQUEST_ID) YGS_REQUEST_ID
,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REQUEST_ID, s.YSD_REQUEST_ID) YSD_REQUEST_ID ,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REQUEST_ID, s.YSD_REQUEST_ID) YSD_REQUEST_ID
,if(a.type ='0',YGS_SOCIAL_START_DATE_NEXT,'') YGS_SOCIAL_START_DATE_NEXT
,if(a.type ='0',YSD_SOCIAL_START_DATE_NEXT,'') YSD_SOCIAL_START_DATE_NEXT
FROM t_dispatch_info a FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id left join t_social_info s on a.SOCIAL_ID = s.id
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
......
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