Skip to content

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

分布式锁调试--档案新增副本数测试

parent 2562480c
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 28 deletions
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ 282c0737
...@@ -1265,40 +1265,28 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1265,40 +1265,28 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private void initAddHandleItem(TDispatchImportVo excel, TSocialFundInfo socialFund, TDispatchInfo dispatch, SysBaseSetInfo socialSet, boolean injury) { private void initAddHandleItem(TDispatchImportVo excel, TSocialFundInfo socialFund, TDispatchInfo dispatch, SysBaseSetInfo socialSet, boolean injury) {
StringBuffer temp = new StringBuffer(); StringBuffer temp = new StringBuffer();
if (Common.isNotNull(socialFund)){ if (Common.isEmpty(socialFund)){
if (Common.isNotNull(excel.getSocialHousehold())){ if (Common.isNotNull(excel.getSocialHousehold())) {
if (Common.isEmpty(socialFund.getPensionHandle()) if (Common.isNotNull(excel.getPensionStart())) {
|| CommonConstants.TWO_STRING.equals(socialFund.getPensionHandle())
|| CommonConstants.THREE_STRING.equals(socialFund.getPensionHandle())){
temp.append(DispatchConstants.DISPATCH_PENSION); temp.append(DispatchConstants.DISPATCH_PENSION);
} }
if (Common.isEmpty(socialFund.getMedicalHandle()) if (Common.isNotNull(excel.getMedicalStart())) {
|| CommonConstants.TWO_STRING.equals(socialFund.getMedicalHandle()) temp.append(DispatchConstants.DISPATCH_MEDICAL);
|| CommonConstants.THREE_STRING.equals(socialFund.getMedicalHandle())){
temp.append(DispatchConstants.DISPATCH_MEDICAL);
}
} }
if (Common.isEmpty(socialFund.getBirthHandle()) if (Common.isNotNull(excel.getBirthStart())) {
|| CommonConstants.TWO_STRING.equals(socialFund.getBirthHandle())
|| CommonConstants.THREE_STRING.equals(socialFund.getBirthHandle())){
temp.append(DispatchConstants.DISPATCH_BIRTH); temp.append(DispatchConstants.DISPATCH_BIRTH);
} }
if (Common.isEmpty(socialFund.getWorkInjuryHandle()) if (Common.isNotNull(excel.getWorkInjuryStart())) {
|| CommonConstants.TWO_STRING.equals(socialFund.getWorkInjuryHandle())
|| CommonConstants.THREE_STRING.equals(socialFund.getWorkInjuryHandle())){
temp.append(DispatchConstants.DISPATCH_INJURY); temp.append(DispatchConstants.DISPATCH_INJURY);
} }
if (Common.isEmpty(socialFund.getUnemployHandle()) if (Common.isNotNull(excel.getUnemployStart())) {
|| CommonConstants.TWO_STRING.equals(socialFund.getUnemployHandle())
|| CommonConstants.THREE_STRING.equals(socialFund.getUnemployHandle())){
temp.append(DispatchConstants.DISPATCH_UNEMP); temp.append(DispatchConstants.DISPATCH_UNEMP);
} }
if ((Common.isEmpty(socialFund.getBigailmentHandle()) if (Common.isNotNull(excel.getBigailmentStart())
|| CommonConstants.TWO_STRING.equals(socialFund.getBigailmentHandle()) && CommonConstants.ZERO_STRING.equals(socialSet.getIsIllness())) {
|| CommonConstants.THREE_STRING.equals(socialFund.getBigailmentHandle()))
&& CommonConstants.ZERO_STRING.equals(socialSet.getIsIllness())) {
temp.append(DispatchConstants.DISPATCH_BIGMAILMENT); temp.append(DispatchConstants.DISPATCH_BIGMAILMENT);
} }
}
if (Common.isNotNull(excel.getProvidentHousehold())){ if (Common.isNotNull(excel.getProvidentHousehold())){
temp.append(DispatchConstants.DISPATCH_FUND); temp.append(DispatchConstants.DISPATCH_FUND);
} }
...@@ -2697,7 +2685,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2697,7 +2685,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
continue; continue;
} }
// 自定义校验 // 自定义校验
if (validReduce(errorMessageList,excelVOTemp, socialFundMap,socialFund, excel)){ if (validReduce(errorMessageList,excelVOTemp, socialFundMap,socialFund, excel)){
continue; continue;
} }
if (Common.isNotNull(empVoMap)) { if (Common.isNotNull(empVoMap)) {
...@@ -3963,8 +3951,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3963,8 +3951,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
|| CommonConstants.FOUR_STRING.equals(sf.getBirthHandle())) || CommonConstants.FOUR_STRING.equals(sf.getBirthHandle()))
&& (Common.isEmpty(sf.getBigailmentHandle()) && (Common.isEmpty(sf.getBigailmentHandle())
|| CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle()) || CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
|| (CommonConstants.THREE_STRING.equals(sf.getBigailmentHandle()) || CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle()))
&& CommonConstants.ONE_STRING.equals(socialInfo.getIsIllness())))
) { ) {
// 全部成功（或者为空--兼容历史数据问题）：全部成功 // 全部成功（或者为空--兼容历史数据问题）：全部成功
socialInfo.setHandleStatus(CommonConstants.ONE_STRING); socialInfo.setHandleStatus(CommonConstants.ONE_STRING);
...@@ -3981,8 +3968,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3981,8 +3968,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
&& (Common.isEmpty(sf.getBirthHandle()) || CommonConstants.TWO_STRING.equals(sf.getBirthHandle())) && (Common.isEmpty(sf.getBirthHandle()) || CommonConstants.TWO_STRING.equals(sf.getBirthHandle()))
&& (Common.isEmpty(sf.getBigailmentHandle()) && (Common.isEmpty(sf.getBigailmentHandle())
|| CommonConstants.TWO_STRING.equals(sf.getBigailmentHandle()) || CommonConstants.TWO_STRING.equals(sf.getBigailmentHandle())
|| (CommonConstants.THREE_STRING.equals(sf.getBigailmentHandle()) || CommonConstants.THREE_STRING.equals(sf.getBigailmentHandle()))
&& CommonConstants.ONE_STRING.equals(socialInfo.getIsIllness())))
) { ) {
// 全部失败（或者为空）：全部失败 // 全部失败（或者为空）：全部失败
socialInfo.setHandleStatus(CommonConstants.TWO_STRING); socialInfo.setHandleStatus(CommonConstants.TWO_STRING);
......
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