Merge remote-tracking branch 'origin/MVP1.5' into MVP1.5

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

@@ -3140,6 +3140,31 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					}
 
 					boolean flagTemp = false;
+					// 派增审核不通过 失败项重新派单审核不通过 或 派减审核不通过 恢复为部分办理失败
+					flagTemp = Common.isNotNull(sf) && Common.isNotNull(dis.getSocialId())
+							&& (CommonConstants.ONE_STRING.equals(sf.getPensionHandle())
+							|| CommonConstants.ONE_STRING.equals(sf.getMedicalHandle())
+							|| CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle())
+							|| CommonConstants.ONE_STRING.equals(sf.getBirthHandle())
+							|| CommonConstants.ONE_STRING.equals(sf.getUnemployHandle())
+							|| (CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
+							|| CommonConstants.FOUR_STRING.equals(sf.getPensionHandle())
+							|| CommonConstants.FOUR_STRING.equals(sf.getMedicalHandle())
+							|| CommonConstants.FOUR_STRING.equals(sf.getWorkInjuryHandle())
+							|| CommonConstants.FOUR_STRING.equals(sf.getBirthHandle())
+							|| CommonConstants.FOUR_STRING.equals(sf.getUnemployHandle())
+							|| ((CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
+							|| CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle()))
+							&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness()))
+					))
+							&& !(
+							(CommonConstants.ONE_STRING.equals(sf.getPensionHandle()) || CommonConstants.FOUR_STRING.equals(sf.getPensionHandle()))
+									&& (CommonConstants.ONE_STRING.equals(sf.getMedicalHandle()) || CommonConstants.FOUR_STRING.equals(sf.getMedicalHandle()))
+									&& (CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle()) || CommonConstants.FOUR_STRING.equals(sf.getWorkInjuryHandle()))
+									&& (CommonConstants.ONE_STRING.equals(sf.getBirthHandle()) || CommonConstants.FOUR_STRING.equals(sf.getBirthHandle()))
+									&& (CommonConstants.ONE_STRING.equals(sf.getUnemployHandle()) || CommonConstants.FOUR_STRING.equals(sf.getUnemployHandle()))
+									&& ((CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle()) || CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle()))
+									&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())));
 					// 派增审核通过 要更新 人员档案 项目档案 合同的状态信息
 					if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType())){
 						R<Boolean> res = null;
@@ -3148,41 +3173,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 						}
 						if (CommonConstants.ONE_INT == flag){
 							res = archivesDaprUtil.updateEmpInfo(dis.getEmpIdcard(),dis.getSettleDomainCode(),dis.getContractId(),CommonConstants.ONE_STRING,remarkTemp);
-
-							// 派增审核不通过 失败项重新派单审核不通过 恢复为部分办理失败
-							flagTemp = Common.isNotNull(sf) && Common.isNotNull(dis.getSocialId())
-									&& (CommonConstants.ONE_STRING.equals(sf.getPensionHandle())
-									|| CommonConstants.ONE_STRING.equals(sf.getMedicalHandle())
-									|| CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle())
-									|| CommonConstants.ONE_STRING.equals(sf.getBirthHandle())
-									|| CommonConstants.ONE_STRING.equals(sf.getUnemployHandle())
-									|| (CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
-									|| CommonConstants.FOUR_STRING.equals(sf.getPensionHandle())
-									|| CommonConstants.FOUR_STRING.equals(sf.getMedicalHandle())
-									|| CommonConstants.FOUR_STRING.equals(sf.getWorkInjuryHandle())
-									|| CommonConstants.FOUR_STRING.equals(sf.getBirthHandle())
-									|| CommonConstants.FOUR_STRING.equals(sf.getUnemployHandle())
-									|| ((CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
-									|| CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle()))
-									&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness()))
-									))
-									&& !(
-									(CommonConstants.ONE_STRING.equals(sf.getPensionHandle()) || CommonConstants.FOUR_STRING.equals(sf.getPensionHandle()))
-									&& (CommonConstants.ONE_STRING.equals(sf.getMedicalHandle()) || CommonConstants.FOUR_STRING.equals(sf.getMedicalHandle()))
-									&& (CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle()) || CommonConstants.FOUR_STRING.equals(sf.getWorkInjuryHandle()))
-									&& (CommonConstants.ONE_STRING.equals(sf.getBirthHandle()) || CommonConstants.FOUR_STRING.equals(sf.getBirthHandle()))
-									&& (CommonConstants.ONE_STRING.equals(sf.getUnemployHandle()) || CommonConstants.FOUR_STRING.equals(sf.getUnemployHandle()))
-									&& ((CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle()) || CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle()))
-									&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())));
-							if (flagTemp){
-								sf.setSocialStatus(CommonConstants.FOUR_STRING);
-								sf.setSocialAddStatus(CommonConstants.THREE_STRING);
-							}
 						}
 						if (Common.isEmpty(res) || CommonConstants.SUCCESS != res.getCode()){
 							ServiceUtil.runTimeExceptionDiy("更新人员档案、项目档案、合同状态异常：" + (Common.isNotNull(res)?res.getMsg():CommonConstants.EMPTY_STRING));
 						}
 					}
