明细接口改造

yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/EkpDaprUtils.java

@@ -5,6 +5,7 @@ import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprEkpProperties;
+import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpIncomeParamManage;
 import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpPushFundParam;
 import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpPushSocialParam;
 import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam;
@@ -59,4 +60,16 @@ public class EkpDaprUtils {
 	public R<Boolean> pushSalaryInfoToEkp(List<EkpSalaryParam> unPushList) {
 		return HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/ekpSalaryPush/inner/pushSalaryInfoToEkp", JSON.toJSONString(unPushList), Boolean.class, SecurityConstants.FROM_IN);
 	}
+
+
+	/**
+	 * @Author huyc
+	 * @Description 新增管理费明细数据
+	 * @Date 9:23 2024/03/14
+	 * @Param
+	 * @return
+	 **/
+	public R<String> pushManagerInfoToEkp(EkpIncomeParamManage incomeParam) {
+		return HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/ekpmanagerinfo/inner/pushManangerInfoToEkp", JSON.toJSONString(incomeParam), String.class, SecurityConstants.FROM_IN);
+	}
 }

yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/entity/EkpManagerInfo.java

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.ekp.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * @author huyc
+ * @date 2024-03-13 16:14:37
+ */
+@Data
+@TableName("ekp_manager_info")
+@EqualsAndHashCode()
+@Schema(description = "管理费明细表")
+public class EkpManagerInfo {
+
+	/**
+	 * id
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	@Schema(description = "id")
+	private String fdId;
+	/**
+	 * 项目编码
+	 */
+	@Schema(description = "项目编码")
+	private String fd_3adfef5e5b9d34;
+	/**
+	 * 项目名称
+	 */
+	@Schema(description = "项目名称")
+	private String fd_3adfef5eb6691c;
+	/**
+	 * 单号
+	 */
+	@Schema(description = "单号")
+	private String fd_3adfef7f5d2b52;
+	/**
+	 * 客户编码
+	 */
+	@Schema(description = "客户编码")
+	private String fd_3adfef80202ab2;
+	/**
+	 * 客户名称
+	 */
+	@Schema(description = "客户名称")
+	private String fd_3adfef7fc1c886;
+	/**
+	 * 类型
+	 */
+	@Schema(description = "类型")
+	private String fd_3adda3037e3bda;
+	/**
+	 * 产生来源
+	 */
+	@Schema(description = "产生来源")
+	private String fd_3adda320daef5a;
+	/**
+	 * 姓名
+	 */
+	@Schema(description = "姓名")
+	private String fd_3adfef948da848;
+	/**
+	 * 身份证号
+	 */
+	@Schema(description = "身份证号")
+	private String fd_3adfef94dcdbb4;
+	/**
+	 * 管理费金额
+	 */
+	@Schema(description = "管理费金额")
+	private Double fd_3adfef963bae28;
+	/**
+	 * 应收
+	 */
+	@Schema(description = "应收")
+	private Double fd_3adfefa3daae72;
+	/**
+	 * 结算状态
+	 */
+	@Schema(description = "结算状态")
+	private String fd_3adfefaaa3bbd0;
+	/**
+	 * 收款状态
+	 */
+	@Schema(description = "收款状态")
+	private String fd_3adfefaaef583e;
+	/**
+	 * 实际结算月份
+	 */
+	@Schema(description = "实际结算月份")
+	private String fd_3ae0c23cb3fccc;
+	/**
+	 * 生成月份
+	 */
+	@Schema(description = "生成月份")
+	private String fd_3ae0c23b2e9a92;
+	/**
+	 * 结算单号
+	 */
+	@Schema(description = "结算单号")
+	private String fd_3aead3c68b1078;
+	/**
+	 * 收款单号
+	 */
+	@Schema(description = "收款单号")
+	private String fd_3aeae58b14691c;
+	/**
+	 * 数据来源
+	 */
+	@Schema(description = "数据来源")
+	private String fd_3b0b7231bb5896;
+	/**
+	 * 是否全部结算
+	 */
+	@Schema(description = "是否全部结算")
+	private String fd_3b13b15f5b63fa;
+	/**
+	 * 管理费ID
+	 */
+	@Schema(description = "管理费ID")
+	private String fd_3b13dc864a3052;
+	/**
+	 * HRO结算月
+	 */
+	@Schema(description = "HRO结算月")
+	private String fd_3b13dd215b55b2;
+	/**
+	 * 项目台账ID(ID)
+	 */
+	@Schema(description = "项目台账ID(ID)")
+	private String fd_3b16e47cb6874c;
+	/**
+	 * 项目台账ID
+	 */
+	@Schema(description = "项目台账ID")
+	private String fd_3b16e47cb6874c_text;
+	/**
+	 * 薪酬申请编号
+	 */
+	@Schema(description = "薪酬申请编号")
+	private String fd_3b3bf110837a96;
+	/**
+	 * 变更记录
+	 */
+	@Schema(description = "变更记录")
+	private String fd_3b3e43a10ab4b2;
+	
+	@Schema(description = "创建时间")
+	private Date createTime;
+
+}

yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/entity/EkpRiskInfo.java

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.ekp.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * @author huyc
+ * @date 2024-03-13 16:14:37
+ */
+@Data
+@TableName("ekp_risk_info")
+@EqualsAndHashCode()
+@Schema(description = "风险金明细表")
+public class EkpRiskInfo {
+
+	/**
+	 * id
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	@Schema(description = "id")
+	private String fdId;
+	/**
+	 * 项目编码
+	 */
+	@Schema(description = "项目编码")
+	private String fd_3adfef5e5b9d34;
+	/**
+	 * 项目名称
+	 */
+	@Schema(description = "项目名称")
+	private String fd_3adfef5eb6691c;
+	/**
+	 * 单号
+	 */
+	@Schema(description = "单号")
+	private String fd_3adfef7f5d2b52;
+	/**
+	 * 客户编码
+	 */
+	@Schema(description = "客户编码")
+	private String fd_3adfef80202ab2;
+	/**
+	 * 客户名称
+	 */
+	@Schema(description = "客户名称")
+	private String fd_3adfef7fc1c886;
+	/**
+	 * 类型
+	 */
+	@Schema(description = "类型")
+	private String fd_3adda3037e3bda;
+	/**
+	 * 产生来源
+	 */
+	@Schema(description = "产生来源")
+	private String fd_3adda320daef5a;
+	/**
+	 * 姓名
+	 */
+	@Schema(description = "姓名")
+	private String fd_3adfef948da848;
+	/**
+	 * 身份证号
+	 */
+	@Schema(description = "身份证号")
+	private String fd_3adfef94dcdbb4;
+	/**
+	 * 风险金金额
+	 */
+	@Schema(description = "风险金金额")
+	private Double fd_3adfef963bae28;
+	/**
+	 * 应收
+	 */
+	@Schema(description = "应收")
+	private Double fd_3adfefa3daae72;
+	/**
+	 * 结算状态
+	 */
+	@Schema(description = "结算状态")
+	private String fd_3adfefaaa3bbd0;
+	/**
+	 * 收款状态
+	 */
+	@Schema(description = "收款状态")
+	private String fd_3adfefaaef583e;
+	/**
+	 * 生成月份
+	 */
+	@Schema(description = "生成月份")
+	private String fd_3ae0c3032cffc8;
+	/**
+	 * 实际结算月份
+	 */
+	@Schema(description = "实际结算月份")
+	private String fd_3ae0c3044e5958;
+	/**
+	 * 结算单号
+	 */
+	@Schema(description = "结算单号")
+	private String fd_3aead7204bb594;
+	/**
+	 * 收款单号
+	 */
+	@Schema(description = "收款单号")
+	private String fd_3aeae59b70fe5a;
+	/**
+	 * 数据来源
+	 */
+	@Schema(description = "数据来源")
+	private String fd_3b0b7210ce9432;
+	/**
+	 * 是否全部结算
+	 */
+	@Schema(description = "是否全部结算")
+	private String fd_3b13b218b76a36;
+	/**
+	 * HRO结算月份
+	 */
+	@Schema(description = "HRO结算月份")
+	private String fd_3b13b2093b95ec;
+	/**
+	 * 风险金ID
+	 */
+	@Schema(description = "风险金ID")
+	private String fd_3b13db120a8224;
+	/**
+	 * 项目台账ID
+	 */
+	@Schema(description = "项目台账ID")
+	private String fd_3b16e4cd2c9a86_text;
+	/**
+	 * 项目台账ID(ID)
+	 */
+	@Schema(description = "项目台账ID(ID)")
+	private String fd_3b16e4cd2c9a86;
+	/**
+	 * 薪酬申请编号
+	 */
+	@Schema(description = "薪酬申请编号")
+	private String fd_3b3bf0c3198840;
+	/**
+	 * 变更记录
+	 */
+	@Schema(description = "变更记录")
+	private String fd_3b3e4252b16714;
+	
+	@Schema(description = "创建时间")
+	private Date createTime;
+
+}

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/controller/TEkpManagerInfoController.java

