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

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -1265,40 +1265,28 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 
 	private void initAddHandleItem(TDispatchImportVo excel, TSocialFundInfo socialFund, TDispatchInfo dispatch, SysBaseSetInfo socialSet, boolean injury) {
 		StringBuffer temp = new StringBuffer();
-		if (Common.isNotNull(socialFund)){
-			if (Common.isNotNull(excel.getSocialHousehold())){
-				if (Common.isEmpty(socialFund.getPensionHandle())
-						|| CommonConstants.TWO_STRING.equals(socialFund.getPensionHandle())
-						|| CommonConstants.THREE_STRING.equals(socialFund.getPensionHandle())){
+		if (Common.isEmpty(socialFund)){
+			if (Common.isNotNull(excel.getSocialHousehold())) {
+				if (Common.isNotNull(excel.getPensionStart())) {
 					temp.append(DispatchConstants.DISPATCH_PENSION);
 				}
-				if (Common.isEmpty(socialFund.getMedicalHandle())
-						|| CommonConstants.TWO_STRING.equals(socialFund.getMedicalHandle())
-						|| CommonConstants.THREE_STRING.equals(socialFund.getMedicalHandle())){
-						temp.append(DispatchConstants.DISPATCH_MEDICAL);
-					}
+				if (Common.isNotNull(excel.getMedicalStart())) {
+					temp.append(DispatchConstants.DISPATCH_MEDICAL);
 				}
-				if (Common.isEmpty(socialFund.getBirthHandle())
-						|| CommonConstants.TWO_STRING.equals(socialFund.getBirthHandle())
-						|| CommonConstants.THREE_STRING.equals(socialFund.getBirthHandle())){
+				if (Common.isNotNull(excel.getBirthStart())) {
 					temp.append(DispatchConstants.DISPATCH_BIRTH);
 				}
-				if (Common.isEmpty(socialFund.getWorkInjuryHandle())
-						|| CommonConstants.TWO_STRING.equals(socialFund.getWorkInjuryHandle())
-						|| CommonConstants.THREE_STRING.equals(socialFund.getWorkInjuryHandle())){
+				if (Common.isNotNull(excel.getWorkInjuryStart())) {
 					temp.append(DispatchConstants.DISPATCH_INJURY);
 				}
-				if (Common.isEmpty(socialFund.getUnemployHandle())
-						|| CommonConstants.TWO_STRING.equals(socialFund.getUnemployHandle())
-						|| CommonConstants.THREE_STRING.equals(socialFund.getUnemployHandle())){
+				if (Common.isNotNull(excel.getUnemployStart())) {
 					temp.append(DispatchConstants.DISPATCH_UNEMP);
 				}
-				if ((Common.isEmpty(socialFund.getBigailmentHandle())
-						|| CommonConstants.TWO_STRING.equals(socialFund.getBigailmentHandle())
-						|| CommonConstants.THREE_STRING.equals(socialFund.getBigailmentHandle()))
-							&& CommonConstants.ZERO_STRING.equals(socialSet.getIsIllness())) {
+				if (Common.isNotNull(excel.getBigailmentStart())
+						&& CommonConstants.ZERO_STRING.equals(socialSet.getIsIllness())) {
 					temp.append(DispatchConstants.DISPATCH_BIGMAILMENT);
 				}
+			}
 			if (Common.isNotNull(excel.getProvidentHousehold())){
 				temp.append(DispatchConstants.DISPATCH_FUND);
 			}
@@ -2697,7 +2685,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				continue;
 			}
 			// 自定义校验
-			if (validReduce(errorMessageList,excelVOTemp, socialFundMap,socialFund, excel)){
+ 			if (validReduce(errorMessageList,excelVOTemp, socialFundMap,socialFund, excel)){
 				continue;
 			}
 			if (Common.isNotNull(empVoMap)) {
@@ -3963,8 +3951,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					|| CommonConstants.FOUR_STRING.equals(sf.getBirthHandle()))
 					&& (Common.isEmpty(sf.getBigailmentHandle())
 					|| CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
-					|| (CommonConstants.THREE_STRING.equals(sf.getBigailmentHandle())
-					&& CommonConstants.ONE_STRING.equals(socialInfo.getIsIllness())))
+					|| CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle()))
 			) {
 				// 全部成功（或者为空--兼容历史数据问题）：全部成功
 				socialInfo.setHandleStatus(CommonConstants.ONE_STRING);
@@ -3981,8 +3968,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					&& (Common.isEmpty(sf.getBirthHandle()) || CommonConstants.TWO_STRING.equals(sf.getBirthHandle()))
 					&& (Common.isEmpty(sf.getBigailmentHandle())
 					|| CommonConstants.TWO_STRING.equals(sf.getBigailmentHandle())
-					||  (CommonConstants.THREE_STRING.equals(sf.getBigailmentHandle())
-					&& CommonConstants.ONE_STRING.equals(socialInfo.getIsIllness())))
+					||  CommonConstants.THREE_STRING.equals(sf.getBigailmentHandle()))
 					) {
 				// 全部失败（或者为空）：全部失败
 				socialInfo.setHandleStatus(CommonConstants.TWO_STRING);