收入推送接口

yifu-common/yifu-common-ekp/src/main/resources/META-INF/spring.factories

@@ -2,5 +2,6 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
     com.yifu.cloud.plus.v1.yifu.ekp.util.EkpOrderUtil,\
     com.yifu.cloud.plus.v1.yifu.ekp.util.EkpInsuranceUtil,\
     com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSalaryUtil,\
+    com.yifu.cloud.plus.v1.yifu.ekp.util.EkpIncomeUtil,\
     com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSocialUtil,\
     com.yifu.cloud.plus.v1.yifu.ekp.util.EkpFundUtil
\ No newline at end of file

yifu-common/yifu-common-ekp/src/main/resources/ekpIncomeConfig.properties

-ekp.url=http://119.96.227.251.8080/api/sys-modeling/appModelRestService/addModel
-ekp.fdModelIdManage=181d76db26e419a88dba97b0c406689e
-ekp.fdFlowIdManage=182d3b6e522b2690119e70d4ff082136
-ekp.fdModelIdRisk=181d76db26e419a88dba97b0c406689e
-ekp.fdFlowIdRisk=182d3b6e522b2690119e70d4ff082136
-ekp.docStatus=20
-ekp.loginName=admin
-ekp.docSubject=\u6536\u5165\u660E\u7EC6\u6570\u636E\u63A5\u53E3
+income.url=http://119.96.227.251.8080/api/sys-modeling/appModelRestService/addModel
+income.fdModelIdManage=181d76db26e419a88dba97b0c406689e
+income.fdFlowIdManage=182d3b6e522b2690119e70d4ff082136
+income.fdModelIdRisk=181d76db26e419a88dba97b0c406689e
+income.fdFlowIdRisk=182d3b6e522b2690119e70d4ff082136
+income.docStatus=20
+income.loginName=admin
+income.docSubject=\u6536\u5165\u660E\u7EC6\u6570\u636E\u63A5\u53E3
 
 

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

@@ -19,7 +19,6 @@ package com.yifu.cloud.plus.v1.yifu.social.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.read.listener.ReadListener;
 import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
@@ -30,6 +29,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.config.DaprArchivesProperties;
+import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSocialProperties;
+import com.yifu.cloud.plus.v1.yifu.ekp.config.EkpIncomeProperties;
 import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpIncomeUtil;
 import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpIncomeParam;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TIncome;
@@ -41,10 +43,11 @@ import com.yifu.cloud.plus.v1.yifu.social.vo.IncomeExportVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeSearchVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeVo;
 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.stereotype.Service;
 
+import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -291,7 +294,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 	}
 
 	/**
-	 * @param income 收入
+	 * @param income    收入
 	 * @param sendParam 目标格式
 	 * @Description: 转化格式，传到EKP
 	 * @Author: hgw
@@ -305,7 +308,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 		sendParam.setFd_3adfef5eb6691c(income.getDeptName());
 		// 单号
 		sendParam.setFd_3adfef7f5d2b52("");
-	 	// 客户编码
+		// 客户编码
 		sendParam.setFd_3adfef80202ab2(income.getUnitNo());
 		// 客户名称
 		sendParam.setFd_3adfef7fc1c886(income.getUnitName());
@@ -335,15 +338,15 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 		if (Common.isEmpty(income.getCreateMonth()) || income.getCreateMonth().length() != 6) {
 			sendParam.setFd_3ae0c3032cffc8("1970-02");
 		} else {
-			sendParam.setFd_3ae0c3032cffc8(income.getCreateMonth().substring(0,4)
-					+ CommonConstants.CENTER_SPLIT_LINE_STRING + income.getCreateMonth().substring(4,6));
+			sendParam.setFd_3ae0c3032cffc8(income.getCreateMonth().substring(0, 4)
+					+ CommonConstants.CENTER_SPLIT_LINE_STRING + income.getCreateMonth().substring(4, 6));
 		}
 		// 结算月份
 		if (Common.isEmpty(income.getPayMonth()) || income.getPayMonth().length() != 6) {
 			sendParam.setFd_3ae0c3044e5958("1970-02");
 		} else {
-			sendParam.setFd_3ae0c3044e5958(income.getPayMonth().substring(0,4)
-					+ CommonConstants.CENTER_SPLIT_LINE_STRING + income.getPayMonth().substring(4,6));
+			sendParam.setFd_3ae0c3044e5958(income.getPayMonth().substring(0, 4)
+					+ CommonConstants.CENTER_SPLIT_LINE_STRING + income.getPayMonth().substring(4, 6));
 		}
 		// 管理费、风险金金额
 		sendParam.setFd_3adfef963bae28(String.valueOf(income.getMoney()));