+package com.yifu.cloud.plus.v1.ekp.controller;
+
+import com.yifu.cloud.plus.v1.ekp.service.EkpManagerInfoService;
+import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
+import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpIncomeParamManage;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 
+ *
+ * @author huyc
+ * @date 2024-03-13 16:14:37
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/ekpmanagerinfo" )
+@Tag(name = "管理费明细")
+public class TEkpManagerInfoController {
+
+    private final EkpManagerInfoService ekpManagerInfoService;
+
+	/**
+	 * @param incomeParam
+	 * @Description: 推送管理费明细数据
+	 * @Author: huyc
+	 * @Date: 2024/3/14
+	 * @return:
+	 **/
+	@Inner
+	@PostMapping("/inner/pushManangerInfoToEkp")
+	public String pushManangerInfoToEkp(@RequestBody EkpIncomeParamManage incomeParam) {
+		return ekpManagerInfoService.pushManangerInfoToEkp(incomeParam);
+	}
+}

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/controller/TEkpRiskInfoController.java

+package com.yifu.cloud.plus.v1.ekp.controller;
+
+import com.yifu.cloud.plus.v1.ekp.service.EkpRiskInfoService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 
+ *
+ * @author huyc
+ * @date 2024-03-13 16:14:37
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/ekpriskinfo" )
+@Tag(name = "风险金明细")
+public class TEkpRiskInfoController {
+
+    private final EkpRiskInfoService ekpRiskInfoService;
+}

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/mapper/EkpManagerInfoMapper.java

+package com.yifu.cloud.plus.v1.ekp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.ekp.entity.EkpManagerInfo;
+import com.yifu.cloud.plus.v1.ekp.vo.EkpDeptInfoVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 
+ *
+ * @author huyc
+ * @date 2024-03-13 16:14:37
+ */
+@Mapper
+public interface EkpManagerInfoMapper extends BaseMapper<EkpManagerInfo> {
+
+	/**
+	 * 根据身项目编码获取ekp项目明细
+	 * @param
+	 * @return
+	 */
+	EkpDeptInfoVo getEkpDeptInfoByNo(@Param("deptNo") String getEkpDeptInfoByNo);
+}

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/mapper/EkpRiskInfoMapper.java

+package com.yifu.cloud.plus.v1.ekp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.ekp.entity.EkpRiskInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ *
+ * @author huyc
+ * @date 2024-03-13 16:14:37
+ */
+@Mapper
+public interface EkpRiskInfoMapper extends BaseMapper<EkpRiskInfo> {
+
+}

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/EkpManagerInfoService.java

+package com.yifu.cloud.plus.v1.ekp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.ekp.entity.EkpManagerInfo;
+import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpIncomeParamManage;
+
+/**
+ * 
+ *
+ * @author huyc
+ * @date 2024-03-13 16:14:37
+ */
+public interface EkpManagerInfoService extends IService<EkpManagerInfo> {
+
+	String pushManangerInfoToEkp(EkpIncomeParamManage incomeParam);
+}

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/EkpRiskInfoService.java

+package com.yifu.cloud.plus.v1.ekp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.ekp.entity.EkpRiskInfo;
+
+/**
+ * 
+ *
+ * @author huyc
+ * @date 2024-03-13 16:14:37
+ */
+public interface EkpRiskInfoService extends IService<EkpRiskInfo> {
+
+}

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpManagerInfoServiceImpl.java

