Skip to content

Y
yifu-mvp
Commit 8c81bd17 authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

派单派减分项办理

parent 832e28e9
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 29 deletions
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFundInfo.java
View file @ 8c81bd17
......@@ -800,6 +800,7 @@ public class TSocialFundInfo extends BaseEntity {
@Schema(description = "养老停缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老停缴日期" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Date pensionReduceStart;
/**
* 医疗停缴日期
......@@ -808,6 +809,7 @@ public class TSocialFundInfo extends BaseEntity {
@Schema(description = "医疗停缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗停缴日期" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Date medicalReduceStart;
/**
* 失业停缴日期
......@@ -816,6 +818,7 @@ public class TSocialFundInfo extends BaseEntity {
@Schema(description = "失业停缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业停缴日期" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Date unemployReduceStart;
/**
* 工伤停缴日期
......@@ -824,6 +827,7 @@ public class TSocialFundInfo extends BaseEntity {
@Schema(description = "工伤停缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤停缴日期" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Date workInjuryReduceStart;
/**
* 生育停缴日期
......@@ -832,6 +836,7 @@ public class TSocialFundInfo extends BaseEntity {
@Schema(description = "生育停缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育停缴日期" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Date birthReduceStart;
/**
* 大病停缴日期
......@@ -840,6 +845,7 @@ public class TSocialFundInfo extends BaseEntity {
@Schema(description = "大病停缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病停缴日期" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Date bigailmentReduceStart;
/**
* 养老办理状态：0待办理1办理成功2办理失败3已派减4派减失败
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ 8c81bd17
......@@ -4152,7 +4152,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
/**
* @param handleStatus
* @param handleStatus 1 办理成功 2 办理失败
* @param socialType
* @param socialInfo
* @param sf
......@@ -4174,6 +4174,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
&& !CommonConstants.ONE_STRING.equals(sf.getPensionHandle())) {
socialInfo.setPensionHandle(handleStatus);
sf.setPensionHandle(handleStatus);
if (CommonConstants.ONE_STRING.equals(handleStatus)){
sf.setPensionReduceStart(null);
}
}
if (socialType.contains(CommonConstants.TWO_STRING)
&& Common.isNotNull(socialInfo.getMedicalHandle())
......@@ -4181,6 +4184,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
&& !CommonConstants.ONE_STRING.equals(sf.getMedicalHandle())) {
socialInfo.setMedicalHandle(handleStatus);
sf.setMedicalHandle(handleStatus);
if (CommonConstants.ONE_STRING.equals(handleStatus)){
sf.setMedicalReduceStart(null);
}
}
if (socialType.contains(CommonConstants.THREE_STRING)
&& Common.isNotNull(socialInfo.getUnemployHandle())
......@@ -4188,6 +4194,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
&& !CommonConstants.ONE_STRING.equals(sf.getUnemployHandle())) {
socialInfo.setUnemployHandle(handleStatus);
sf.setUnemployHandle(handleStatus);
if (CommonConstants.ONE_STRING.equals(handleStatus)){
sf.setUnemployReduceStart(null);
}
}
if (socialType.contains(CommonConstants.FOUR_STRING)
&& Common.isNotNull(socialInfo.getWorkInjuryHandle())
......@@ -4195,6 +4204,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
&& !CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle())) {
socialInfo.setWorkInjuryHandle(handleStatus);
sf.setWorkInjuryHandle(handleStatus);
if (CommonConstants.ONE_STRING.equals(handleStatus)){
sf.setWorkInjuryReduceStart(null);
}
}
if (socialType.contains(CommonConstants.FIVE_STRING)
&& Common.isNotNull(socialInfo.getBirthHandle())
......@@ -4202,6 +4214,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
&& !CommonConstants.ONE_STRING.equals(sf.getBirthHandle())) {
socialInfo.setBirthHandle(handleStatus);
sf.setBirthHandle(handleStatus);
if (CommonConstants.ONE_STRING.equals(handleStatus)){
sf.setBirthReduceStart(null);
}
}
if (socialType.contains(CommonConstants.SIX_STRING)
&& Common.isNotNull(socialInfo.getBigailmentHandle())
......@@ -4210,6 +4225,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())) {
socialInfo.setBigailmentHandle(handleStatus);
sf.setBigailmentHandle(handleStatus);
if (CommonConstants.ONE_STRING.equals(handleStatus)){
sf.setBigailmentReduceStart(null);
}
}
// 单个办理的时候处理派单和社保的办理状态 有办理成功也有办理失败的 为办理中
if ((CommonConstants.ONE_STRING.equals(socialInfo.getPensionHandle())
......@@ -4246,61 +4264,80 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
handleStatusTemp = CommonConstants.FOUR_STRING;
}
boolean flag = CommonConstants.THREE_STRING.equals(handleStatusTemp);
if (socialType.contains(CommonConstants.ONE_STRING)
&& CommonConstants.ONE_STRING.equals(socialInfo.getPensionHandle())) {
socialInfo.setPensionHandle(handleStatusTemp);
sf.setPensionHandle(handleStatusTemp);
if (socialType.contains(CommonConstants.ONE_STRING)) {
if (CommonConstants.ONE_STRING.equals(socialInfo.getPensionHandle())){
socialInfo.setPensionHandle(handleStatusTemp);
sf.setPensionHandle(handleStatusTemp);
}
if (CommonConstants.FOUR_STRING.equals(sf.getPensionHandle())){
sf.setPensionHandle(handleStatusTemp);
}
if (flag){
socialInfo.setPensionReduceStart(dis.getSocialReduceDate());
sf.setPensionReduceStart(dis.getSocialReduceDate());
}
}
if (socialType.contains(CommonConstants.TWO_STRING)
&& Common.isNotNull(socialInfo.getMedicalHandle())
&& CommonConstants.ONE_STRING.equals(socialInfo.getMedicalHandle())) {
socialInfo.setMedicalHandle(handleStatusTemp);
sf.setMedicalHandle(handleStatusTemp);
if (socialType.contains(CommonConstants.TWO_STRING)) {
if (CommonConstants.ONE_STRING.equals(socialInfo.getMedicalHandle())){
socialInfo.setMedicalHandle(handleStatusTemp);
sf.setMedicalHandle(handleStatusTemp);
}
if (CommonConstants.FOUR_STRING.equals(sf.getMedicalHandle())){
sf.setMedicalHandle(handleStatusTemp);
}
if (flag){
socialInfo.setMedicalReduceStart(dis.getSocialReduceDate());
sf.setMedicalReduceStart(dis.getSocialReduceDate());
}
}
if (socialType.contains(CommonConstants.THREE_STRING)
&& Common.isNotNull(socialInfo.getUnemployHandle())
&& CommonConstants.ONE_STRING.equals(socialInfo.getUnemployHandle())) {
socialInfo.setUnemployHandle(handleStatusTemp);
sf.setUnemployHandle(handleStatusTemp);
if (socialType.contains(CommonConstants.THREE_STRING)) {
if (CommonConstants.ONE_STRING.equals(socialInfo.getUnemployHandle())){
socialInfo.setUnemployHandle(handleStatusTemp);
sf.setUnemployHandle(handleStatusTemp);
}
if (CommonConstants.FOUR_STRING.equals(sf.getUnemployHandle())){
sf.setUnemployHandle(handleStatusTemp);
}
if (flag){
socialInfo.setUnemployReduceStart(dis.getSocialReduceDate());
sf.setUnemployReduceStart(dis.getSocialReduceDate());
}
}
if (socialType.contains(CommonConstants.FOUR_STRING)
&& Common.isNotNull(socialInfo.getWorkInjuryHandle())
&& CommonConstants.ONE_STRING.equals(socialInfo.getWorkInjuryHandle())) {
socialInfo.setWorkInjuryHandle(handleStatusTemp);
sf.setWorkInjuryHandle(handleStatusTemp);
if (socialType.contains(CommonConstants.FOUR_STRING)) {
if (CommonConstants.ONE_STRING.equals(socialInfo.getWorkInjuryHandle())){
socialInfo.setWorkInjuryHandle(handleStatusTemp);
sf.setWorkInjuryHandle(handleStatusTemp);
}
if (CommonConstants.FOUR_STRING.equals(sf.getWorkInjuryHandle())){
sf.setWorkInjuryHandle(handleStatusTemp);
}
if (flag){
socialInfo.setWorkInjuryReduceStart(dis.getSocialReduceDate());
sf.setWorkInjuryReduceStart(dis.getSocialReduceDate());
}
}
if (socialType.contains(CommonConstants.FIVE_STRING)
&& Common.isNotNull(socialInfo.getBirthHandle())
&& CommonConstants.ONE_STRING.equals(socialInfo.getBirthHandle())) {
socialInfo.setBirthHandle(handleStatusTemp);
sf.setBirthHandle(handleStatusTemp);
if (socialType.contains(CommonConstants.FIVE_STRING)) {
if (CommonConstants.ONE_STRING.equals(socialInfo.getBirthHandle())){
socialInfo.setBirthHandle(handleStatusTemp);
sf.setBirthHandle(handleStatusTemp);
}
if (CommonConstants.FOUR_STRING.equals(sf.getBirthHandle())){
sf.setBirthHandle(handleStatusTemp);
}
if (flag){
socialInfo.setBirthReduceStart(dis.getSocialReduceDate());
sf.setBirthReduceStart(dis.getSocialReduceDate());
}
}
if (socialType.contains(CommonConstants.SIX_STRING)
&& Common.isNotNull(socialInfo.getBigailmentHandle())
&& CommonConstants.ONE_STRING.equals(socialInfo.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())) {
socialInfo.setBigailmentHandle(handleStatusTemp);
sf.setBigailmentHandle(handleStatusTemp);
if (CommonConstants.ONE_STRING.equals(socialInfo.getBigailmentHandle())){
socialInfo.setBigailmentHandle(handleStatusTemp);
sf.setBigailmentHandle(handleStatusTemp);
}
if (CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle())){
sf.setBigailmentHandle(handleStatusTemp);
}
if (flag){
socialInfo.setBigailmentReduceStart(dis.getSocialReduceDate());
sf.setBigailmentReduceStart(dis.getSocialReduceDate());
......
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