Skip to content

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

派减分项办理

parent 9042948d
Hide whitespace changes
Inline Side-by-side
Showing with 163 additions and 122 deletions
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/config/AsyncConfig.java
View file @ 92705142
package com.yifu.cloud.plus.v1.yifu.common.core.config;
import ch.qos.logback.core.util.ExecutorServiceUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
import org.springframework.context.annotation.Configuration;
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFundInfo.java
View file @ 92705142
......@@ -854,57 +854,57 @@ public class TSocialFundInfo extends BaseEntity {
@ExcelAttribute(name = "养老办理状态：0待办理1办理成功2办理失败3已派减4派减失败", maxLength = 1)
@Schema(description = "养老办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@ExcelProperty("养老办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String pensionHandle;
/**
* 医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败
* 医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理
*/
@Length(max = 1, message = "医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败 不能超过1个字符" )
@ExcelAttribute(name = "医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败", maxLength = 1)
@Schema(description = "医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@Length(max = 1, message = "医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理 不能超过1个字符" )
@ExcelAttribute(name = "医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理", maxLength = 1)
@Schema(description = "医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@ExcelProperty("医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String medicalHandle;
/**
* 失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败
* 失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理
*/
@Length(max = 1, message = "失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败 不能超过1个字符" )
@ExcelAttribute(name = "失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败", maxLength = 1)
@Schema(description = "失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@Length(max = 1, message = "失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理 不能超过1个字符" )
@ExcelAttribute(name = "失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理", maxLength = 1)
@Schema(description = "失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@ExcelProperty("失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String unemployHandle;
/**
* 工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败
* 工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理
*/
@Length(max = 1, message = "工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败 不能超过1个字符" )
@ExcelAttribute(name = "工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败", maxLength = 1)
@Schema(description = "工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@Length(max = 1, message = "工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理 不能超过1个字符" )
@ExcelAttribute(name = "工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理", maxLength = 1)
@Schema(description = "工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@ExcelProperty("工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String workInjuryHandle;
/**
* 生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败
* 生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理
*/
@Length(max = 1, message = "生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败 不能超过1个字符" )
@ExcelAttribute(name = "生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败", maxLength = 1)
@Schema(description = "生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@Length(max = 1, message = "生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理 不能超过1个字符" )
@ExcelAttribute(name = "生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理", maxLength = 1)
@Schema(description = "生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@ExcelProperty("生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String birthHandle;
/**
* 大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败
* 大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理
*/
@Length(max = 1, message = "大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败 不能超过1个字符" )
@ExcelAttribute(name = "大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败", maxLength = 1)
@Schema(description = "大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@Length(max = 1, message = "大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理 不能超过1个字符" )
@ExcelAttribute(name = "大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理", maxLength = 1)
@Schema(description = "大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@ExcelProperty("大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String bigailmentHandle;
/**
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialInfo.java
View file @ 92705142
......@@ -857,58 +857,58 @@ public class TSocialInfo extends BaseEntity {
private Date bigailmentReduceStart;
/**
* 养老办理状态：0待办理1办理成功2办理失败3已派减4派减失败
* 养老办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理
*/
@Length(max = 1, message = "养老办理状态：0待办理1办理成功2办理失败3已派减 4派减失败 不能超过1个字符" )
@ExcelAttribute(name = "养老办理状态：0待办理1办理成功2办理失败3已派减4派减失败", maxLength = 1)
@Schema(description = "养老办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@ExcelAttribute(name = "养老办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理", maxLength = 1)
@Schema(description = "养老办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@ExcelProperty("养老办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
private String pensionHandle;
/**
* 医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败
* 医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理
*/
@Length(max = 1, message = "医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败 不能超过1个字符" )
@ExcelAttribute(name = "医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败", maxLength = 1)
@Schema(description = "医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@Length(max = 1, message = "医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理 不能超过1个字符" )
@ExcelAttribute(name = "医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理", maxLength = 1)
@Schema(description = "医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@ExcelProperty("医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
private String medicalHandle;
/**
* 失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败
* 失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理
*/
@Length(max = 1, message = "失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败 不能超过1个字符" )
@ExcelAttribute(name = "失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败", maxLength = 1)
@Schema(description = "失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@Length(max = 1, message = "失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理 不能超过1个字符" )
@ExcelAttribute(name = "失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理", maxLength = 1)
@Schema(description = "失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@ExcelProperty("失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
private String unemployHandle;
/**
* 工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败
* 工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理
*/
@Length(max = 1, message = "工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败 不能超过1个字符" )
@ExcelAttribute(name = "工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败", maxLength = 1)
@Schema(description = "工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@Length(max = 1, message = "工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理 不能超过1个字符" )
@ExcelAttribute(name = "工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理", maxLength = 1)
@Schema(description = "工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@ExcelProperty("工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
private String workInjuryHandle;
/**
* 生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败
* 生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理
*/
@Length(max = 1, message = "生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败 不能超过1个字符" )
@ExcelAttribute(name = "生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败", maxLength = 1)
@Schema(description = "生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@Length(max = 1, message = "生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理 不能超过1个字符" )
@ExcelAttribute(name = "生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理", maxLength = 1)
@Schema(description = "生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@ExcelProperty("生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
private String birthHandle;
/**
* 大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败
* 大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理
*/
@Length(max = 1, message = "大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败 不能超过1个字符" )
@ExcelAttribute(name = "大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败", maxLength = 1)
@Schema(description = "大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@Length(max = 1, message = "大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理 不能超过1个字符" )
@ExcelAttribute(name = "大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理", maxLength = 1)
@Schema(description = "大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@ExcelProperty("大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理" )
private String bigailmentHandle;
/**
* 基数上限（社保或公积金）
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ 92705142
......@@ -2035,6 +2035,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
|| CommonConstants.ONE_STRING.equals(sf.getSocialAddStatus())
|| CommonConstants.SIX_STRING.equals(sf.getSocialAddStatus())
|| CommonConstants.ELEVEN_STRING.equals(sf.getSocialStatus())
|| CommonConstants.SIX_STRING.equals(sf.getSocialStatus())
|| CommonConstants.SEVEN_STRING.equals(sf.getSocialStatus())
) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_EXISTING)));
return true;
......@@ -2845,7 +2847,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
// 项目编码校验
//社保状态：派增（0待审核、1待办理、2办理中 3办理成功、4部分办理失败 5 办理失败）、派减（6待审核 7待办理 8办理成功 9 办理失败）
//社保状态：派增（0待审核、1待办理、2办理中 3办理成功、4部分办理失败 5 办理失败）、派减（6待审核 7待办理 8办理成功 9 办理失败12 派减部分办理失败）
if (Common.isNotNull(excel.getSocialReduceDate())){
if (Common.isEmpty(socialFund.getSocialStatus())
|| !(socialFund.getSocialStatus().equals(CommonConstants.THREE_STRING)
......@@ -3044,13 +3046,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
// 派减审核
if (CommonConstants.dingleDigitStrArray[1].equals(dis.getType())){
//派增审核通过
//派减审核通过
if (CommonConstants.ZERO_INT == flag) {
socialInfo.setReduceCan(CommonConstants.ONE_STRING);
// 待办理
sf.setSocialReduceStatus(CommonConstants.ONE_STRING);
sf.setSocialStatus(CommonConstants.SEVEN_STRING);
//派增审核不通过 需要处理预估数据
// 各个明细项的可派减项为待办理
initReduceStatus(sf,socialInfo);
//派减审核不通过 需要处理预估数据
} else if (CommonConstants.ONE_INT == flag) {
// 作废更新：社保状态、同步预估数据 8 审核不通过直接作废
sf.setSocialReduceStatus(CommonConstants.ONE_STRING_NEGATE);
......@@ -3179,8 +3183,19 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
}
if (CommonConstants.ONE_INT == flag && flagTemp){
sf.setSocialStatus(CommonConstants.FOUR_STRING);
sf.setSocialAddStatus(CommonConstants.THREE_STRING);
if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType())){
sf.setSocialStatus(CommonConstants.FOUR_STRING);
sf.setSocialAddStatus(CommonConstants.THREE_STRING);
}else if (CommonConstants.dingleDigitStrArray[1].equals(dis.getType())
&& (CommonConstants.FOUR_STRING.equals(sf.getPensionHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getMedicalHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getBirthHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getUnemployHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getWorkInjuryHandle()))){
sf.setSocialStatus(CommonConstants.TWELVE_STRING);
sf.setSocialReduceStatus(CommonConstants.SIX_STRING);
}
}
//新增审核记录信息
auditInfo.setEmpIdcard(dis.getEmpIdcard());
......@@ -3230,6 +3245,47 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
return errorList;
}
private void initReduceStatus(TSocialFundInfo sf, TSocialInfo socialInfo) {
// 各个明细项的可派减项为待办理
if (CommonConstants.ONE_STRING.equals(sf.getPensionHandle()) || CommonConstants.FOUR_STRING.equals(sf.getPensionHandle())){
sf.setPensionHandle(CommonConstants.FIVE_STRING);
}
if (CommonConstants.ONE_STRING.equals(sf.getMedicalHandle()) || CommonConstants.FOUR_STRING.equals(sf.getMedicalHandle())){
sf.setMedicalHandle(CommonConstants.FIVE_STRING);
}
if (CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle()) || CommonConstants.FOUR_STRING.equals(sf.getWorkInjuryHandle())){
sf.setWorkInjuryHandle(CommonConstants.FIVE_STRING);
}
if (CommonConstants.ONE_STRING.equals(sf.getUnemployHandle()) || CommonConstants.FOUR_STRING.equals(sf.getUnemployHandle())){
sf.setUnemployHandle(CommonConstants.FIVE_STRING);
}
if (CommonConstants.ONE_STRING.equals(sf.getBirthHandle()) || CommonConstants.FOUR_STRING.equals(sf.getBirthHandle())){
sf.setBirthHandle(CommonConstants.FIVE_STRING);
}
if (CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle()) || CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle())){
sf.setBigailmentHandle(CommonConstants.FIVE_STRING);
}
if (CommonConstants.ONE_STRING.equals(socialInfo.getPensionHandle()) || CommonConstants.FOUR_STRING.equals(socialInfo.getPensionHandle())){
socialInfo.setPensionHandle(CommonConstants.FIVE_STRING);
}
if (CommonConstants.ONE_STRING.equals(socialInfo.getMedicalHandle()) || CommonConstants.FOUR_STRING.equals(socialInfo.getMedicalHandle())){
socialInfo.setMedicalHandle(CommonConstants.FIVE_STRING);
}
if (CommonConstants.ONE_STRING.equals(socialInfo.getWorkInjuryHandle()) || CommonConstants.FOUR_STRING.equals(socialInfo.getWorkInjuryHandle())){
socialInfo.setWorkInjuryHandle(CommonConstants.FIVE_STRING);
}
if (CommonConstants.ONE_STRING.equals(socialInfo.getUnemployHandle()) || CommonConstants.FOUR_STRING.equals(socialInfo.getUnemployHandle())){
socialInfo.setUnemployHandle(CommonConstants.FIVE_STRING);
}
if (CommonConstants.ONE_STRING.equals(socialInfo.getBirthHandle()) || CommonConstants.FOUR_STRING.equals(socialInfo.getBirthHandle())){
socialInfo.setBirthHandle(CommonConstants.FIVE_STRING);
}
if (CommonConstants.ONE_STRING.equals(socialInfo.getBigailmentHandle()) || CommonConstants.FOUR_STRING.equals(socialInfo.getBigailmentHandle())){
socialInfo.setBigailmentHandle(CommonConstants.FIVE_STRING);
}
}
@Transactional(rollbackFor = Exception.class)
@ShardingTransactionType(TransactionType.BASE)
@Override
......@@ -3702,7 +3758,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
// 2.派减办理成功 处理预估 (不管社保还是公积金办理失败)
if (CommonConstants.ONE_STRING.equals(dis.getType())
&& CommonConstants.ZERO_INT == flag){
&& CommonConstants.ZERO_INT == flag
&& CommonConstants.EIGHT_STRING.equals(sf.getSocialStatus())){
// 同步预估库数据
socialTask.asynchronousDisPatchHandle(sf, forecastFlag,null,null,CommonConstants.ZERO_INT);
}
......@@ -3881,27 +3938,27 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
for (String st : stArr) {
// socialType （1养老 2医疗 3失业 4工伤 5生育 6大病）
if (Integer.parseInt(st) == CommonConstants.ONE_INT
&& CommonConstants.ONE_STRING.equals(socialInfo.getPensionHandle())){
&& CommonConstants.FIVE_STRING.equals(socialInfo.getPensionHandle())){
socialTypeRemark.append(CommonConstants.SOCIAL_HANDLE_TYPE[Integer.parseInt(st)]).append("、");
}
if (Integer.parseInt(st) == CommonConstants.TWO_INT
&& CommonConstants.ONE_STRING.equals(socialInfo.getMedicalHandle())){
&& CommonConstants.FIVE_STRING.equals(socialInfo.getMedicalHandle())){
socialTypeRemark.append(CommonConstants.SOCIAL_HANDLE_TYPE[Integer.parseInt(st)]).append("、");
}
if (Integer.parseInt(st) == CommonConstants.THREE_INT
&& CommonConstants.ONE_STRING.equals(socialInfo.getUnemployHandle())){
&& CommonConstants.FIVE_STRING.equals(socialInfo.getUnemployHandle())){
socialTypeRemark.append(CommonConstants.SOCIAL_HANDLE_TYPE[Integer.parseInt(st)]).append("、");
}
if (Integer.parseInt(st) == CommonConstants.FOUR_INT
&& CommonConstants.ONE_STRING.equals(socialInfo.getWorkInjuryHandle())){
&& CommonConstants.FIVE_STRING.equals(socialInfo.getWorkInjuryHandle())){
socialTypeRemark.append(CommonConstants.SOCIAL_HANDLE_TYPE[Integer.parseInt(st)]).append("、");
}
if (Integer.parseInt(st) == CommonConstants.FIVE_INT
&& CommonConstants.ONE_STRING.equals(socialInfo.getBirthHandle())){
&& CommonConstants.FIVE_STRING.equals(socialInfo.getBirthHandle())){
socialTypeRemark.append(CommonConstants.SOCIAL_HANDLE_TYPE[Integer.parseInt(st)]).append("、");
}
if (Integer.parseInt(st) == CommonConstants.SIX_INT
&& CommonConstants.ONE_STRING.equals(socialInfo.getBigailmentHandle())
&& CommonConstants.FIVE_STRING.equals(socialInfo.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(socialInfo.getIsIllness())){
socialTypeRemark.append(CommonConstants.SOCIAL_HANDLE_TYPE[Integer.parseInt(st)]).append("、");
}
......@@ -4031,23 +4088,17 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private void initReduceStatus(TSocialInfo socialInfo, TSocialFundInfo sf, TDispatchInfo dis) {
// 全部失败
if ((CommonConstants.FOUR_STRING.equals(socialInfo.getPensionHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getPensionHandle())
|| Common.isEmpty(socialInfo.getPensionHandle()))
&& (CommonConstants.FOUR_STRING.equals(socialInfo.getMedicalHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getMedicalHandle())
|| Common.isEmpty(socialInfo.getMedicalHandle()))
&& ( CommonConstants.FOUR_STRING.equals(socialInfo.getWorkInjuryHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getWorkInjuryHandle())
|| Common.isEmpty(socialInfo.getWorkInjuryHandle()))
&& ( CommonConstants.FOUR_STRING.equals(socialInfo.getBirthHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getBirthHandle())
|| Common.isEmpty(socialInfo.getBirthHandle()))
&& ( CommonConstants.FOUR_STRING.equals(socialInfo.getUnemployHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getUnemployHandle())
|| Common.isEmpty(socialInfo.getUnemployHandle()))
&& ( (
&& (
(CommonConstants.FOUR_STRING.equals(socialInfo.getBigailmentHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getBigailmentHandle()))
&& CommonConstants.ZERO_STRING.equals(socialInfo.getIsIllness())
)
|| Common.isEmpty(socialInfo.getBigailmentHandle()))
......@@ -4061,56 +4112,47 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
// 全部成功
if ((CommonConstants.THREE_STRING.equals(socialInfo.getPensionHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getPensionHandle())
|| Common.isEmpty(socialInfo.getPensionHandle()))
&& (CommonConstants.THREE_STRING.equals(socialInfo.getMedicalHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getMedicalHandle())
|| Common.isEmpty(socialInfo.getMedicalHandle()))
&& ( CommonConstants.THREE_STRING.equals(socialInfo.getWorkInjuryHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getWorkInjuryHandle())
|| Common.isEmpty(socialInfo.getWorkInjuryHandle()))
&& ( CommonConstants.THREE_STRING.equals(socialInfo.getBirthHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getBirthHandle())
|| Common.isEmpty(socialInfo.getBirthHandle()))
&& ( CommonConstants.THREE_STRING.equals(socialInfo.getUnemployHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getUnemployHandle())
|| Common.isEmpty(socialInfo.getUnemployHandle()))
&& ( (
(CommonConstants.THREE_STRING.equals(socialInfo.getBigailmentHandle())
|| CommonConstants.TWO_STRING.equals(socialInfo.getBigailmentHandle()))
CommonConstants.THREE_STRING.equals(socialInfo.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(socialInfo.getIsIllness()))
|| Common.isEmpty(socialInfo.getBigailmentHandle()))
){
if (CommonConstants.FOUR_STRING.equals(sf.getMedicalHandle())
||CommonConstants.FOUR_STRING.equals(sf.getPensionHandle())
||CommonConstants.FOUR_STRING.equals(sf.getWorkInjuryHandle())
||CommonConstants.FOUR_STRING.equals(sf.getBirthHandle())
||CommonConstants.FOUR_STRING.equals(sf.getUnemployHandle())
||CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle())){
// 派减部分办理失败
socialInfo.setHandleStatus(CommonConstants.SEVEN_STRING);
sf.setSocialStatus(CommonConstants.TWELVE_STRING);
sf.setSocialReduceStatus(CommonConstants.SIX_STRING);
socialInfo.setReduceCan(CommonConstants.ZERO_STRING);
dis.setSocialHandleStatus(CommonConstants.THREE_STRING);
}else {
socialInfo.setHandleStatus(CommonConstants.THREE_STRING);
sf.setSocialStatus(CommonConstants.EIGHT_STRING);
sf.setSocialReduceStatus(CommonConstants.TWO_STRING);
socialInfo.setSocialReduceDate(dis.getSocialReduceDate());
sf.setSocialReduceDate(dis.getSocialReduceDate());
dis.setSocialHandleStatus(CommonConstants.ONE_STRING);
}
socialInfo.setHandleStatus(CommonConstants.THREE_STRING);
sf.setSocialStatus(CommonConstants.EIGHT_STRING);
sf.setSocialReduceStatus(CommonConstants.TWO_STRING);
socialInfo.setSocialReduceDate(dis.getSocialReduceDate());
sf.setSocialReduceDate(dis.getSocialReduceDate());
dis.setSocialHandleStatus(CommonConstants.ONE_STRING);
return;
}
if ((Common.isEmpty(sf.getPensionHandle()) || CommonConstants.ONE_STRING.equals(sf.getPensionHandle()))
|| (Common.isEmpty(sf.getMedicalHandle()) || CommonConstants.ONE_STRING.equals(sf.getMedicalHandle()))
|| (Common.isEmpty(sf.getUnemployHandle()) || CommonConstants.ONE_STRING.equals(sf.getUnemployHandle()))
|| (Common.isEmpty(sf.getWorkInjuryHandle()) || CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle()))
|| (Common.isEmpty(sf.getBirthHandle()) || CommonConstants.ONE_STRING.equals(sf.getBirthHandle()))
|| (Common.isNotNull(sf.getBigailmentHandle()) && CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
/*if (CommonConstants.FOUR_STRING.equals(sf.getMedicalHandle())
||CommonConstants.FOUR_STRING.equals(sf.getPensionHandle())
||CommonConstants.FOUR_STRING.equals(sf.getWorkInjuryHandle())
||CommonConstants.FOUR_STRING.equals(sf.getBirthHandle())
||CommonConstants.FOUR_STRING.equals(sf.getUnemployHandle())
||CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle())){
// 派减部分办理失败
socialInfo.setHandleStatus(CommonConstants.SEVEN_STRING);
sf.setSocialStatus(CommonConstants.TWELVE_STRING);
sf.setSocialReduceStatus(CommonConstants.SIX_STRING);
socialInfo.setReduceCan(CommonConstants.ZERO_STRING);
dis.setSocialHandleStatus(CommonConstants.THREE_STRING);
}*/
if ((Common.isEmpty(sf.getPensionHandle()) || CommonConstants.FIVE_STRING.equals(sf.getPensionHandle()))
|| (Common.isEmpty(sf.getMedicalHandle()) || CommonConstants.FIVE_STRING.equals(sf.getMedicalHandle()))
|| (Common.isEmpty(sf.getUnemployHandle()) || CommonConstants.FIVE_STRING.equals(sf.getUnemployHandle()))
|| (Common.isEmpty(sf.getWorkInjuryHandle()) || CommonConstants.FIVE_STRING.equals(sf.getWorkInjuryHandle()))
|| (Common.isEmpty(sf.getBirthHandle()) || CommonConstants.FIVE_STRING.equals(sf.getBirthHandle()))
|| (Common.isNotNull(sf.getBigailmentHandle()) && CommonConstants.FIVE_STRING.equals(sf.getBigailmentHandle())
)) {
//办理中
socialInfo.setHandleStatus(CommonConstants.SIX_STRING);
......@@ -4320,8 +4362,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
boolean flag = CommonConstants.THREE_STRING.equals(handleStatusTemp);
if (socialType.contains(CommonConstants.ONE_STRING)) {
if (CommonConstants.ONE_STRING.equals(sf.getPensionHandle()) || CommonConstants.FOUR_STRING.equals(sf.getPensionHandle())){
if (Common.isNotNull(socialInfo.getPensionHandle())){
if (CommonConstants.FIVE_STRING.equals(sf.getPensionHandle())){
if (CommonConstants.FIVE_STRING.equals(socialInfo.getPensionHandle())){
socialInfo.setPensionHandle(handleStatusTemp);
if (flag){
socialInfo.setPensionReduceStart(dis.getSocialReduceDate());
......@@ -4337,8 +4379,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}*/
}
if (socialType.contains(CommonConstants.TWO_STRING)) {
if (CommonConstants.ONE_STRING.equals(sf.getMedicalHandle()) || CommonConstants.FOUR_STRING.equals(sf.getMedicalHandle())){
if (Common.isNotNull(socialInfo.getMedicalHandle())){
if (CommonConstants.FIVE_STRING.equals(sf.getMedicalHandle())){
if (CommonConstants.FIVE_STRING.equals(socialInfo.getMedicalHandle())){
socialInfo.setMedicalHandle(handleStatusTemp);
if (flag){
socialInfo.setMedicalReduceStart(dis.getSocialReduceDate());
......@@ -4354,8 +4396,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}*/
}
if (socialType.contains(CommonConstants.THREE_STRING)) {
if (CommonConstants.ONE_STRING.equals(sf.getUnemployHandle()) || CommonConstants.FOUR_STRING.equals(sf.getUnemployHandle())){
if (Common.isNotNull(socialInfo.getUnemployHandle())){
if (CommonConstants.FIVE_STRING.equals(sf.getUnemployHandle())){
if (CommonConstants.FIVE_STRING.equals(socialInfo.getUnemployHandle())){
socialInfo.setUnemployHandle(handleStatusTemp);
if (flag){
socialInfo.setUnemployReduceStart(dis.getSocialReduceDate());
......@@ -4371,8 +4413,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}*/
}
if (socialType.contains(CommonConstants.FOUR_STRING)) {
if (CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle()) || CommonConstants.FOUR_STRING.equals(sf.getWorkInjuryHandle())){
if (Common.isNotNull(socialInfo.getWorkInjuryHandle())){
if (CommonConstants.FIVE_STRING.equals(sf.getWorkInjuryHandle())){
if (CommonConstants.FIVE_STRING.equals(socialInfo.getWorkInjuryHandle())){
socialInfo.setWorkInjuryHandle(handleStatusTemp);
if (flag){
socialInfo.setWorkInjuryReduceStart(dis.getSocialReduceDate());
......@@ -4388,8 +4430,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}*/
}
if (socialType.contains(CommonConstants.FIVE_STRING)) {
if (CommonConstants.ONE_STRING.equals(sf.getBirthHandle()) || CommonConstants.FOUR_STRING.equals(sf.getBirthHandle())){
if (Common.isNotNull(socialInfo.getBirthHandle())){
if (CommonConstants.FIVE_STRING.equals(sf.getBirthHandle())){
if (CommonConstants.FIVE_STRING.equals(socialInfo.getBirthHandle())){
socialInfo.setBirthHandle(handleStatusTemp);
if (flag){
socialInfo.setBirthReduceStart(dis.getSocialReduceDate());
......@@ -4406,8 +4448,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
if (socialType.contains(CommonConstants.SIX_STRING)
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())) {
if (CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle()) || CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle())){
if (Common.isNotNull(socialInfo.getBigailmentHandle())){
if (CommonConstants.FIVE_STRING.equals(sf.getBigailmentHandle())){
if (CommonConstants.FIVE_STRING.equals(socialInfo.getBigailmentHandle())){
socialInfo.setBigailmentHandle(handleStatusTemp);
if (flag){
socialInfo.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