Commit 3421d745 authored by hongguangwu's avatar hongguangwu

MVP1.7.8-顺延月份

parent 83c378ff
...@@ -1007,6 +1007,15 @@ public class TSocialInfo extends BaseEntity { ...@@ -1007,6 +1007,15 @@ public class TSocialInfo extends BaseEntity {
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医生大反馈" ) @ExcelProperty("医生大反馈" )
private String ysdRemark; private String ysdRemark;
/**
* 医保起缴日期顺延到次月
* 2025-3-13 17:22:35 hgw
*/
@ExcelAttribute(name = "医保起缴日期顺延到次月", isDate = true)
@Schema(description = "医保起缴日期顺延到次月" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保起缴日期顺延到次月" )
private Date ysdSocialStartDateNext;
/** /**
* 养工失反馈-原反馈 * 养工失反馈-原反馈
*/ */
......
...@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; ...@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common; import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser; import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.social.config.SocialFriendConfig; import com.yifu.cloud.plus.v1.yifu.social.config.SocialFriendConfig;
...@@ -269,6 +270,17 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T ...@@ -269,6 +270,17 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
// failConfig.getReplay() 1 继续办理 2 中止办理 3 人工办理 // failConfig.getReplay() 1 继续办理 2 中止办理 3 人工办理
// ysdHandleStatus 3继续办理、4终止办理、5人工处理 // ysdHandleStatus 3继续办理、4终止办理、5人工处理
if (CommonConstants.ONE_STRING.equals(failConfig.getReplay())) { if (CommonConstants.ONE_STRING.equals(failConfig.getReplay())) {
// 医保起缴月顺延:
if ("已核定过基本医疗保险".equals(failConfig.getReasonKey())) {
Date nextDate;
if (Common.isNotNull(socialInfo.getYsdSocialStartDateNext())) {
nextDate = DateUtil.addMonthByDate(socialInfo.getYsdSocialStartDateNext(), CommonConstants.ONE_INT);
updateSocial.setYsdSocialStartDateNext(nextDate);
} else if (Common.isNotNull(socialInfo.getSocialStartDate())) {
nextDate = DateUtil.addMonthByDate(socialInfo.getSocialStartDate(), CommonConstants.ONE_INT);
updateSocial.setYsdSocialStartDateNext(nextDate);
}
}
ysdHandleStatus = CommonConstants.THREE_STRING; ysdHandleStatus = CommonConstants.THREE_STRING;
// 新增流程进展明细 // 新增流程进展明细
......
...@@ -1135,6 +1135,8 @@ ...@@ -1135,6 +1135,8 @@
<result property="ysdHandleStatus" column="ysd_Handle_Status"/> <result property="ysdHandleStatus" column="ysd_Handle_Status"/>
<result property="ygsRemark" column="YGS_REMARK"/> <result property="ygsRemark" column="YGS_REMARK"/>
<result property="ysdRemark" column="YSD_REMARK"/> <result property="ysdRemark" column="YSD_REMARK"/>
<result property="ygsRequestId" column="YGS_REQUEST_ID"/>
<result property="ysdRequestId" column="YSD_REQUEST_ID"/>
</resultMap> </resultMap>
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
a.EMP_IDCARD empIdcard, a.EMP_IDCARD empIdcard,
if (a.EMP_NATIONAL in ('2','3','5','6','7','8','9','11') and nation.label is not null, nation.label,'汉族') empNational, if (a.EMP_NATIONAL in ('2','3','5','6','7','8','9','11') and nation.label is not null, nation.label,'汉族') empNational,
a.EMP_MOBILE empMobile, a.EMP_MOBILE empMobile,
DATE_FORMAT(s.SOCIAL_START_DATE,"%Y-%m-%d") socialStartDate,
if(a.EDUCATION_NAME is null, '大学专科', if(a.EDUCATION_NAME is null, '大学专科',
case a.EDUCATION_NAME case a.EDUCATION_NAME
when '博士' then '博士研究生' when '博士' then '博士研究生'
...@@ -58,7 +58,6 @@ ...@@ -58,7 +58,6 @@
else '其他' else '其他'
end) educationName, end) educationName,
s.RECORD_BASE recordBase, s.RECORD_BASE recordBase,
DATE_FORMAT(s.SOCIAL_START_DATE,"%Y%m") socialStartMonth,
case a.CONTRACT_TYPE case a.CONTRACT_TYPE
when '0' then '订立以完成一定工作任务为期限的劳动合同' when '0' then '订立以完成一定工作任务为期限的劳动合同'
when '1' then '订立固定期限劳动合同' when '1' then '订立固定期限劳动合同'
...@@ -105,6 +104,8 @@ ...@@ -105,6 +104,8 @@
<!-- 税友养工失增加模板--> <!-- 税友养工失增加模板-->
<select id="getSocialSoldierYgsAddVoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SociaFriendYgsAddVo"> <select id="getSocialSoldierYgsAddVoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SociaFriendYgsAddVo">
<include refid="getSocialSoldierBaseOne"/> <include refid="getSocialSoldierBaseOne"/>
,DATE_FORMAT(s.SOCIAL_START_DATE,"%Y-%m-%d") socialStartDate
,DATE_FORMAT(s.SOCIAL_START_DATE,"%Y%m") socialStartMonth
<include refid="getSocialSoldierBaseTwo"/> <include refid="getSocialSoldierBaseTwo"/>
and a.type = '0' and s.YGS_HANDLE_STATUS in ('0','1','3') and a.type = '0' and s.YGS_HANDLE_STATUS in ('0','1','3')
and ( and (
...@@ -137,6 +138,8 @@ ...@@ -137,6 +138,8 @@
<!-- 税友养工失减少模板--> <!-- 税友养工失减少模板-->
<select id="getSocialSoldierYgsReduceVoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SociaFriendYgsAddVo"> <select id="getSocialSoldierYgsReduceVoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SociaFriendYgsAddVo">
<include refid="getSocialSoldierBaseOne"/> <include refid="getSocialSoldierBaseOne"/>
,DATE_FORMAT(s.SOCIAL_START_DATE,"%Y-%m-%d") socialStartDate
,DATE_FORMAT(s.SOCIAL_START_DATE,"%Y%m") socialStartMonth
<include refid="getSocialSoldierBaseTwo"/> <include refid="getSocialSoldierBaseTwo"/>
and a.type = '1' and s.YGS_HANDLE_STATUS in ('0','1','3') and a.type = '1' and s.YGS_HANDLE_STATUS in ('0','1','3')
and ( and (
...@@ -150,6 +153,8 @@ ...@@ -150,6 +153,8 @@
<!-- 税友医生大增加模板--> <!-- 税友医生大增加模板-->
<select id="getSocialSoldierYsdAddVoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SociaFriendYgsAddVo"> <select id="getSocialSoldierYsdAddVoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SociaFriendYgsAddVo">
<include refid="getSocialSoldierBaseOne"/> <include refid="getSocialSoldierBaseOne"/>
,if(YSD_SOCIAL_START_DATE_NEXT is not null,DATE_FORMAT(s.YSD_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"),DATE_FORMAT(s.SOCIAL_START_DATE,"%Y-%m-%d")) socialStartDate
,if(YSD_SOCIAL_START_DATE_NEXT is not null,DATE_FORMAT(s.YSD_SOCIAL_START_DATE_NEXT,"%Y%m"),DATE_FORMAT(s.SOCIAL_START_DATE,"%Y%m")) socialStartMonth
,if(s.UNIT_MEDICAL_MONEY != 0,1,0) unitMedicalMoney,if(s.UNIT_BIRTH_MONEY != 0,1,0) unitBirthMoney,if(s.UNIT_BIGAILMENT_MONEY != 0,1,0) unitBigailmentMoney ,if(s.UNIT_MEDICAL_MONEY != 0,1,0) unitMedicalMoney,if(s.UNIT_BIRTH_MONEY != 0,1,0) unitBirthMoney,if(s.UNIT_BIGAILMENT_MONEY != 0,1,0) unitBigailmentMoney
<include refid="getSocialSoldierBaseTwo"/> <include refid="getSocialSoldierBaseTwo"/>
and a.type = '0' and s.YSD_HANDLE_STATUS in ('0','1','3') and a.type = '0' and s.YSD_HANDLE_STATUS in ('0','1','3')
...@@ -179,7 +184,6 @@ ...@@ -179,7 +184,6 @@
a.EMP_IDCARD empIdcard, a.EMP_IDCARD empIdcard,
if (a.EMP_NATIONAL in ('2','3','5','6','7','8','9','11') and nation.label is not null, nation.label,'汉族') empNational, if (a.EMP_NATIONAL in ('2','3','5','6','7','8','9','11') and nation.label is not null, nation.label,'汉族') empNational,
a.EMP_MOBILE empMobile, a.EMP_MOBILE empMobile,
DATE_FORMAT(s.SOCIAL_START_DATE,"%Y-%m-%d") socialStartDate,
if(a.EDUCATION_NAME is null, '大学专科', if(a.EDUCATION_NAME is null, '大学专科',
case a.EDUCATION_NAME case a.EDUCATION_NAME
when '博士' then '博士研究生' when '博士' then '博士研究生'
...@@ -196,7 +200,8 @@ ...@@ -196,7 +200,8 @@
else '其他' else '其他'
end) educationName, end) educationName,
s.RECORD_BASE recordBase, s.RECORD_BASE recordBase,
DATE_FORMAT(s.SOCIAL_START_DATE,"%Y%m") socialStartMonth, if(YSD_SOCIAL_START_DATE_NEXT is not null,DATE_FORMAT(s.YSD_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"),DATE_FORMAT(s.SOCIAL_START_DATE,"%Y-%m-%d")) socialStartDate,
if(YSD_SOCIAL_START_DATE_NEXT is not null,DATE_FORMAT(s.YSD_SOCIAL_START_DATE_NEXT,"%Y%m"),DATE_FORMAT(s.SOCIAL_START_DATE,"%Y%m")) socialStartMonth,
case a.CONTRACT_TYPE case a.CONTRACT_TYPE
when '0' then '订立以完成一定工作任务为期限的劳动合同' when '0' then '订立以完成一定工作任务为期限的劳动合同'
when '1' then '订立固定期限劳动合同' when '1' then '订立固定期限劳动合同'
......
...@@ -154,6 +154,7 @@ ...@@ -154,6 +154,7 @@
<!-- 税友新增字段--> <!-- 税友新增字段-->
<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="ysdSocialStartDateNext" column="YSD_SOCIAL_START_DATE_NEXT"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -268,7 +269,8 @@ ...@@ -268,7 +269,8 @@
a.YGS_ADD_ID, a.YGS_ADD_ID,
a.YSD_ADD_ID, a.YSD_ADD_ID,
a.YGS_REQUEST_ID, a.YGS_REQUEST_ID,
a.YSD_REQUEST_ID a.YSD_REQUEST_ID,
a.YSD_SOCIAL_START_DATE_NEXT
</sql> </sql>
<sql id="tSocialInfo_where"> <sql id="tSocialInfo_where">
...@@ -672,9 +674,11 @@ if((sd.id is not null and NOW() <![CDATA[ <= ]]> sd.SOCIAL_END_DATE) or ( sd.id ...@@ -672,9 +674,11 @@ if((sd.id is not null and NOW() <![CDATA[ <= ]]> sd.SOCIAL_END_DATE) or ( sd.id
a.YSD_REQUEST_ID, a.YSD_REQUEST_ID,
a.HANDLE_STATUS, a.HANDLE_STATUS,
a.YSD_HANDLE_STATUS, a.YSD_HANDLE_STATUS,
a.SOCIAL_START_DATE,
a.YSD_SOCIAL_START_DATE_NEXT,
SUBSTRING_INDEX(GROUP_CONCAT(d.id ORDER BY d.CREATE_TIME desc),',',1) as DISPATCH_ID, SUBSTRING_INDEX(GROUP_CONCAT(d.id ORDER BY d.CREATE_TIME desc),',',1) as DISPATCH_ID,
SUBSTRING_INDEX(GROUP_CONCAT(d.type ORDER BY d.CREATE_TIME desc),',',1) as DISPATCH_TYPE, SUBSTRING_INDEX(GROUP_CONCAT(d.type ORDER BY d.CREATE_TIME desc),',',1) as DISPATCH_TYPE,
if((sd.id is not null and NOW() <![CDATA[ <= ]]> sd.MEDICAL_END_DATE) or ( sd.id is null and DATE_FORMAT(d.AUDIT_TIME,'%Y%m') = DATE_FORMAT(now(),'%Y%m')),0 ,1) YSD_OVER_DUE_FLAG if((sd.id is not null and NOW() <![CDATA[ <= ]]> sd.MEDICAL_END_DATE) or ( sd.id is null and DATE_FORMAT(d.AUDIT_TIME,'%Y%m') = DATE_FORMAT(now(),'%Y%m')),0 ,1) YSD_OVER_DUE_FLAG
FROM t_social_info a FROM t_social_info a
left join t_dispatch_info d on d.SOCIAL_ID = a.id left join t_dispatch_info d on d.SOCIAL_ID = a.id
left join t_social_deadline_info sd on sd.MONTH = DATE_FORMAT(d.AUDIT_TIME,'%Y%m') and sd.STATUS = '0' left join t_social_deadline_info sd on sd.MONTH = DATE_FORMAT(d.AUDIT_TIME,'%Y%m') and sd.STATUS = '0'
......
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