MVP8号版本

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceDetailMapper.java

@@ -255,4 +255,5 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
 	 **/
 	List<InsuranceUpdateVO> selectByIds(@Param("ids") List<String> ids);
 
+	List<TInsuranceDetail> selectPushList();
 }

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandard.java

@@ -148,12 +148,12 @@ public class TSalaryStandard extends BaseEntity {
 	@ExcelProperty("款项来源（0客户到款/1垫付）")
 	private Integer moneyFrom;
 	/**
-	 * 状态（0待提交1待审核2:待推送3已推送待发放4已发放5审核不通过6确认不通过7财务退回8：结算单调整待审核 9: 结算单调整待打印）
+	 * 状态（0待提交1待审核2:待推送3已推送待发放4已发放5审核不通过6确认不通过7财务退回8：结算单调整待审核 9: 结算单调整待打印 10 推送失败 11 推送收入中12推送收入失败）
 	 */
-	@ExcelAttribute(name = "状态（0待提交1待审核2:待推送3已推送待发放4已发放5审核不通过6确认不通过7财务退回8：结算单调整待审核 9: 结算单调整待打印10 推送失败）", isNotEmpty = true, errorInfo = "状态（0待提交1待审核2:待推送3已推送待发放4已发放5审核不通过6确认不通过7财务退回8：结算单调整待审核 9: 结算单调整待打印）不能为空")
-	@NotBlank(message = "状态（0待提交1待审核2:待推送3已推送待发放4已发放5审核不通过6确认不通过7财务退回8：结算单调整待审核 9: 结算单调整待打印10 推送失败）不能为空")
+	@ExcelAttribute(name = "状态（0待提交1待审核2:待推送明细3已推送待发放4已发放5审核不通过6确认不通过7财务退回8：结算单调整待审核 9: 结算单调整待打印10 推送失败 11 已审核生成收入中12已审核生成收入失败）", isNotEmpty = true, errorInfo = "状态（0待提交1待审核2:待推送3已推送待发放4已发放5审核不通过6确认不通过7财务退回8：结算单调整待审核 9: 结算单调整待打印）不能为空")
+	@NotBlank(message = "状态（0待提交1待审核2:待推送明细3已推送待发放4已发放5审核不通过6确认不通过7财务退回8：结算单调整待审核 9: 结算单调整待打印10 推送失败 11 已审核生成收入中12已审核生成收入失败）不能为空")
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("状态（0待提交1待审核2:待推送3已推送待发放4已发放5审核不通过6确认不通过7财务退回8：结算单调整待审核 9: 结算单调整待打印 10 推送失败）")
+	@ExcelProperty("状态（0待提交1待审核2:待推送明细3已推送待发放4已发放5审核不通过6确认不通过7财务退回8：结算单调整待审核 9: 结算单调整待打印 10 推送失败 11 已审核生成收入中12已审核生成收入失败）")
 	private Integer status;
 	/**
 	 * 提交时间
@@ -415,6 +415,22 @@ public class TSalaryStandard extends BaseEntity {
 	@ExcelIgnore
 	private String bpoFlag;
 
+	/**
+	 * 生成、推送收入的开始时间
+	 */
+	@ExcelAttribute(name = "生成、推送收入的开始时间", isDate = true)
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("生成、推送收入的开始时间")
+	private Date incomeStartTime;
+
+	/**
+	 * 生成、推送收入的完成时间
+	 */
+	@ExcelAttribute(name = "生成、推送收入的完成时间", isDate = true)
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("生成、推送收入的完成时间")
+	private Date incomeEndTime;
+
 	/**
 	 * 工资月份-起
 	 */

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

@@ -63,6 +63,15 @@ public interface TSalaryStandardService extends IService<TSalaryStandard> {
 	 */
 	R<String> salaryStandardAudit(String auditFlag, String auditRemark,String id);
 
+	/**
+	 * @param id 工资表id
+	 * @Description: 重新生成收入
+	 * @Author: hgw
+	 * @Date: 2022/11/29 17:49
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
+	 **/
+	R<String> salaryDoIncome(String id);
+
 	/**
 	 * @Description: 删除工资表
 	 * @Author: hgw

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TIncomeController.java

@@ -168,7 +168,19 @@ public class TIncomeController {
 	@Inner
 	@PostMapping("/inner/saveDetail")
 	public Boolean saveDetail(@RequestBody TIncomeDetail tIncomeDetail) {
-		return tIncomeService.saveDetail(tIncomeDetail);
+		return tIncomeService.saveDetail(tIncomeDetail,true);
+	}
+
+	/**
+	 * @Description: 薪资新增收入明细-详情表，同时统计；采用同步操作，因为薪资本身就是异步
+	 * @Author: hgw
+	 * @Date: 2022-11-29 17:29:29
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.Boolean>
+	 **/
+	@Inner
+	@PostMapping("/inner/saveSalaryDetail")
+	public Boolean saveSalaryDetail(@RequestBody TIncomeDetail tIncomeDetail) {
+		return tIncomeService.saveDetail(tIncomeDetail,false);
 	}
 
 	/**

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

@@ -128,8 +128,8 @@ public interface TForecastLibraryService extends IService<TForecastLibrary> {
 	void createForecastInfo();
 	void createForecastFundInfo();
 
-	void pushForecastInfo(List<TForecastLibrary> library);
+	void pushForecastInfo(List<TForecastLibrary> library, boolean synFlag);
 
-	void pushForecastFundInfo(List<TForecastLibrary> library);
+	void pushForecastFundInfo(List<TForecastLibrary> library, boolean synFlag);
 
 }

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

@@ -58,7 +58,7 @@ public interface TIncomeService extends IService<TIncome> {
 	 * @Date: 2022/8/31 16:31
 	 * @return: boolean
 	 **/
-	boolean saveDetail(TIncomeDetail tIncomeDetail);
+	boolean saveDetail(TIncomeDetail tIncomeDetail,boolean synFlag);
 
 	/**
 	 * @Description: 新增收入明细-详情表，同时统计；

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

@@ -4277,90 +4277,4 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		}
 		return minStartDate;
 	}
-
-	public void createIncomeInfo(TForecastLibrary library) {
-		//获取项目信息
-		TSettleDomain settleDomain = new TSettleDomain();
-		List<TSettleDomainSelectVo> settleDomainR = null;
-		R<TSettleDomainListVo> listVo = null;
-		listVo = archivesDaprUtil.selectSettleDomainSelectVoById(library.getSettleDomainId());
-		if (Common.isNotNull(listVo)) {
-			TSettleDomainListVo tSettleDomainListVo = listVo.getData();
-			if (Common.isNotNull(tSettleDomainListVo) && Common.isNotEmpty(tSettleDomainListVo.getListSelectVO())) {
-				settleDomainR = tSettleDomainListVo.getListSelectVO();
-				for (TSettleDomainSelectVo vo :settleDomainR) {
-					BeanUtils.copyProperties(vo,settleDomain);
-				}
-			}
-		}
-
-		//判断是否存在当月的公积金收入数据
-		boolean isExist = false;
-		TIncomeDetail incomeDetail = new TIncomeDetail();
-		incomeDetail.setEmpIdcard(library.getEmpIdcard());
-		incomeDetail.setPayMonth(library.getProvidentPayMonth());
-		incomeDetail.setDeptNo(library.getDeptNo());
-		incomeDetail.setSourceType(CommonConstants.TWO_STRING);
-		List<TIncomeDetail> detailList = detailService.getTIncomeDetailList(incomeDetail);
-		if (Common.isNotNull(detailList)) {
-			BigDecimal sumMoney = BigDecimal.ZERO;
-			for (TIncomeDetail income : detailList) {
-				sumMoney = BigDecimalUtils.safeAdd(income.getMoney(),sumMoney);
-			}
-			if (sumMoney.compareTo(BigDecimal.ZERO) > 0) {
-				isExist = true;
-			}
-		}
-
-		if (Common.isNotNull(settleDomain)) {
-			// 含有社保，则计算收入
-			if (Common.isNotNull(settleDomain.getManageServerItem()) && settleDomain.getManageServerItem()
-					.contains(CommonConstants.TWO_STRING) && !isExist &&
-					CommonConstants.ZERO_STRING.equals(settleDomain.getManagementTag()) &&
-					CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
-				//预估模式
-				//预估模式只有按人次和人数收费
-				createIncomeInsurance(library, settleDomain, CommonConstants.ONE_STRING,
-						settleDomain.getManagementFee().toString(), settleDomain.getManagementType(),
-						settleDomain.getManagementFee());
-			}
-			if (Common.isNotNull(settleDomain.getRiskServerItem()) && settleDomain.getRiskServerItem()
-					.contains(CommonConstants.TWO_STRING) && !isExist &&
-					CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag()) &&
-					CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
-				//预估模式
-				createIncomeInsurance(library, settleDomain, CommonConstants.TWO_STRING,
-						settleDomain.getRiskFundFee().toString(), settleDomain.getRiskFundType(),
-						settleDomain.getRiskFundFee());
-			}
-		}
-	}
-
-	public void createIncomeInsurance(TForecastLibrary library, TSettleDomain settleDomain, String feeType,
-									  String charges, String feeMode, BigDecimal money) {
-		//生成收入数据
-		TIncomeDetail detail = new TIncomeDetail();
-		detail.setCreateTime(DateUtil.getCurrentDateTime());
-		detail.setDeptName(settleDomain.getDepartName());
-		detail.setDeptNo(settleDomain.getDepartNo());
-		detail.setDeptId(settleDomain.getId());
-		detail.setEmpIdcard(library.getEmpIdcard());
-		detail.setEmpName(library.getEmpName());
-		detail.setUnitNo(settleDomain.getCustomerNo());
-		detail.setUnitId(settleDomain.getCustomerId());
-		detail.setUnitName(settleDomain.getCustomerName());
-		detail.setDataCreateMonth(DateUtil.addMonth(0));
-		detail.setSourceId(library.getId());
-		detail.setSourceType(CommonConstants.TWO_STRING);
-		detail.setCreateMonth(library.getProvidentCreateMonth());
-		detail.setPayMonth(library.getProvidentPayMonth());
-		detail.setMoney(money);
-		detail.setFeeType(feeType);
-		detail.setFeeMode(feeMode);
-		detail.setCharges(charges);
-		detail.setMrSettleType(settleDomain.getMrSettleType());
-		detail.setRedData(CommonConstants.ZERO_STRING);
-		detail.setId(CommonConstants.NULL);
-		incomeService.saveDetail(detail);
-	}
 }

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

@@ -352,7 +352,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 					&& CommonConstants.FOUR_STRING.equals(socialFundInfo.getSocialStatus())
 					|| CommonConstants.THREE_STRING.equals(socialFundInfo.getSocialStatus()))) {
 				//办理成功生成收入
-				createIncomeInfo(library);
+				createIncomeInfo(library,true);
 				if (CommonConstants.ZERO_INT == library.getDataPush()) {
 					libraryFundInfoListSocial.add(library);
 				}
@@ -365,7 +365,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			if (Common.isNotNull(socialFundInfoF) && (Common.isNotNull(socialFundInfoF.getFundId())
 					&& CommonConstants.THREE_STRING.equals(socialFundInfoF.getFundStatus()))) {
 				//办理成功生成收入
-				createIncomeInfo(library);
+				createIncomeInfo(library,true);
 				if (CommonConstants.ZERO_INT == library.getDataPush()) {
 					libraryFundInfoListFund.add(library);
 				}
@@ -373,11 +373,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 		}
 		//推送社保明细
 		if (Common.isNotNull(libraryFundInfoListSocial)) {
-			pushForecastInfo(libraryFundInfoListSocial);
+			pushForecastInfo(libraryFundInfoListSocial,true);
 		}
 		//推送公积金明细
 		if (Common.isNotNull(libraryFundInfoListFund)) {
-			pushForecastFundInfo(libraryFundInfoListFund);
+			pushForecastFundInfo(libraryFundInfoListFund,true);
 		}
 		if (isSaveAndUpdate) {
 			return R.ok(null, "执行成功！");
@@ -1482,7 +1482,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 				sysBaseSetInfoMapper.updateById(sysBaseSetInfo);
 			}
 			for (TSocialFundInfo socialFundInfo : socialFundInfoMap.values()) {
-				this.updateForecastLibaryCore(socialFundInfo, socialFundInfo.getDoMonth(), true, false);
+				this.updateForecastLibaryCore(socialFundInfo, socialFundInfo.getDoMonth(), true, false,true);
 				socialFundInfoMapper.updateById(socialFundInfo);
 			}
 		}
@@ -1497,7 +1497,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 	 **/
 	@Override
 	public R<String> updateToneForecastLibary(TSocialFundInfo socialFundInfo, String doMonth) {
-		return this.updateForecastLibaryCore(socialFundInfo, doMonth, false, false);
+		return this.updateForecastLibaryCore(socialFundInfo, doMonth, false, false,true);
 	}
 
 	/**
@@ -1509,7 +1509,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 	 **/
 	@Override
 	public R<String> updateForecastLibaryByDispatch(TSocialFundInfo socialFundInfo) {
-		return this.updateForecastLibaryCore(socialFundInfo, null, false, true);
+		return this.updateForecastLibaryCore(socialFundInfo, null, false, true,false);
 	}
 
 	/**
@@ -1577,11 +1577,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			}
 			//推送社保明细
 			if (Common.isNotNull(libraryFundInfoListSocial)) {
-				pushForecastInfo(libraryFundInfoListSocial);
+				pushForecastInfo(libraryFundInfoListSocial,false);
 			}
 			//推送公积金明细
 			if (Common.isNotNull(libraryFundInfoListFund)) {
-				pushForecastFundInfo(libraryFundInfoListFund);
+				pushForecastFundInfo(libraryFundInfoListFund,false);
 			}
 		}
 		return R.ok();
@@ -1632,7 +1632,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 				detail.setId(CommonConstants.NULL);
 				detail.setRedData(CommonConstants.ONE_STRING);
 				detail.setMoney(detail.getMoney().negate());
-				incomeService.saveDetail(detail);
+				incomeService.saveDetail(detail,false);
 			}
 		}
 	}
@@ -1672,7 +1672,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 				detail.setId(CommonConstants.NULL);
 				detail.setRedData(CommonConstants.ONE_STRING);
 				detail.setMoney(detail.getMoney().negate());
-				incomeService.saveDetail(detail);
+				incomeService.saveDetail(detail,false);
 			}
 		}
 	}
@@ -1686,7 +1686,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 	 * @Date: 2022/7/26 19:01
 	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
 	 **/
-	private R<String> updateForecastLibaryCore(TSocialFundInfo socialFundInfo, String doMonth, boolean isOnly, boolean isDispatch) {
+	private R<String> updateForecastLibaryCore(TSocialFundInfo socialFundInfo, String doMonth, boolean isOnly, boolean isDispatch,boolean synFlag) {
 		String empIdCard = socialFundInfo.getEmpIdcard();
 		//定义未推送的按条件查询得到的预估数据
 		List<TForecastLibrary> librarySocialList = null;
@@ -1899,13 +1899,13 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			if (Common.isNotNull(librarySocialInfoList)) {
 				for (TForecastLibrary library : librarySocialInfoList) {
 					//办理成功生成收入
-					createIncomeInfo(library);
+					createIncomeInfo(library,synFlag);
 					if (CommonConstants.ZERO_INT == library.getDataPush()) {
 						librarySocialInfoList1.add(library);
 					}
 				}
 				if (Common.isNotNull(librarySocialInfoList1)) {
-					this.pushForecastInfo(librarySocialInfoList1);
+					this.pushForecastInfo(librarySocialInfoList1,synFlag);
 				}
 			}
 		}
@@ -2244,7 +2244,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			if (Common.isNotNull(librarySocialInfoList)) {
 				for (TForecastLibrary library : librarySocialInfoList) {
 					//办理成功生成收入
-					createIncomeInfo(library);
+					createIncomeInfo(library,true);
 					if (CommonConstants.ZERO_INT == library.getDataPush()) {
 						libraryFundInfoListSocial.add(library);
 					}
@@ -2266,7 +2266,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			if (Common.isNotNull(libraryFundInfoList)) {
 				for (TForecastLibrary library : libraryFundInfoList) {
 					//办理成功生成收入
-					createIncomeInfo(library);
+					createIncomeInfo(library,true);
 					if (CommonConstants.ZERO_INT == library.getDataPush()) {
 						libraryFundInfoListFund.add(library);
 					}
@@ -2275,11 +2275,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 		}
 		//推送社保明细
 		if (Common.isNotNull(libraryFundInfoListSocial)) {
-			pushForecastInfo(libraryFundInfoListSocial);
+			pushForecastInfo(libraryFundInfoListSocial,true);
 		}
 		//推送公积金明细
 		if (Common.isNotNull(libraryFundInfoListFund)) {
-			pushForecastFundInfo(libraryFundInfoListFund);
+			pushForecastFundInfo(libraryFundInfoListFund,true);
 		}
 		if (isSaveAndUpdate) {
 			return R.ok(null, "执行成功！");
@@ -2343,7 +2343,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 				.eq(TForecastLibrary::getDataType, CommonConstants.ZERO_INT));
 		if (Common.isNotNull(unPushInfo)) {
 			//推送数据封装并推送
-			initEkpPushSocialParam(unPushInfo);
+			initEkpPushSocialParam(unPushInfo,true);
 		}
 	}
 
@@ -2355,27 +2355,27 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 				.eq(TForecastLibrary::getDataType, CommonConstants.ONE_INT));
 		if (Common.isNotNull(unPushInfo)) {
 			//推送数据封装并推送
-			initEkpPushFundParam(unPushInfo);
+			initEkpPushFundParam(unPushInfo,true);
 		}
 	}
 
 	@Override
-	public void pushForecastInfo(List<TForecastLibrary> library) {
+	public void pushForecastInfo(List<TForecastLibrary> library, boolean synFlag) {
 		if (Common.isNotNull(library)) {
 			//推送数据封装并推送
-			initEkpPushSocialParam(library);
+			initEkpPushSocialParam(library,synFlag);
 		}
 	}
 
 	@Override
-	public void pushForecastFundInfo(List<TForecastLibrary> library) {
+	public void pushForecastFundInfo(List<TForecastLibrary> library,boolean synFlag) {
 		if (Common.isNotNull(library)) {
 			//推送数据封装并推送
-			initEkpPushFundParam(library);
+			initEkpPushFundParam(library,synFlag);
 		}
 	}
 
-	public void initEkpPushSocialParam(List<TForecastLibrary> unPushInfo) {
+	public void initEkpPushSocialParam(List<TForecastLibrary> unPushInfo, boolean synFlag) {
 		R<TSettleDomainListVo> listVo;
 		List<TSettleDomainSelectVo> settleDomainR;
 		for (TForecastLibrary library : unPushInfo) {
@@ -2391,6 +2391,9 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 					}
 				}
 			}
+			if (Common.isEmpty(listVo) || CommonConstants.SUCCESS != listVo.getCode()){
+				ServiceUtil.runTimeExceptionDiy("获取结算主体异常，请检查传参和档案服务状态！");
+			}
 			if (CommonConstants.ZERO_STRING.equals(settleDomain.getSocialType())) {
 				continue;
 			}
@@ -2607,11 +2610,16 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			socialParam.setFd_3b0afbe1f94a08(library.getId());
 			// 薪酬申请编号
 			socialParam.setFd_3b3cab77923f44(CommonConstants.EMPTY_STRING);
+			// synFlag=true 异步推送 synFlag=false 非异步推送 兼容批量办理处理 fxj
+			if (synFlag){
 				doJointSocialTask.asynchronousEkpForecastSocial(socialParam, library);
+			}else {
+				doJointSocialTask.asynchronousEkpForecastSocialAsso(socialParam, library);
+			}
 		}
 	}
 
-	public void initEkpPushFundParam(List<TForecastLibrary> unPushInfo) {
+	public void initEkpPushFundParam(List<TForecastLibrary> unPushInfo,boolean synFlag) {
 		R<TSettleDomainListVo> listVo;
 		List<TSettleDomainSelectVo> settleDomainR;
 		for (TForecastLibrary library : unPushInfo) {
@@ -2741,11 +2749,15 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			fundParam.setFd_3b0afbaf10df2c(library.getId());
 			// 薪酬申请编号
 			fundParam.setFd_3b3cabde83d1d0(CommonConstants.EMPTY_STRING);
+			if (synFlag){
 				doJointSocialTask.asynchronousEkpForecastFund(fundParam, library);
+			}else {
+				doJointSocialTask.asynchronousEkpForecastFundAsso(fundParam, library);
+			}
 		}
 	}
 
-	public void createIncomeInfo(TForecastLibrary library) {
+	public void createIncomeInfo(TForecastLibrary library,boolean synFlag) {
 		//获取项目信息
 		TSettleDomain settleDomain = new TSettleDomain();
 		List<TSettleDomainSelectVo> settleDomainR;
@@ -2800,7 +2812,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 						CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType()) && !isExist) {
 					createIncomeInsurance(library, settleDomain, CommonConstants.ONE_STRING,
 							settleDomain.getManagementFee().toString(), settleDomain.getManagementType(),
-							settleDomain.getManagementFee(), sourceType);
+							settleDomain.getManagementFee(), sourceType,synFlag);
 				}
 			}
 			if (Common.isNotNull(settleDomain.getRiskServerItem()) && ((settleDomain.getRiskServerItem().contains(CommonConstants.ONE_STRING)
@@ -2811,14 +2823,15 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 						CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType()) && !isExist) {
 					createIncomeInsurance(library, settleDomain, CommonConstants.TWO_STRING,
 							settleDomain.getRiskFundFee().toString(), settleDomain.getRiskFundType(),
-							settleDomain.getRiskFundFee(), sourceType);
+							settleDomain.getRiskFundFee(), sourceType,synFlag);
 				}
 			}
 		}
 	}
 
 	public void createIncomeInsurance(TForecastLibrary library, TSettleDomain settleDomain, String feeType,
-									  String charges, String feeMode, BigDecimal money, String sourceType) {
+									  String charges, String feeMode, BigDecimal money, String sourceType
+			,boolean synFlag) {
 		//生成收入数据
 		TIncomeDetail detail = new TIncomeDetail();
 		detail.setCreateTime(DateUtil.getCurrentDateTime());
@@ -2847,7 +2860,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 		detail.setMrSettleType(settleDomain.getMrSettleType());
 		detail.setRedData(CommonConstants.ZERO_STRING);
 		detail.setId(CommonConstants.NULL);
-		incomeService.saveDetail(detail);
+		incomeService.saveDetail(detail,synFlag);
 	}
 
 	public String dateStringInsert(String month) {

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/util/DoJointSocialTask.java

@@ -102,6 +102,44 @@ public class DoJointSocialTask {
         }
         log.info("推送收入到EKP结束");
     }
