Merge remote-tracking branch 'origin/develop' into develop

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java

@@ -840,7 +840,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 				long start = tSalaryStandard.getIncomeStartTime().getTime() + 1800000;
 				long end = new Date().getTime();
 				if (start > end) {
-					return R.failed("上次生成时间：" + tSalaryStandard.getIncomeStartTime() + "，请稍等30分钟");
+					return R.failed("上次生成时间：" + DateUtil.formatDatePatten(tSalaryStandard.getIncomeStartTime(), DateUtil.DATETIME_PATTERN_SECOND) + "，请稍等30分钟");
 				}
 			}
 			R<TSettleDomainSelectVo> sdr = HttpDaprUtil.invokeMethodPost(archivesProperties.getAppUrl(), archivesProperties.getAppId()
@@ -862,7 +862,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 				this.updateById(tSalaryStandard);
 				// 异步-收入相关
 				doSalaryAsync.doIncomeDetail(dept, salaryAccountList, id, tSalaryStandard);
-				return R.ok("生成收入并推送中，请耐心等待30分钟！");
+				return R.ok(null, "生成收入并推送中，请耐心等待！");
 			}
 			return R.failed("未获取到报账明细，请重试");
 		} else {

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

@@ -3278,6 +3278,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				int forecastFlag = CommonConstants.ZERO_INT;
 				// auditFlag 表示社保办理无办理项是不保存
 				boolean auditFlag = true;
+				boolean partSuccess = false;
 				for (TDispatchInfo dis : disList) {
 					auditFlag = true;
 					if (CommonConstants.ZERO_STRING.equals(typeSub)) {
@@ -3293,6 +3294,21 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 						errorList.add(new ErrorMessage(-1, "找不到员工社保公积金查询数据：" + dis.getEmpName()));
 						continue;
 					}
+					partSuccess = 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.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.ONE_STRING.equals(sf.getBigailmentHandle())
+							&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())));
 					if (!CommonConstants.TWO_STRING.equals(dis.getStatus())) {
 						errorList.add(new ErrorMessage(-1, "派单审核通过后才可以办理：" + dis.getEmpName()));
 						continue;
@@ -3584,9 +3600,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 									&& CommonConstants.FOUR_STRING.equals(sf.getSocialStatus())
 									|| CommonConstants.TWO_STRING.equals(sf.getSocialStatus())
 									|| CommonConstants.THREE_STRING.equals(sf.getSocialStatus())){
+								if (partSuccess){
+									forecastLibraryService.updateForecastLibaryByDispatch(sf);
+								}else {
 									socialTask.asynchronousDisPatchHandle(sf, 0,null,null,CommonConstants.ONE_INT);
 								}
 							}
+						}
 						//  2.派减办理成功  处理预估 (不管社保还是公积金办理失败)
 						if (CommonConstants.ONE_STRING.equals(dis.getType())
 								&& CommonConstants.ZERO_INT == flag){