合同状态变更 & 派单大病已派减后的全部办理成功和全部办理失败

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java

@@ -426,7 +426,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 						|| (!EmployeeConstants.SITUATION_SIX.equals(contractInfo.getSituation())
 						&& !EmployeeConstants.SITUATION_SEVEN.equals(contractInfo.getSituation()))) {
 					// 其他变为不在用
-					baseMapper.updateInUseStatusById(contractInfo.getEmpId(), contractInfo.getSettleDomain(), contractInfo.getId(), CommonConstants.ONE_STRING);
+					baseMapper.updateInUseStatusById(contractInfo.getEmpId(), contractInfo.getDeptNo(), contractInfo.getId(), CommonConstants.ONE_STRING);
 					tEmployeeContractInfo.setAuditTimeLast(LocalDateTime.now());
 					tEmployeeContractInfo.setInUse(CommonConstants.ZERO_STRING);
 					// 更新档案、项目合同状态为（1可用）

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

@@ -1221,6 +1221,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				temp.append(DispatchConstants.DISPATCH_FUND);
 			}
 		}
+		if (Common.isNotNull(temp.toString())){
+			temp.deleteCharAt(temp.length()-1);
+		}
 		dispatch.setDispatchItem(temp.toString());
 	}
 
@@ -3609,7 +3612,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					&& (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.isEmpty(sf.getBigailmentHandle()) || CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle()))) {
+					&& (Common.isEmpty(sf.getBigailmentHandle())
+					|| CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
+					|| CommonConstants.THREE_STRING.equals(sf.getBigailmentHandle()))) {
 				// 全部成功（或者为空--兼容历史数据问题）：全部成功
 				socialInfo.setHandleStatus(CommonConstants.ONE_STRING);
 				socialInfo.setReduceCan(CommonConstants.dingleDigitStrArray[0]);//改成可派减状态
@@ -3623,7 +3628,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					&& (Common.isEmpty(sf.getUnemployHandle()) || CommonConstants.TWO_STRING.equals(sf.getUnemployHandle()))
 					&& (Common.isEmpty(sf.getWorkInjuryHandle()) || CommonConstants.TWO_STRING.equals(sf.getWorkInjuryHandle()))
 					&& (Common.isEmpty(sf.getBirthHandle()) || CommonConstants.TWO_STRING.equals(sf.getBirthHandle()))
-					&& (Common.isEmpty(sf.getBigailmentHandle()) || CommonConstants.TWO_STRING.equals(sf.getBigailmentHandle()))) {
+					&& (Common.isEmpty(sf.getBigailmentHandle())
+					|| CommonConstants.TWO_STRING.equals(sf.getBigailmentHandle())
+					|| CommonConstants.THREE_STRING.equals(sf.getBigailmentHandle()))
+					) {
 				// 全部失败（或者为空）：全部失败
 				socialInfo.setHandleStatus(CommonConstants.TWO_STRING);
 				socialInfo.setReduceCan(CommonConstants.dingleDigitStrArray[1]);//改成不可派减状态