+package com.yifu.cloud.plus.v1.ekp.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.ekp.entity.EkpManagerInfo;
+import com.yifu.cloud.plus.v1.ekp.mapper.EkpManagerInfoMapper;
+import com.yifu.cloud.plus.v1.ekp.service.EkpManagerInfoService;
+import com.yifu.cloud.plus.v1.ekp.vo.EkpDeptInfoVo;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
+import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpIncomeParamManage;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Service;
+
+import java.util.Optional;
+
+/**
+ * @author huyc
+ * @date 2024-03-14 10:14:37
+ */
+@Log4j2
+@Service
+public class EkpManagerInfoServiceImpl extends ServiceImpl<EkpManagerInfoMapper, EkpManagerInfo> implements EkpManagerInfoService {
+
+	/**
+	 * //@Description: 工资明细推送至ekp
+	 * //@Author: huyc
+	 * //@Date: 2024-3-14
+	 * //@return: void
+	 **/
+	public String pushManangerInfoToEkp(EkpIncomeParamManage incomeParam) {
+
+		//根据项目编码获取ekp所有项目信息
+		EkpDeptInfoVo deptInfo = baseMapper.getEkpDeptInfoByNo(incomeParam.getFd_3adfef5e5b9d34());
+
+		EkpManagerInfo managerInfoCount;
+		try {
+			//去重 防止重复推送
+			managerInfoCount = baseMapper.selectOne(Wrappers.<EkpManagerInfo>query().lambda()
+					.eq(EkpManagerInfo::getFd_3b13dc864a3052, incomeParam.getFd_3b13dae9bd70f8())
+					.last(CommonConstants.LAST_ONE_SQL));
+			if (Optional.ofNullable(managerInfoCount).isPresent()) {
+				return null;
+			}
+			EkpManagerInfo managerInfo = new EkpManagerInfo();
+			//对象信息赋值
+			copyManagerProperties(incomeParam, managerInfo);
+
+			//项目信息
+			managerInfo.setFd_3b16e47cb6874c_text(deptInfo.getDeptName());
+			managerInfo.setFd_3b16e47cb6874c(deptInfo.getFdId());
+			//实际结算月份
+			if ("结算月本月数据".equals(deptInfo.getSocialType())) {
+				managerInfo.setFd_3ae0c23cb3fccc(incomeParam.getFd_3ae0c23cb3fccc());
+			} else if ("结算月上月数据".equals(deptInfo.getSocialType())) {
+				managerInfo.setFd_3ae0c23cb3fccc(DateUtil.dateToString(DateUtil.addMonthByDate(DateUtil.parseDate(incomeParam.getFd_3ae0c23cb3fccc(), "yyyy-MM"), -1), "yyyy-MM"));
+			} else {
+				managerInfo.setFd_3ae0c23cb3fccc("");
+			}
+			//是否全部结算
+			managerInfo.setFd_3b13b15f5b63fa("全量未结算数据".equals(deptInfo.getSocialType()) ? "是" : "否");
+			//创建时间
+			managerInfo.setCreateTime(DateUtil.getCurrentDateTime());
+			int i = baseMapper.insert(managerInfo);
+			return i <= 0 ? null : managerInfo.getFdId();
+		} catch (Exception e) {
+			log.error("管理费明细推送失败:",e);
+			return null;
+		}
+	}
+
+	private void copyManagerProperties(EkpIncomeParamManage incomeParam, EkpManagerInfo managerInfo) {
+		//项目编码
+		managerInfo.setFd_3adfef5e5b9d34(incomeParam.getFd_3adfef5e5b9d34());
+		//项目名称
+		managerInfo.setFd_3adfef5eb6691c(incomeParam.getFd_3adfef5eb6691c());
+		//单号
+		managerInfo.setFd_3adfef7f5d2b52(incomeParam.getFd_3adfef7f5d2b52());
+		//客户编码
+		managerInfo.setFd_3adfef80202ab2(incomeParam.getFd_3adfef80202ab2());
+		//客户名称
+		managerInfo.setFd_3adfef7fc1c886(incomeParam.getFd_3adfef7fc1c886());
+		//类型
+		managerInfo.setFd_3adda3037e3bda(incomeParam.getFd_3adda3037e3bda());
+		//产生来源
+		managerInfo.setFd_3adda320daef5a(incomeParam.getFd_3adda320daef5a());
+		//薪酬申请编号
+		managerInfo.setFd_3b3bf110837a96(incomeParam.getFd_3b3bf13759b850());
+		//姓名
+		managerInfo.setFd_3adfef948da848(incomeParam.getFd_3adfef948da848());
+		//身份证号
+		managerInfo.setFd_3adfef94dcdbb4(incomeParam.getFd_3adfef94dcdbb4());
+		//生成月份
+		managerInfo.setFd_3ae0c23b2e9a92(incomeParam.getFd_3ae0c23b2e9a92());
+		//HRO结算月
+		managerInfo.setFd_3b13dd215b55b2(incomeParam.getFd_3ae0c23cb3fccc());
+		//数据来源
+		managerInfo.setFd_3b0b7231bb5896("HRO");
+		//管理费ID
+		managerInfo.setFd_3b13dc864a3052(incomeParam.getFd_3b13dae9bd70f8());
+		//管理费金额
+		managerInfo.setFd_3adfef963bae28(CommonConstants.EMPTY_STRING.equals(incomeParam.getFd_3adfef963bae28()) ? null : Double.parseDouble(incomeParam.getFd_3adfef963bae28()));
+		//应收
+		managerInfo.setFd_3adfefa3daae72(CommonConstants.EMPTY_STRING.equals(incomeParam.getFd_3adfefa3daae72()) ? null : Double.parseDouble(incomeParam.getFd_3adfefa3daae72()));
+		//结算状态
+		managerInfo.setFd_3adfefaaa3bbd0("未结算");
+		//收款状态
+		managerInfo.setFd_3adfefaaef583e("未收");
+	}
+}

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpRiskInfoServiceImpl.java

+package com.yifu.cloud.plus.v1.ekp.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.ekp.entity.EkpRiskInfo;
+import com.yifu.cloud.plus.v1.ekp.mapper.EkpRiskInfoMapper;
+import com.yifu.cloud.plus.v1.ekp.service.EkpRiskInfoService;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 
+ *
+ * @author huyc
+ * @date 2024-03-13 16:14:37
+ */
+@Log4j2
+@Service
+public class EkpRiskInfoServiceImpl extends ServiceImpl<EkpRiskInfoMapper, EkpRiskInfo> implements EkpRiskInfoService {
+
+}

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpSalaryInfoServiceImpl.java

@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
 public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, EkpSalaryInfo> implements EkpSalaryInfoService {
 
 	/**
-	//@Description: 社保明细推送至ekp
+	//@Description: 工资明细推送至ekp
 	//@Author: huyc
 	//@Date: 2024-3-11
 	//@return: void
@@ -92,7 +92,7 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
 				}
 			}
 		}catch (Exception e) {
-			log.error("工资明细推送失败");
+			log.error("工资明细推送失败:",e);
 			return false;
 		}
 		return false;

yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpFundInfoMapper.xml

@@ -55,7 +55,7 @@
 		<result property="createTime" column="create_time"/>
 	</resultMap>
 
-	<!--tPaymentInfo合并查询-->
+	<!--查询项目信息-->
 	<select id="getAllEkpDeptInfo" resultType="com.yifu.cloud.plus.v1.ekp.vo.EkpDeptInfoVo">
 		SELECT
 			a.fd_id as fdId,
@@ -68,7 +68,7 @@
 		group by fd_3a37fe508071fe
 	</select>
 
-	<!--tPaymentInfo合并查询-->
+	<!--查询公积金明细信息-->
 	<select id="getCostSumInfo" resultType="com.yifu.cloud.plus.v1.ekp.vo.EkpSocialSumInfoVo">
 		SELECT
 			round(sum(ifnull(fd_3adfeb52a4d2e2,0)),2) as ygPersonSum,

yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpManagerInfoMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~
+  ~      Copyright (c) 2018-2025, lengleng All rights reserved.
+  ~
+  ~  Redistribution and use in source and binary forms, with or without
+  ~  modification, are permitted provided that the following conditions are met:
+  ~
+  ~ Redistributions of source code must retain the above copyright notice,
+  ~  this list of conditions and the following disclaimer.
+  ~  Redistributions in binary form must reproduce the above copyright
+  ~  notice, this list of conditions and the following disclaimer in the
+  ~  documentation and/or other materials provided with the distribution.
+  ~  Neither the name of the yifu4cloud.com developer nor the names of its
+  ~  contributors may be used to endorse or promote products derived from
+  ~  this software without specific prior written permission.
+  ~  Author: lengleng (wangiegie@gmail.com)
+  ~
+  -->
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.yifu.cloud.plus.v1.ekp.mapper.EkpManagerInfoMapper">
+
+  <resultMap id="ekpManagerInfoMap" type="com.yifu.cloud.plus.v1.ekp.entity.EkpManagerInfo">
+    <id property="fdId" column="fd_id"/>
+    <result property="fd_3adfef5e5b9d34" column="fd_3adfef5e5b9d34"/>
+    <result property="fd_3adfef5eb6691c" column="fd_3adfef5eb6691c"/>
+    <result property="fd_3adfef7f5d2b52" column="fd_3adfef7f5d2b52"/>
+    <result property="fd_3adfef80202ab2" column="fd_3adfef80202ab2"/>
+    <result property="fd_3adfef7fc1c886" column="fd_3adfef7fc1c886"/>
+    <result property="fd_3adda3037e3bda" column="fd_3adda3037e3bda"/>
+    <result property="fd_3adda320daef5a" column="fd_3adda320daef5a"/>
+    <result property="fd_3adfef948da848" column="fd_3adfef948da848"/>
+    <result property="fd_3adfef94dcdbb4" column="fd_3adfef94dcdbb4"/>
+    <result property="fd_3adfef963bae28" column="fd_3adfef963bae28"/>
+    <result property="fd_3adfefa3daae72" column="fd_3adfefa3daae72"/>
+    <result property="fd_3adfefaaa3bbd0" column="fd_3adfefaaa3bbd0"/>
+    <result property="fd_3adfefaaef583e" column="fd_3adfefaaef583e"/>
+    <result property="fd_3ae0c23cb3fccc" column="fd_3ae0c23cb3fccc"/>
+    <result property="fd_3ae0c23b2e9a92" column="fd_3ae0c23b2e9a92"/>
+    <result property="fd_3aead3c68b1078" column="fd_3aead3c68b1078"/>
+    <result property="fd_3aeae58b14691c" column="fd_3aeae58b14691c"/>
+    <result property="fd_3b0b7231bb5896" column="fd_3b0b7231bb5896"/>
+    <result property="fd_3b13b15f5b63fa" column="fd_3b13b15f5b63fa"/>
+    <result property="fd_3b13dc864a3052" column="fd_3b13dc864a3052"/>
+    <result property="fd_3b13dd215b55b2" column="fd_3b13dd215b55b2"/>
+    <result property="fd_3b16e47cb6874c" column="fd_3b16e47cb6874c"/>
+    <result property="fd_3b16e47cb6874c_text" column="fd_3b16e47cb6874c_text"/>
+    <result property="fd_3b3bf110837a96" column="fd_3b3bf110837a96"/>
+    <result property="fd_3b3e43a10ab4b2" column="fd_3b3e43a10ab4b2"/>
+    <result property="createTime" column="create_time"/>
+  </resultMap>
+
+
+	<!--查询项目信息-->
+	<select id="getEkpDeptInfoByNo" resultType="com.yifu.cloud.plus.v1.ekp.vo.EkpDeptInfoVo">
+		SELECT
+			a.fd_id as fdId,
+			a.fd_3b1480cd9dcb60 as settleType,
+			a.fd_3b15f64dd59a28 as isBpo,
+			a.fd_3b13b29acea0e6 as socialType,
+			a.fd_3a2b38c61ef9aa as deptName,
+			a.fd_3a37fe508071fe as deptNo
+		from ekp_24a8e6a7fc143bb8c48a a
+		where a.fd_3a37fe508071fe = #{deptNo} limit 1
+	</select>
+
+</mapper>

yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpRiskInfoMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~
+  ~      Copyright (c) 2018-2025, lengleng All rights reserved.
+  ~
+  ~  Redistribution and use in source and binary forms, with or without
+  ~  modification, are permitted provided that the following conditions are met:
+  ~
+  ~ Redistributions of source code must retain the above copyright notice,
+  ~  this list of conditions and the following disclaimer.
+  ~  Redistributions in binary form must reproduce the above copyright
+  ~  notice, this list of conditions and the following disclaimer in the
+  ~  documentation and/or other materials provided with the distribution.
+  ~  Neither the name of the yifu4cloud.com developer nor the names of its
+  ~  contributors may be used to endorse or promote products derived from
+  ~  this software without specific prior written permission.
+  ~  Author: lengleng (wangiegie@gmail.com)
+  ~
+  -->
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.yifu.cloud.plus.v1.ekp.mapper.EkpManagerInfoMapper">
+
+  <resultMap id="ekpRiskInfoMap" type="com.yifu.cloud.plus.v1.ekp.entity.EkpRiskInfo">
+    <id property="fdId" column="fd_id"/>
+    <result property="fd_3adfef5e5b9d34" column="fd_3adfef5e5b9d34"/>
+    <result property="fd_3adfef5eb6691c" column="fd_3adfef5eb6691c"/>
+    <result property="fd_3adfef7f5d2b52" column="fd_3adfef7f5d2b52"/>
+    <result property="fd_3adfef80202ab2" column="fd_3adfef80202ab2"/>
+    <result property="fd_3adfef7fc1c886" column="fd_3adfef7fc1c886"/>
+    <result property="fd_3adda3037e3bda" column="fd_3adda3037e3bda"/>
+    <result property="fd_3adda320daef5a" column="fd_3adda320daef5a"/>
+    <result property="fd_3adfef948da848" column="fd_3adfef948da848"/>
+    <result property="fd_3adfef94dcdbb4" column="fd_3adfef94dcdbb4"/>
+    <result property="fd_3adfef963bae28" column="fd_3adfef963bae28"/>
+    <result property="fd_3adfefa3daae72" column="fd_3adfefa3daae72"/>
+    <result property="fd_3adfefaaa3bbd0" column="fd_3adfefaaa3bbd0"/>
+    <result property="fd_3adfefaaef583e" column="fd_3adfefaaef583e"/>
+    <result property="fd_3ae0c3032cffc8" column="fd_3ae0c3032cffc8"/>
+    <result property="fd_3ae0c3044e5958" column="fd_3ae0c3044e5958"/>
+    <result property="fd_3aead7204bb594" column="fd_3aead7204bb594"/>
+    <result property="fd_3aeae59b70fe5a" column="fd_3aeae59b70fe5a"/>
+    <result property="fd_3b0b7210ce9432" column="fd_3b0b7210ce9432"/>
+    <result property="fd_3b13b218b76a36" column="fd_3b13b218b76a36"/>
+    <result property="fd_3b13b2093b95ec" column="fd_3b13b2093b95ec"/>
+    <result property="fd_3b13db120a8224" column="fd_3b13db120a8224"/>
+    <result property="fd_3b16e4cd2c9a86_text" column="fd_3b16e4cd2c9a86_text"/>
+    <result property="fd_3b16e4cd2c9a86" column="fd_3b16e4cd2c9a86"/>
+    <result property="fd_3b3bf0c3198840" column="fd_3b3bf0c3198840"/>
+    <result property="fd_3b3e4252b16714" column="fd_3b3e4252b16714"/>
+    <result property="createTime" column="create_time"/>
+  </resultMap>
+</mapper>

yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpSalaryInfoMapper.xml

@@ -118,7 +118,7 @@
     <result property="fd_3c3e5ff65115a2" column="fd_3c3e5ff65115a2"/>
   </resultMap>
 
-	<!--tPaymentInfo合并查询-->
+	<!--查询项目信息-->
 	<select id="getAllEkpDeptInfo" resultType="com.yifu.cloud.plus.v1.ekp.vo.EkpDeptInfoVo">
 		SELECT
 			a.fd_id as fdId,
@@ -131,7 +131,7 @@
 		group by fd_3a37fe508071fe
 	</select>
 
-	<!--tPaymentInfo合并查询-->
+	<!--查询工资明细信息-->
 	<select id="getCostSumInfo" resultType="com.yifu.cloud.plus.v1.ekp.vo.EkpSocialSumInfoVo">
 		SELECT
 			round(sum(ifnull(fd_3af9f2883941b4,0)),2) as ygSum,

yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpSocialInfoMapper.xml

@@ -81,7 +81,7 @@
     <result property="createTime" column="create_time"/>
   </resultMap>
 
-	<!--tPaymentInfo合并查询-->
+	<!--查询项目信息-->
 	<select id="getAllEkpDeptInfo" resultType="com.yifu.cloud.plus.v1.ekp.vo.EkpDeptInfoVo">
 		SELECT
 			a.fd_id as fdId,
@@ -94,7 +94,7 @@
 		group by fd_3a37fe508071fe
 	</select>
 
-	<!--tPaymentInfo合并查询-->
+	<!--查询社保明细信息-->
 	<select id="getCostSumInfo" resultType="com.yifu.cloud.plus.v1.ekp.vo.EkpSocialSumInfoVo">
 		SELECT
 			round(sum(ifnull(fd_3af9f2883941b4,0)),2) as ygSum,

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

@@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.*;
+import com.yifu.cloud.plus.v1.yifu.common.dapr.util.EkpDaprUtils;
 import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpIncomeUtil;
 import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpIncomeParamManage;
 import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpIncomeParamRisk;
@@ -84,6 +85,9 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 	@Autowired
 	private TPaymentInfoMapper tPaymentInfoMapper;
 
+	@Autowired
+	private EkpDaprUtils ekpDaprUtil;
+
 	/**
 	 * 收入明细表简单分页查询
 	 *
@@ -326,7 +330,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 		for (TIncome income : list) {
 			String sendBack = this.getSendBack(income);
 			income.setSendTime(new Date());
-			if (Common.isNotNull(sendBack) && sendBack.length() == 32) {
+			if (Common.isNotNull(sendBack) && sendBack.length() == 19) {
 				income.setSendStatus(CommonConstants.ONE_STRING);
 				income.setSendMonth(DateUtil.addMonth(0));
 				income.setEkpId(sendBack);
@@ -384,11 +388,14 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 	 * @return: java.lang.String
 	 **/
 	private String getSendBack(TIncome income) {
-		String sendBack;
+		String sendBack="";
 		if (CommonConstants.ONE_STRING.equals(income.getFeeType())) {
 			EkpIncomeParamManage sendParam = new EkpIncomeParamManage();
 			this.copyToEkpManage(income, sendParam);
-			sendBack = ekpIncomeUtil.sendToEkpManage(sendParam);
+			R<String> info = ekpDaprUtil.pushManagerInfoToEkp(sendParam);
+			if (!Common.isEmpty(info) && Common.isNotNull(info.getData())) {
+				sendBack = info.getData();
+			}
 		} else {
 			EkpIncomeParamRisk sendParam = new EkpIncomeParamRisk();
 			this.copyToEkpRisk(income, sendParam);

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

@@ -83,7 +83,7 @@ public class DoJointSocialTask {
         log.info("推送收入到EKP-线程开始");
         try {
 			String sendBack = this.getSendBack(income);
-			if ((Common.isEmpty(sendBack) || sendBack.length() != 32) && Common.isNotNull(income.getRedisKey())) {
+			if ((Common.isEmpty(sendBack) || sendBack.length() != 19) && Common.isNotNull(income.getRedisKey())) {
 				List<TIncome> list;
 				if (Common.isNotNull(income.getRedisKey()) && Common.isNotNull(redisUtil.get(income.getRedisKey()))) {
 					list = (List<TIncome>) redisUtil.get(income.getRedisKey());
@@ -94,7 +94,7 @@ public class DoJointSocialTask {
 				redisUtil.set(income.getRedisKey(), list);
 			}
 			income.setSendTime(new Date());
-			if (Common.isNotNull(sendBack) && sendBack.length() == 32) {
+			if (Common.isNotNull(sendBack) && sendBack.length() == 19) {
 				income.setSendStatus(CommonConstants.ONE_STRING);
 				income.setSendMonth(DateUtil.addMonth(0));
 				income.setEkpId(sendBack);
@@ -128,7 +128,7 @@ public class DoJointSocialTask {
 		log.info("推送收入到EKP-线程开始");
 		try {
 			String sendBack = this.getSendBack(income);
-			if ((Common.isEmpty(sendBack) || sendBack.length() != 32) && Common.isNotNull(income.getRedisKey())) {
+			if ((Common.isEmpty(sendBack) || sendBack.length() != 19) && Common.isNotNull(income.getRedisKey())) {
 				List<TIncome> list;
 				if (Common.isNotNull(redisUtil.get(income.getRedisKey()))) {
 					list = (List<TIncome>) redisUtil.get(income.getRedisKey());
@@ -139,7 +139,7 @@ public class DoJointSocialTask {
 				redisUtil.set(income.getRedisKey(),list);
 			}
 			income.setSendTime(new Date());
-			if (Common.isNotNull(sendBack) && sendBack.length() == 32) {
+			if (Common.isNotNull(sendBack) && sendBack.length() == 19) {
 				income.setSendStatus(CommonConstants.ONE_STRING);
 				income.setSendMonth(DateUtil.addMonth(0));
 				income.setEkpId(sendBack);
@@ -181,7 +181,7 @@ public class DoJointSocialTask {
 		log.info("推送收入到EKP-线程开始");
 		try {
 			String sendBack = this.getSendBack(income);
-			if ((Common.isEmpty(sendBack) || sendBack.length() != 32) && Common.isNotNull(income.getRedisKey())) {
+			if ((Common.isEmpty(sendBack) || sendBack.length() != 19) && Common.isNotNull(income.getRedisKey())) {
 				List<TIncome> list;
 				if (Common.isNotNull(redisUtil.get(income.getRedisKey()))) {
 					list = (List<TIncome>) redisUtil.get(income.getRedisKey());
@@ -192,7 +192,7 @@ public class DoJointSocialTask {
 				redisUtil.set(income.getRedisKey(),list);
 			}
 			income.setSendTime(new Date());
-			if (Common.isNotNull(sendBack) && sendBack.length() == 32) {
+			if (Common.isNotNull(sendBack) && sendBack.length() == 19) {
 				income.setSendStatus(CommonConstants.ONE_STRING);
 				income.setSendMonth(DateUtil.addMonth(0));
 				income.setEkpId(sendBack);
@@ -236,7 +236,7 @@ public class DoJointSocialTask {
 		try {
 			String sendBack = this.getSendBack(income);
 			income.setSendTime(new Date());
-			if (Common.isNotNull(sendBack) && sendBack.length() == 32) {
+			if (Common.isNotNull(sendBack) && sendBack.length() == 19) {
 				income.setSendStatus(CommonConstants.ONE_STRING);
 				income.setSendMonth(DateUtil.addMonth(0));
 				income.setEkpId(sendBack);
@@ -276,11 +276,14 @@ public class DoJointSocialTask {
 	 * @return: java.lang.String
 	 **/
 	private String getSendBack(TIncome income) {
-		String sendBack;
+		String sendBack = "";
 		if (CommonConstants.ONE_STRING.equals(income.getFeeType())) {
 			EkpIncomeParamManage sendParam = new EkpIncomeParamManage();
 			this.copyToEkpManage(income, sendParam);
-			sendBack = ekpIncomeUtil.sendToEkpManage(sendParam);
+			R<String> info = ekpDaprUtil.pushManagerInfoToEkp(sendParam);
+			if (!Common.isEmpty(info) && Common.isNotNull(info.getData())) {
+				sendBack = info.getData();
+			}
 		} else {
 			EkpIncomeParamRisk sendParam = new EkpIncomeParamRisk();
 			this.copyToEkpRisk(income, sendParam);
@@ -1363,7 +1366,7 @@ public class DoJointSocialTask {
 		try {
 			String sendBack = this.getSendBack(income);
 			income.setSendTime(new Date());
-			if (Common.isNotNull(sendBack) && sendBack.length() == 32) {
+			if (Common.isNotNull(sendBack) && sendBack.length() == 19) {
 				income.setSendStatus(CommonConstants.ONE_STRING);
 				income.setSendMonth(DateUtil.addMonth(0));
 				income.setEkpId(sendBack);
@@ -1399,7 +1402,7 @@ public class DoJointSocialTask {
 		try {
 			String sendBack = this.getSendBack(income);
 			income.setSendTime(new Date());
-			if (Common.isNotNull(sendBack) && sendBack.length() == 32) {
+			if (Common.isNotNull(sendBack) && sendBack.length() == 19) {
 				income.setSendStatus(CommonConstants.ONE_STRING);
 				income.setSendMonth(DateUtil.addMonth(0));
 				income.setEkpId(sendBack);