+					if (CommonConstants.ONE_INT == flag && flagTemp){
+						sf.setSocialStatus(CommonConstants.FOUR_STRING);
+						sf.setSocialAddStatus(CommonConstants.THREE_STRING);
+					}
 					//新增审核记录信息
 					auditInfo.setEmpIdcard(dis.getEmpIdcard());
 					auditInfo.setDispatchInfoId(dis.getId());
@@ -3369,14 +3368,29 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 							|| CommonConstants.ONE_STRING.equals(sf.getBirthHandle())
 							|| CommonConstants.ONE_STRING.equals(sf.getUnemployHandle())
 							|| (CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
-							&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())))
-							&& !(CommonConstants.ONE_STRING.equals(sf.getPensionHandle())
-							&& CommonConstants.ONE_STRING.equals(sf.getMedicalHandle())
-							&& CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle())
-							&& CommonConstants.ONE_STRING.equals(sf.getBirthHandle())
-							&& CommonConstants.ONE_STRING.equals(sf.getUnemployHandle())
+							|| CommonConstants.FOUR_STRING.equals(sf.getPensionHandle())
+							|| CommonConstants.FOUR_STRING.equals(sf.getMedicalHandle())
+							|| CommonConstants.FOUR_STRING.equals(sf.getWorkInjuryHandle())
+							|| CommonConstants.FOUR_STRING.equals(sf.getBirthHandle())
+							|| CommonConstants.FOUR_STRING.equals(sf.getUnemployHandle())
+							|| ((CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
+							|| CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle()))
+							&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness()))
+							))
+							&& !((CommonConstants.ONE_STRING.equals(sf.getPensionHandle())
+							|| CommonConstants.FOUR_STRING.equals(sf.getPensionHandle()))
+							&& (CommonConstants.ONE_STRING.equals(sf.getMedicalHandle())
+							|| CommonConstants.FOUR_STRING.equals(sf.getMedicalHandle()))
+							&& (CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle())
+							|| CommonConstants.FOUR_STRING.equals(sf.getWorkInjuryHandle()))
+							&& (CommonConstants.ONE_STRING.equals(sf.getBirthHandle())
+							|| CommonConstants.FOUR_STRING.equals(sf.getBirthHandle()))
+							&& (CommonConstants.ONE_STRING.equals(sf.getUnemployHandle())
+							|| CommonConstants.FOUR_STRING.equals(sf.getUnemployHandle()))
 							&& (CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
-							&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())));
+							|| CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle())
+							|| Common.isEmpty(sf.getBigailmentHandle()))
+					);
 					if (!CommonConstants.TWO_STRING.equals(dis.getStatus())) {
 						errorList.add(new ErrorMessage(-1, "派单审核通过后才可以办理：" + dis.getEmpName()));
 						continue;
@@ -3390,6 +3404,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 						}
 						socialInfo = socialMapper.selectById(dis.getSocialId());
 						socialTypeRemark = getHandleRemark(socialType, socialInfo,dis.getType());
+						// 无更新直接跳过
+						if (Common.isEmpty(socialTypeRemark.toString())) {
+							continue;
+						}
 					} else {
 						socialInfo = null;
 					}