薪资审核优化

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java

@@ -200,7 +200,7 @@ public interface CommonConstants {
 	 * @Author pwang
 	 * @Date 2019-08-02 16:39
 	 **/
-	int[] dingleDigitIntArray = {0,1,2,3,4,5,6,7,8,9};
+	int[] dingleDigitIntArray = {0,1,2,3,4,5,6,7,8,9,10,11};
 	/**
 	 * 个位数字串（阿里编码规约不允许直接使用‘魔法值’）
 	 * @Author pwang

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 推送收入中）
 	 */
-	@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 推送收入中）", 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 推送收入中）不能为空")
 	@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 推送收入中）")
 	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/controller/TSalaryStandardController.java

@@ -229,4 +229,14 @@ public class TSalaryStandardController {
 	public R<String> backSalaryByApplyNo(@RequestParam String applyNo) {
 		return tSalaryStandardService.backSalaryByApplyNo(applyNo);
 	}
+
+	/**
+	 * @param id
+	 * @return
+	 */
+	@Operation(description = "重新生成收入")
+	@GetMapping("/salaryDoIncome")
+	public R<String> salaryDoIncome(@RequestParam String id) {
+		return tSalaryStandardService.salaryDoIncome(id);
+	}
 }

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-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java

@@ -28,7 +28,10 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TDepartSettlementInfo;
 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.constant.SecurityConstants;
-import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
+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.ExcelUtil;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprArchivesProperties;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSocialProperties;
@@ -47,25 +50,26 @@ import com.yifu.cloud.plus.v1.yifu.salary.service.MSalaryEstimateService;
 import com.yifu.cloud.plus.v1.yifu.salary.service.TApprovalRecordService;
 import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryAccountService;
 import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryStandardService;
+import com.yifu.cloud.plus.v1.yifu.salary.util.DoJointSalaryAsyncTask;
 import com.yifu.cloud.plus.v1.yifu.salary.util.SalaryConstants;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardExportVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardSearchVo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TIncome;
-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.vo.TIncomeDetailReturnVo;
+import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.math.BigDecimal;
 import java.net.URLEncoder;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 标准薪酬工资表
@@ -75,32 +79,21 @@ import java.util.*;
  */
 @Log4j2
 @Service