+	public void asynchronousEkpIncomeAsso(TIncome income) {
+		log.info("推送收入到EKP-线程开始");
+		try {
+			String sendBack = this.getSendBack(income);
+			if (Common.isEmpty(sendBack) || sendBack.length() != 32) {
+				sendBack = this.getSendBack(income);
+			}
+			income.setSendTime(new Date());
+			if (Common.isNotNull(sendBack) && sendBack.length() == 32) {
+				income.setSendStatus(CommonConstants.ONE_STRING);
+				income.setSendMonth(DateUtil.addMonth(0));
+				income.setEkpId(sendBack);
+				incomeMapper.updateById(income);
+			} else {
+				TSendEkpError error = new TSendEkpError();
+				error.setCreateTime(new Date());
+				error.setCreateDay(DateUtil.getThisDay());
+				error.setType(CommonConstants.FOUR_STRING);
+				error.setCreateUserName("收入表推送");
+				error.setLinkId(income.getId());
+				error.setTitle(sendBack);
+				error.setNums(CommonConstants.ONE_INT);
+				tSendEkpErrorService.saveError(error);
+			}
+		} catch (Exception e) {
+			TSendEkpError error = new TSendEkpError();
+			error.setCreateTime(new Date());
+			error.setCreateDay(DateUtil.getThisDay());
+			error.setType(CommonConstants.FOUR_STRING);
+			error.setCreateUserName("收入表推送");
+			error.setLinkId(income.getId());
+			error.setTitle(e.getMessage());
+			error.setNums(CommonConstants.ONE_INT);
+			tSendEkpErrorService.saveError(error);
+			log.error("推送收入到EKP错误", e);
+		}
+		log.info("推送收入到EKP结束");
+	}
 
 	/**
 	 * @Description: 合同-批量更换负责人
@@ -401,6 +439,13 @@ public class DoJointSocialTask {
 	 **/
 	@Async
 	public void asynchronousEkpForecastSocial(EkpPushSocialParam socialParam, TForecastLibrary library) {
+		ekpForecastSocial(socialParam, library);
+	}
+	public void asynchronousEkpForecastSocialAsso(EkpPushSocialParam socialParam, TForecastLibrary library) {
+		ekpForecastSocial(socialParam, library);
+	}
+
+	private void ekpForecastSocial(EkpPushSocialParam socialParam, TForecastLibrary library) {
 		log.info("推送社保预估费用到EKP-线程开始");
 		try {
 			String body = ekpSocialUtil.sendToEKP(socialParam);
@@ -444,6 +489,11 @@ public class DoJointSocialTask {
 	 **/
 	@Async
 	public void asynchronousEkpForecastFund(EkpPushFundParam fundParam, TForecastLibrary library) {
+		initEkpForecastFund(fundParam, library);
+	}
+
+	private void initEkpForecastFund(EkpPushFundParam fundParam, TForecastLibrary library) {
+		initEkpForecastFund(fundParam, library);
 		log.info("推送公积金预估费用到EKP-线程开始");
 		try {
 			String body = ekpFundUtil.sendToEKP(fundParam);
@@ -478,4 +528,8 @@ public class DoJointSocialTask {
 		}
 		log.info("推送公积金预估费用到EKP结束");
 	}
+
+	public void asynchronousEkpForecastFundAsso(EkpPushFundParam fundParam, TForecastLibrary library) {
+		initEkpForecastFund(fundParam, library);
+	}
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/util/DoSocialTask.java

+package com.yifu.cloud.plus.v1.yifu.social.util;
+
+import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.BigDecimalUtils;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TForecastLibrary;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TSendEkpError;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo;
+import com.yifu.cloud.plus.v1.yifu.social.mapper.TSendEkpErrorMapper;
+import com.yifu.cloud.plus.v1.yifu.social.service.TForecastLibraryService;
+import com.yifu.cloud.plus.v1.yifu.social.service.TIncomeDetailService;
+import com.yifu.cloud.plus.v1.yifu.social.service.TIncomeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author fxj
+ * @Date 2022/11/28
+ * @Description  批量办理异步处理
+ * @Version 1.0
+ */
+@Slf4j
+@Component
+public class DoSocialTask {
+	@Autowired
+	private TForecastLibraryService forecastLibraryService;
+
+	@Autowired
+	private TIncomeDetailService detailService;
+
+	@Autowired
+	private ArchivesDaprUtil archivesDaprUtil;
+
+	@Autowired
+	private TIncomeService incomeService;
+
+	@Autowired
+	private TSendEkpErrorMapper sendEkpErrorMapper;
+	/**
+	 * @Author fxj
+	 * @Description 异步处理相关信息
+	 * @Date 11:23 2022/11/28
+	 * @param type=0 updateForecastLibaryByDispatchReduce   type=1 updateForecastLibaryByDispatch  type=2 pushForecastFundInfo   createIncomeInfo(library);
+	 **/
+	@Async
+	public void asynchronousDisPatchHandle(TSocialFundInfo sf, int forecastFlag,List< TForecastLibrary > libs,TForecastLibrary library,int type) {
+		synchronized (this){
+			R<String> res;
+			String linkId = null;
+			try {
+				// 派单减少变更预估库-派减
+				if (type == CommonConstants.ZERO_INT){
+					linkId = sf.getId();
+					res = forecastLibraryService.updateForecastLibaryByDispatchReduce(sf, forecastFlag);
+					if (Common.isEmpty(res) || CommonConstants.SUCCESS != res.getCode()){
+						initSendError(library.getId(), res.getMsg(),"updateForecastLibaryByDispatchReduce:");
+					}
+				}
+				// 派单变更预估库
+				if (type == CommonConstants.ONE_INT){
+					linkId = sf.getId();
+					res  = forecastLibraryService.updateForecastLibaryByDispatch(sf);
+					if (Common.isEmpty(res) || CommonConstants.SUCCESS != res.getCode()){
+						initSendError(sf.getId(), res.getMsg(),"updateForecastLibaryByDispatch:");
+					}
+				}
+				// 获取预估库数据并推送
+				if (type == CommonConstants.TWO_INT){
+					if (Common.isNotNull(libs)){
+						for (TForecastLibrary lib:libs){
+							if (Common.isEmpty(linkId)){
+								linkId = lib.getId();
+							}else {
+								linkId = linkId + CommonConstants.COMMA_CHAR + lib.getId();
+							}
+						}
+					}
+					forecastLibraryService.pushForecastFundInfo(libs,false);
+				}
+				// 获取预估库数据并推送
+				if (type == CommonConstants.THREE_INT){
+					linkId = library.getId();
+					createIncomeInfo(library);
+				}
+			}catch (Exception e){
+				initSendError(linkId, e.getMessage(),"asynchronousDisPatchHandle:");
+			}
+		}
+	}
+
+	private void initSendError(String linkId, String msg,String title) {
+		TSendEkpError error = new TSendEkpError();
+		error.setCreateTime(new Date());
+		error.setCreateDay(DateUtil.getThisDay());
+		error.setType(CommonConstants.TWO_STRING);
+		error.setCreateUserName("社保预估费用推送");
+		error.setLinkId(linkId);
+		error.setTitle(title+ msg);
+		error.setNums(CommonConstants.ONE_INT);
+		this.saveError(error);
+		log.error("推送社保预估费用到EKP错误", msg);
+	}
+
+	private boolean saveError(TSendEkpError tSendEkpError) {
+		// 类型、创建日不可为空
+		if (Common.isEmpty(tSendEkpError.getType()) || Common.isEmpty(tSendEkpError.getCreateDay())) {
+			return false;
+		}
+		TSendEkpError error = sendEkpErrorMapper.getByTitleTypeDay(tSendEkpError);
+		if (error == null) {
+			return sendEkpErrorMapper.insert(tSendEkpError) > 0;
+		} else {
+			if (Common.isEmpty(tSendEkpError.getNums())) {
+				tSendEkpError.setNums(CommonConstants.ONE_INT);
+			}
+			error.setNums(error.getNums() + tSendEkpError.getNums());
+			return sendEkpErrorMapper.updateById(error) >= 0;
+		}
+	}
+	public void createIncomeInfo(TForecastLibrary library) {
+		//获取项目信息
+		TSettleDomain settleDomain = new TSettleDomain();
+		List<TSettleDomainSelectVo> settleDomainR = null;
+		R<TSettleDomainListVo> listVo = null;
+		listVo = archivesDaprUtil.selectSettleDomainSelectVoById(library.getSettleDomainId());
+		if (Common.isNotNull(listVo)) {
+			TSettleDomainListVo tSettleDomainListVo = listVo.getData();
+			if (Common.isNotNull(tSettleDomainListVo) && Common.isNotEmpty(tSettleDomainListVo.getListSelectVO())) {
+				settleDomainR = tSettleDomainListVo.getListSelectVO();
+				for (TSettleDomainSelectVo vo :settleDomainR) {
+					BeanUtils.copyProperties(vo,settleDomain);
+				}
+			}
+		}
+
+		//判断是否存在当月的公积金收入数据
+		boolean isExist = false;
+		TIncomeDetail incomeDetail = new TIncomeDetail();
+		incomeDetail.setEmpIdcard(library.getEmpIdcard());
+		incomeDetail.setPayMonth(library.getProvidentPayMonth());
+		incomeDetail.setDeptNo(library.getDeptNo());
+		incomeDetail.setSourceType(CommonConstants.TWO_STRING);
+		List<TIncomeDetail> detailList = detailService.getTIncomeDetailList(incomeDetail);
+		if (Common.isNotNull(detailList)) {
+			BigDecimal sumMoney = BigDecimal.ZERO;
+			for (TIncomeDetail income : detailList) {
+				sumMoney = BigDecimalUtils.safeAdd(income.getMoney(),sumMoney);
+			}
+			if (sumMoney.compareTo(BigDecimal.ZERO) > 0) {
+				isExist = true;
+			}
+		}
+
+		if (Common.isNotNull(settleDomain)) {
+			// 含有社保，则计算收入
+			if (Common.isNotNull(settleDomain.getManageServerItem()) && settleDomain.getManageServerItem()
+					.contains(CommonConstants.TWO_STRING) && !isExist &&
+					CommonConstants.ZERO_STRING.equals(settleDomain.getManagementTag()) &&
+					CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
+				//预估模式
+				//预估模式只有按人次和人数收费
+				createIncomeInsurance(library, settleDomain, CommonConstants.ONE_STRING,
+						settleDomain.getManagementFee().toString(), settleDomain.getManagementType(),
+						settleDomain.getManagementFee());
+			}
+			if (Common.isNotNull(settleDomain.getRiskServerItem()) && settleDomain.getRiskServerItem()
+					.contains(CommonConstants.TWO_STRING) && !isExist &&
+					CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag()) &&
+					CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
+				//预估模式
+				createIncomeInsurance(library, settleDomain, CommonConstants.TWO_STRING,
+						settleDomain.getRiskFundFee().toString(), settleDomain.getRiskFundType(),
+						settleDomain.getRiskFundFee());
+			}
+		}
+	}
+
+	public void createIncomeInsurance(TForecastLibrary library, TSettleDomain settleDomain, String feeType,
+									  String charges, String feeMode, BigDecimal money) {
+		//生成收入数据
+		TIncomeDetail detail = new TIncomeDetail();
+		detail.setCreateTime(DateUtil.getCurrentDateTime());
+		detail.setDeptName(settleDomain.getDepartName());
+		detail.setDeptNo(settleDomain.getDepartNo());
+		detail.setDeptId(settleDomain.getId());
+		detail.setEmpIdcard(library.getEmpIdcard());
+		detail.setEmpName(library.getEmpName());
+		detail.setUnitNo(settleDomain.getCustomerNo());
+		detail.setUnitId(settleDomain.getCustomerId());
+		detail.setUnitName(settleDomain.getCustomerName());
+		detail.setDataCreateMonth(DateUtil.addMonth(0));
+		detail.setSourceId(library.getId());
+		detail.setSourceType(CommonConstants.TWO_STRING);
+		detail.setCreateMonth(library.getProvidentCreateMonth());
+		detail.setPayMonth(library.getProvidentPayMonth());
+		detail.setMoney(money);
+		detail.setFeeType(feeType);
+		detail.setFeeMode(feeMode);
+		detail.setCharges(charges);
+		detail.setMrSettleType(settleDomain.getMrSettleType());
+		detail.setRedData(CommonConstants.ZERO_STRING);
+		detail.setId(CommonConstants.NULL);
+
+		// 批量办理成功 收入不异步推送
+		incomeService.saveDetail(detail,false);
+	}
+}