+@AllArgsConstructor
 @EnableConfigurationProperties({DaprArchivesProperties.class, DaprSocialProperties.class})
 public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMapper, TSalaryStandard> implements TSalaryStandardService {
 
-	@Autowired
-	private TApprovalRecordService approvalRecordService;
-
-	@Autowired
-	private TSalaryAccountService salaryAccountService;
-
-	@Autowired
-	private MSalaryEstimateService mSalaryEstimateService;
-
-	@Autowired
-	private DaprSocialProperties socialProperties;
-
-	@Autowired
-	private DaprArchivesProperties archivesProperties;
-
-	@Autowired
-	private EkpSalaryUtil ekpSalaryUtil;
-	@Autowired
-	private EkpSocialUtil ekpSocialUtil;
-	@Autowired
-	private EkpFundUtil ekpFundUtil;
-	@Autowired
-	private TApprovalRecordService auditLogService;
+	private final TApprovalRecordService approvalRecordService;
+	private final TSalaryAccountService salaryAccountService;
+	private final MSalaryEstimateService mSalaryEstimateService;
+	private final DaprSocialProperties socialProperties;
+	private final DaprArchivesProperties archivesProperties;
+	private final EkpSalaryUtil ekpSalaryUtil;
+	private final EkpSocialUtil ekpSocialUtil;
+	private final EkpFundUtil ekpFundUtil;
+	private final TApprovalRecordService auditLogService;
+	@Lazy
+	private final DoJointSalaryAsyncTask doSalaryAsync;
 
 	/**
 	 * 标准薪酬工资表简单分页查询
@@ -210,12 +203,29 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 			TApprovalRecord tApprovalRecord = new TApprovalRecord();
 
 			if (CommonConstants.ZERO_STRING.equals(auditFlag)) {
+
 				tSalaryStandard.setStatus(CommonConstants.TWO_INT);
 				tApprovalRecord.setApprovalResult(CommonConstants.ZERO_STRING);
 				tApprovalRecord.setNodeId("审核通过");
-				// 收入相关
-				R<String> failed = doIncomeDetail(id, tSalaryStandard);
-				if (failed != null) return failed;
+
+				R<TSettleDomainSelectVo> sdr = HttpDaprUtil.invokeMethodPost(archivesProperties.getAppUrl(), archivesProperties.getAppId()
+						, "/tsettledomain/inner/getSettleDomainVoById", tSalaryStandard.getDeptId()
+						, TSettleDomainSelectVo.class, SecurityConstants.FROM_IN);
+				// 结算主体
+				TSettleDomainSelectVo dept;
+				if (sdr != null && sdr.getData() != null) {
+					dept = sdr.getData();
+				} else {
+					return R.failed("获取项目信息失败，请联管理员！");
+				}
+				List<TSalaryAccount> salaryAccountList = salaryAccountService.getListByIncome(id);
+				if (salaryAccountList != null && !salaryAccountList.isEmpty()) {
+					// 将审核状态变为中间态
+					tSalaryStandard.setStatus(CommonConstants.dingleDigitIntArray[11]);
+					tSalaryStandard.setIncomeStartTime(new Date());
+					// 异步-收入相关
+					doSalaryAsync.doIncomeDetail(dept, salaryAccountList, id, tSalaryStandard);
+				}
 			} else {
 				tSalaryStandard.setStatus(CommonConstants.FIVE_INT);
 				tApprovalRecord.setApprovalResult(CommonConstants.ONE_STRING);
@@ -239,170 +249,6 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 
 	}
 
-	/**
-	 * @param id
-	 * @param tSalaryStandard
-	 * @Description: 处理收入明细
-	 * @Author: hgw
-	 * @Date: 2022/9/2 17:35
-	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
-	 **/
-	private R<String> doIncomeDetail(String id, TSalaryStandard tSalaryStandard) {
-		R<TSettleDomainSelectVo> sdr = HttpDaprUtil.invokeMethodPost(archivesProperties.getAppUrl(), archivesProperties.getAppId()
-				, "/tsettledomain/inner/getSettleDomainVoById", tSalaryStandard.getDeptId()
-				, TSettleDomainSelectVo.class, SecurityConstants.FROM_IN);
-		// 结算主体
-		TSettleDomainSelectVo dept;
-		if (sdr != null && sdr.getData() != null) {
-			dept = sdr.getData();
-		} else {
-			return R.failed("获取项目信息失败，请联管理员！");
-		}
-		List<TSalaryAccount> salaryAccountList = salaryAccountService.getListByIncome(id);
-		if (salaryAccountList != null && !salaryAccountList.isEmpty()) {
-			List<String> idCardList = new ArrayList<>();
-			for (TSalaryAccount account : salaryAccountList) {
-				idCardList.add(account.getEmpIdcard());
-			}
-			Map<String, Integer> detailMap = new HashMap<>();
-			// 收入相关
-			R<String> failed1 = getIncomeDetailMap(tSalaryStandard, dept, idCardList, detailMap);
-			if (failed1 != null) return failed1;
-			// 含有薪资，则计算收入
-			// 管理费
-			if (Common.isNotNull(dept.getManageServerItem()) && dept.getManageServerItem().contains(CommonConstants.FOUR_STRING)
-					&& CommonConstants.ZERO_STRING.equals(dept.getManagementTag())) {
-				// 金额-人数
-				if (CommonConstants.TWO_STRING.equals(dept.getManagementType())) {
-					// 保存明细
-					R<String> failed = saveIncomeDetail(salaryAccountList, tSalaryStandard, dept, detailMap, dept.getManagementType(), CommonConstants.ONE_STRING);
-					if (failed != null) return failed;
-				} else {
-					// 保存明细
-					R<String> failed = saveIncomeDetail(salaryAccountList, tSalaryStandard, dept, new HashMap<>(), dept.getManagementType(), CommonConstants.ONE_STRING);
-					if (failed != null) return failed;
-				}
-			}
-			// 风险金
-			if (Common.isNotNull(dept.getRiskServerItem()) && dept.getRiskServerItem().contains(CommonConstants.FOUR_STRING)
-					&& CommonConstants.ZERO_STRING.equals(dept.getRiskFundTag())) {
-				// 金额-人数
-				if (CommonConstants.TWO_STRING.equals(dept.getRiskFundType())) {
-					// 保存明细
-					R<String> failed = saveIncomeDetail(salaryAccountList, tSalaryStandard, dept, detailMap, dept.getRiskFundType(), CommonConstants.TWO_STRING);
-					if (failed != null) return failed;
-				} else {
-					// 保存明细
-					R<String> failed = saveIncomeDetail(salaryAccountList, tSalaryStandard, dept, new HashMap<>(), dept.getRiskFundType(), CommonConstants.TWO_STRING);
-					if (failed != null) return failed;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @Description: 获取收入信息
-	 * @Author: hgw
-	 * @Date: 2022/9/6 10:39
-	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
-	 **/
-	private R<String> getIncomeDetailMap(TSalaryStandard tSalaryStandard, TSettleDomainSelectVo dept, List<String> idCardList, Map<String, Integer> detailMap) {
-		TIncomeDetail detail = new TIncomeDetail();
-		detail.setApplyNo(tSalaryStandard.getApplyNo());
-		detail.setPayMonth(tSalaryStandard.getSalaryMonth());
-		detail.setIdCardList(idCardList);
-		detail.setDeptId(dept.getId());
-		R<TIncomeDetailReturnVo> detailR = HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
-				, "/tincomedetail/inner/getTIncomeDetailList", detail
-				, TIncomeDetailReturnVo.class, SecurityConstants.FROM_IN);
-		Integer value;
-		if (detailR != null) {
-			if (detailR.getData() != null && detailR.getData().getDetailList() != null && !detailR.getData().getDetailList().isEmpty()) {
-				TIncomeDetailReturnVo vo = detailR.getData();
-				List<TIncomeDetail> detailList = vo.getDetailList();
-				for (TIncomeDetail incomeDetail : detailList) {
-					value = detailMap.get(incomeDetail.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING
-							+ incomeDetail.getDeptId() + CommonConstants.DOWN_LINE_STRING + incomeDetail.getFeeType()
-							+ CommonConstants.DOWN_LINE_STRING + incomeDetail.getSourceType());
-					if (Common.isEmpty(value)) {
-						value = CommonConstants.ZERO_INT;
-					}
-					if (CommonConstants.ZERO_STRING.equals(incomeDetail.getRedData())) {
-						value++;
-					} else {
-						value--;
-					}
-					detailMap.put(incomeDetail.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING
-							+ incomeDetail.getDeptId() + CommonConstants.DOWN_LINE_STRING
-							+ incomeDetail.getFeeType() + CommonConstants.DOWN_LINE_STRING
-							+ incomeDetail.getSourceType(), value);
-				}
-			}
-		} else {
-			return R.failed("获取收入明细的详情出错，请联系管理员！");
-		}
-		return null;
-	}
-
-	/**
-	 * @param feeType  1按比例2金额-人数3金额-人次
-	 * @param isManage 1 管理费2 风险金
-	 * @Description: 保存明细
-	 * @Author: hgw
-	 * @Date: 2022/9/2 17:25
-	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
-	 **/
-	private R<String> saveIncomeDetail(List<TSalaryAccount> salaryAccountList, TSalaryStandard tSalaryStandard
-			, TSettleDomainSelectVo dept, Map<String, Integer> detailMap, String feeType, String isManage) {
-		TIncomeDetail detail;
-		Integer value;
-		BigDecimal money;
-		for (TSalaryAccount account : salaryAccountList) {
-			value = detailMap.get(account.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING
-					+ account.getDeptId() + CommonConstants.DOWN_LINE_STRING + isManage
-					+ CommonConstants.DOWN_LINE_STRING
-					+ CommonConstants.FOUR_STRING);
-			if (Common.isEmpty(value) || value == 0) {
-				detail = new TIncomeDetail();
-				detail.setPayMonth(account.getSalaryMonth());
-				detail.setDeptId(account.getDeptId());
-				detail.setDeptName(account.getDeptName());
-				detail.setDeptNo(account.getDeptNo());
-				detail.setUnitId(tSalaryStandard.getUnitId());
-				detail.setUnitName(tSalaryStandard.getUnitName());
-				detail.setUnitNo(tSalaryStandard.getUnitNo());
-				detail.setCreateMonth(account.getSalaryMonth());
-				detail.setEmpIdcard(account.getEmpIdcard());
-				detail.setEmpName(account.getEmpName());
-				detail.setFeeMode(dept.getManagementType());
-				detail.setFeeType(isManage);
-				detail.setCharges(String.valueOf(dept.getManagementFee()));
-				money = dept.getManagementFee();
-				if (CommonConstants.TWO_STRING.equals(isManage)) {
-					money = dept.getRiskFundFee();
-					detail.setCharges(String.valueOf(dept.getRiskFundFee()));
-					detail.setFeeMode(dept.getRiskFundType());
-				}
-				if (CommonConstants.ONE_STRING.equals(feeType)) {
-					money = BigDecimalUtils.safeMultiply(account.getRelaySalary(), money, CommonConstants.ONE_OF_PERCENT);
-				}
-				detail.setMoney(money);
-				detail.setMrSettleType(dept.getMrSettleType());
-				detail.setRedData(CommonConstants.ZERO_STRING);
-				detail.setSourceId(account.getId());
-				detail.setSourceType(CommonConstants.FOUR_STRING);
-				detail.setApplyNo(tSalaryStandard.getApplyNo());
-				R<Boolean> saveR = HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
-						, "/tincome/inner/saveDetail", detail, Boolean.class, SecurityConstants.FROM_IN);
-				if (saveR == null || saveR.getCode() == CommonConstants.ONE_INT || Boolean.FALSE.equals(saveR.getData())) {
-					return R.failed("保存收入明细以及统计出错！");
-				}
-			}
-		}
-		return null;
-	}
-
 	/**
 	 * @Description: 删除
 	 * @Author: hgw
@@ -958,7 +804,47 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 			}
 		}
 		return R.failed("未找到工资表");
+	}
 
-
+	/**
+	 * @param id
+	 * @Description: 重新生成收入
+	 * @Author: hgw
+	 * @Date: 2022/11/29 17:58
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
+	 **/
+	@Override
+	public R<String> salaryDoIncome(String id) {
+		TSalaryStandard tSalaryStandard = this.getById(id);
+		if (tSalaryStandard != null && tSalaryStandard.getStatus() == CommonConstants.dingleDigitIntArray[11]
+				&& tSalaryStandard.getIncomeStartTime() != null) {
+			Long start = tSalaryStandard.getIncomeStartTime().getTime() + 600000;
+			Long end = new Date().getTime();
+			if (start > end) {
+				return R.failed("上次生成时间：" + tSalaryStandard.getIncomeStartTime() + "，请稍等10分钟");
+			}
+			R<TSettleDomainSelectVo> sdr = HttpDaprUtil.invokeMethodPost(archivesProperties.getAppUrl(), archivesProperties.getAppId()
+					, "/tsettledomain/inner/getSettleDomainVoById", tSalaryStandard.getDeptId()
+					, TSettleDomainSelectVo.class, SecurityConstants.FROM_IN);
+			// 结算主体
+			TSettleDomainSelectVo dept;
+			if (sdr != null && sdr.getData() != null) {
+				dept = sdr.getData();
+			} else {
+				return R.failed("获取项目信息失败，请联管理员！");
+			}
+			List<TSalaryAccount> salaryAccountList = salaryAccountService.getListByIncome(id);
+			if (salaryAccountList != null && !salaryAccountList.isEmpty()) {
+				// 将重置生成推送时间
+				tSalaryStandard.setIncomeStartTime(new Date());
+				this.updateById(tSalaryStandard);
+				// 异步-收入相关
+				doSalaryAsync.doIncomeDetail(dept, salaryAccountList, id, tSalaryStandard);
+				return R.ok("生成收入并推送中，请耐心等待10分钟！");
+			}
+			return R.failed("未获取到报账明细，请重试");
+		} else {
+			return R.failed("不是待生成收入状态，请勿点击！");
+		}
 	}
 }

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/DoJointSalaryAsyncTask.java

+package com.yifu.cloud.plus.v1.yifu.salary.util;
+
+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.constant.SecurityConstants;
+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.R;
+import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSocialProperties;
+import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil;
+import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount;
+import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandard;
+import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryStandardService;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeDetailReturnVo;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+/**
+ * @author hgw
+ * @Date 2022-11-29 16:31:09
+ * @Description 异步执行薪资
+ */
+@Slf4j
+@Component
+@AllArgsConstructor
+@EnableConfigurationProperties({DaprSocialProperties.class})
+public class DoJointSalaryAsyncTask {
+
+	private final DaprSocialProperties socialProperties;
+	private final TSalaryStandardService tSalaryStandardService;
+
+    /**
+     * @Description: 收入
+     * @Author: hgw
+     * @Date: 2022-11-29 17:28:494
+     **/
+    @Async
+    public void doIncomeDetail(TSettleDomainSelectVo dept, List<TSalaryAccount> salaryAccountList, String id, TSalaryStandard tSalaryStandard) {
+        log.info("推送收入到EKP-线程开始");
+
+		if (salaryAccountList != null && !salaryAccountList.isEmpty()) {
+			List<String> idCardList = new ArrayList<>();
+			for (TSalaryAccount account : salaryAccountList) {
+				idCardList.add(account.getEmpIdcard());
+			}
+			Map<String, Integer> detailMap = new HashMap<>();
+			boolean isTrue = true;
+			// 收入相关
+			R<String> failed1 = getIncomeDetailMap(tSalaryStandard, dept, idCardList, detailMap);
+			if (failed1 != null) {
+				isTrue = false;
+			} else {
+				// 含有薪资，则计算收入
+				// 管理费
+				if (Common.isNotNull(dept.getManageServerItem()) && dept.getManageServerItem().contains(CommonConstants.FOUR_STRING)
+						&& CommonConstants.ZERO_STRING.equals(dept.getManagementTag())) {
+					// 金额-人数
+					if (CommonConstants.TWO_STRING.equals(dept.getManagementType())) {
+						// 保存明细
+						isTrue = saveIncomeDetail(salaryAccountList, tSalaryStandard, dept, detailMap, dept.getManagementType(), CommonConstants.ONE_STRING);
+					} else {
+						// 保存明细
+						isTrue = saveIncomeDetail(salaryAccountList, tSalaryStandard, dept, new HashMap<>(), dept.getManagementType(), CommonConstants.ONE_STRING);
+					}
+				}
+				// 风险金
+				if (isTrue && Common.isNotNull(dept.getRiskServerItem()) && dept.getRiskServerItem().contains(CommonConstants.FOUR_STRING)
+						&& CommonConstants.ZERO_STRING.equals(dept.getRiskFundTag())) {
+					// 金额-人数
+					if (CommonConstants.TWO_STRING.equals(dept.getRiskFundType())) {
+						// 保存明细
+						isTrue = saveIncomeDetail(salaryAccountList, tSalaryStandard, dept, detailMap, dept.getRiskFundType(), CommonConstants.TWO_STRING);
+					} else {
+						// 保存明细
+						isTrue = saveIncomeDetail(salaryAccountList, tSalaryStandard, dept, new HashMap<>(), dept.getRiskFundType(), CommonConstants.TWO_STRING);
+					}
+				}
+			}
+			if (isTrue) {
+				TSalaryStandard s  = tSalaryStandardService.getById(id);
+				if (s != null && s.getStatus() == CommonConstants.dingleDigitIntArray[11]) {
+					s.setStatus(CommonConstants.TWO_INT);
+					tSalaryStandard.setIncomeEndTime(new Date());
+					tSalaryStandardService.updateById(s);
+				}
+			}
+		}
+
+        log.info("推送收入到EKP结束");
+    }
+
+	/**
+	 * @Description: 获取收入信息
+	 * @Author: hgw
+	 * @Date: 2022/9/6 10:39
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
+	 **/
+	private R<String> getIncomeDetailMap(TSalaryStandard tSalaryStandard, TSettleDomainSelectVo dept, List<String> idCardList, Map<String, Integer> detailMap) {
+		TIncomeDetail detail = new TIncomeDetail();
+		detail.setApplyNo(tSalaryStandard.getApplyNo());
+		detail.setPayMonth(tSalaryStandard.getSalaryMonth());
+		detail.setIdCardList(idCardList);
+		detail.setDeptId(dept.getId());
+		R<TIncomeDetailReturnVo> detailR = HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
+				, "/tincomedetail/inner/getTIncomeDetailList", detail
+				, TIncomeDetailReturnVo.class, SecurityConstants.FROM_IN);
+		Integer value;
+		if (detailR != null) {
+			if (detailR.getData() != null && detailR.getData().getDetailList() != null && !detailR.getData().getDetailList().isEmpty()) {
+				TIncomeDetailReturnVo vo = detailR.getData();
+				List<TIncomeDetail> detailList = vo.getDetailList();
+				for (TIncomeDetail incomeDetail : detailList) {
+					value = detailMap.get(incomeDetail.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING
+							+ incomeDetail.getDeptId() + CommonConstants.DOWN_LINE_STRING + incomeDetail.getFeeType()
+							+ CommonConstants.DOWN_LINE_STRING + incomeDetail.getSourceType());
+					if (Common.isEmpty(value)) {
+						value = CommonConstants.ZERO_INT;
+					}
+					if (CommonConstants.ZERO_STRING.equals(incomeDetail.getRedData())) {
+						value++;
+					} else {
+						value--;
+					}
+					detailMap.put(incomeDetail.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING
+							+ incomeDetail.getDeptId() + CommonConstants.DOWN_LINE_STRING
+							+ incomeDetail.getFeeType() + CommonConstants.DOWN_LINE_STRING
+							+ incomeDetail.getSourceType(), value);
+				}
+			}
+		} else {
+			return R.failed("获取收入明细的详情出错，请联系管理员！");
+		}
+		return null;
+	}
+
+	/**
+	 * @param feeType  1按比例2金额-人数3金额-人次
+	 * @param isManage 1 管理费2 风险金
+	 * @Description: 保存明细
+	 * @Author: hgw
+	 * @Date: 2022/9/2 17:25
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
+	 **/
+	private boolean saveIncomeDetail(List<TSalaryAccount> salaryAccountList, TSalaryStandard tSalaryStandard
+			, TSettleDomainSelectVo dept, Map<String, Integer> detailMap, String feeType, String isManage) {
+		TIncomeDetail detail;
+		Integer value;
+		BigDecimal money;
+		for (TSalaryAccount account : salaryAccountList) {
+			value = detailMap.get(account.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING
+					+ account.getDeptId() + CommonConstants.DOWN_LINE_STRING + isManage
+					+ CommonConstants.DOWN_LINE_STRING
+					+ CommonConstants.FOUR_STRING);
+			if (Common.isEmpty(value) || value == 0) {
+				detail = new TIncomeDetail();
+				detail.setPayMonth(account.getSalaryMonth());
+				detail.setDeptId(account.getDeptId());
+				detail.setDeptName(account.getDeptName());
+				detail.setDeptNo(account.getDeptNo());
+				detail.setUnitId(tSalaryStandard.getUnitId());
+				detail.setUnitName(tSalaryStandard.getUnitName());
+				detail.setUnitNo(tSalaryStandard.getUnitNo());
+				detail.setCreateMonth(account.getSalaryMonth());
+				detail.setEmpIdcard(account.getEmpIdcard());
+				detail.setEmpName(account.getEmpName());
+				detail.setFeeMode(dept.getManagementType());
+				detail.setFeeType(isManage);
+				detail.setCharges(String.valueOf(dept.getManagementFee()));
+				money = dept.getManagementFee();
+				if (CommonConstants.TWO_STRING.equals(isManage)) {
+					money = dept.getRiskFundFee();
+					detail.setCharges(String.valueOf(dept.getRiskFundFee()));
+					detail.setFeeMode(dept.getRiskFundType());
+				}
+				if (CommonConstants.ONE_STRING.equals(feeType)) {
+					money = BigDecimalUtils.safeMultiply(account.getRelaySalary(), money, CommonConstants.ONE_OF_PERCENT);
+				}
+				detail.setMoney(money);
+				detail.setMrSettleType(dept.getMrSettleType());
+				detail.setRedData(CommonConstants.ZERO_STRING);
+				detail.setSourceId(account.getId());
+				detail.setSourceType(CommonConstants.FOUR_STRING);
+				detail.setApplyNo(tSalaryStandard.getApplyNo());
+				R<Boolean> saveR = HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
+						, "/tincome/inner/saveSalaryDetail", detail, Boolean.class, SecurityConstants.FROM_IN);
+				if (saveR == null || saveR.getCode() == CommonConstants.ONE_INT || Boolean.FALSE.equals(saveR.getData())) {
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+}

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml

@@ -75,6 +75,8 @@
 	<result property="orderId" column="ORDER_ID"/>
 	<result property="bpoFlag" column="BPO_FLAG"/>
 	<result property="applyNo" column="APPLY_NO"/>
+	<result property="incomeStartTime" column="INCOME_START_TIME"/>
+	<result property="incomeEndTime" column="INCOME_END_TIME"/>
   </resultMap>
     <sql id="Base_Column_List">
                 a.ID,
@@ -128,7 +130,9 @@
 				a.INVOICE_TITLE,
 				a.ORDER_ID,
 				a.BPO_FLAG,
-				a.APPLY_NO
+				a.APPLY_NO,
+				a.INCOME_START_TIME,
+				a.INCOME_END_TIME
     </sql>
     <sql id="tSalaryStandard_where">
         <if test="tSalaryStandard != null">

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

@@ -171,6 +171,18 @@ public class TIncomeController {
 		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);
+	}
+
 	/**
 	 * @Description: 定时任务统计表未推送数据推送；
 	 * @Author: huyc

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

@@ -576,6 +576,17 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 	 **/
 	private boolean copyCore(TIncomeDetail tIncomeDetail, List<TIncome> incomeList, List<TIncomeDetail> detailList,
 							 TPaymentInfo paymentInfo,boolean synFlag) {
+		if (Common.isNotNull(tIncomeDetail.getSourceId())) {
+			// 如果该id、该类型的金额已存在，则不允许重复生成推送
+			TIncomeDetail a = new TIncomeDetail();
+			a.setSourceId(tIncomeDetail.getSourceId());
+			a.setMoney(tIncomeDetail.getMoney());
+			a.setRedData(tIncomeDetail.getRedData());
+			List<TIncomeDetail> aList = tIncomeDetailService.getTIncomeDetailList(a);
+			if (aList != null && !aList.isEmpty()) {
+				return true;
+			}
+		}
 		// 判断，比例，直接加
 		if (CommonConstants.ONE_STRING.equals(tIncomeDetail.getFeeMode())) {
 			if (Common.isNotNull(paymentInfo)) {