Skip to content

Y
yifu-mvp
Commit d190a72f authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

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

parents 47613349 fd4983f4
Show whitespace changes
Inline Side-by-side
Showing with 320 additions and 13 deletions
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpSalaryParam.java
View file @ d190a72f
...@@ -253,4 +253,13 @@ public class EkpSalaryParam implements Serializable { ...@@ -253,4 +253,13 @@ public class EkpSalaryParam implements Serializable {
* 税务主体 * 税务主体
**/ **/
private String fd_3afab1895feea2; private String fd_3afab1895feea2;
/**
* 代扣个人社保
**/
private String fd_3b16ce48a9735c;
/**
* 代扣个人公积金
**/
private String fd_3b16ce4b7fc42a;
} }
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpSalaryParamVo.java 0 → 100644
View file @ d190a72f
package com.yifu.cloud.plus.v1.yifu.ekp.vo;
import lombok.Data;
/**
* @Author fxj
* @Date 2022/8/22
* @Description 薪资明细对应参数
* @Version 1.0
*/
@Data
public class EkpSalaryParamVo extends EkpSalaryParam {
/**
* 社保扣缴月份
**/
private String deduSocialMonth;
/**
* 公积金扣缴月份
**/
private String deduProvidentMonth;
/**
* 代扣单位社保
**/
private String unitSocial;
/**
* 代扣单位公积金
**/
private String unitFund;
/**
* 代扣社保总额
**/
private String socialSum;
/**
* 代扣公积金总额
**/
private String fundSum;
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TSalaryAccountMapper.java
View file @ d190a72f
...@@ -20,7 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.salary.mapper; ...@@ -20,7 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.salary.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam; import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParamVo;
import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial; import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount; import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount;
import com.yifu.cloud.plus.v1.yifu.salary.vo.AccountCheckVo; import com.yifu.cloud.plus.v1.yifu.salary.vo.AccountCheckVo;
...@@ -98,7 +98,7 @@ public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> { ...@@ -98,7 +98,7 @@ public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> {
* @Date: 2022/8/29 16:52 * @Date: 2022/8/29 16:52
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam> * @return: java.util.List<com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam>
**/ **/
List<EkpSalaryParam> getEkpSalaryParamList(@Param("salaryId") String salaryId); List<EkpSalaryParamVo> getEkpSalaryParamList(@Param("salaryId") String salaryId);
List<TSalaryAccount> noPageDiy(@Param("searchVo") TSalaryAccountSearchVo searchVo, List<TSalaryAccount> noPageDiy(@Param("searchVo") TSalaryAccountSearchVo searchVo,
@Param("idList") List<String> idList); @Param("idList") List<String> idList);
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryAccountService.java
View file @ d190a72f
...@@ -20,7 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.salary.service; ...@@ -20,7 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.salary.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam; import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParamVo;
import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial; import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount; import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryAccountSearchVo; import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryAccountSearchVo;
...@@ -104,5 +104,5 @@ public interface TSalaryAccountService extends IService<TSalaryAccount> { ...@@ -104,5 +104,5 @@ public interface TSalaryAccountService extends IService<TSalaryAccount> {
* @Date: 2022/8/29 16:54 * @Date: 2022/8/29 16:54
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam> * @return: java.util.List<com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam>
**/ **/
List<EkpSalaryParam> getEkpSalaryParamList(String salaryId); List<EkpSalaryParamVo> getEkpSalaryParamList(String salaryId);
} }
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java
View file @ d190a72f
...@@ -26,7 +26,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; ...@@ -26,7 +26,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common; 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.DateUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ExcelUtil; import com.yifu.cloud.plus.v1.yifu.common.core.util.ExcelUtil;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam; import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParamVo;
import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial; import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount; import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount;
import com.yifu.cloud.plus.v1.yifu.salary.mapper.TSalaryAccountMapper; import com.yifu.cloud.plus.v1.yifu.salary.mapper.TSalaryAccountMapper;
...@@ -212,7 +212,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper, ...@@ -212,7 +212,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
} }
@Override @Override
public List<EkpSalaryParam> getEkpSalaryParamList(String salaryId) { public List<EkpSalaryParamVo> getEkpSalaryParamList(String salaryId) {
return baseMapper.getEkpSalaryParamList(salaryId); return baseMapper.getEkpSalaryParamList(salaryId);
} }
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @ d190a72f
...@@ -33,8 +33,13 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprArchivesProperties; ...@@ -33,8 +33,13 @@ 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.common.dapr.config.DaprSocialProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil; import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils; import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpFundUtil;
import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSalaryUtil; import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSalaryUtil;
import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSocialUtil;
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; import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParamVo;
import com.yifu.cloud.plus.v1.yifu.salary.entity.MSalaryEstimate; import com.yifu.cloud.plus.v1.yifu.salary.entity.MSalaryEstimate;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TApprovalRecord; import com.yifu.cloud.plus.v1.yifu.salary.entity.TApprovalRecord;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount; import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount;
...@@ -51,6 +56,7 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail; ...@@ -51,6 +56,7 @@ 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.TSendEkpError;
import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeDetailReturnVo; import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeDetailReturnVo;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -90,7 +96,10 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -90,7 +96,10 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
@Autowired @Autowired
private EkpSalaryUtil ekpSalaryUtil; private EkpSalaryUtil ekpSalaryUtil;
@Autowired
private EkpSocialUtil ekpSocialUtil;
@Autowired
private EkpFundUtil ekpFundUtil;
@Autowired @Autowired
private TApprovalRecordService auditLogService; private TApprovalRecordService auditLogService;
...@@ -513,8 +522,9 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -513,8 +522,9 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
if (s == null) { if (s == null) {
return R.failed("未找到工资表"); return R.failed("未找到工资表");
} else if (s.getStatus() == SalaryConstants.STATUS[2] || s.getStatus() == SalaryConstants.STATUS[10]) { } else if (s.getStatus() == SalaryConstants.STATUS[2] || s.getStatus() == SalaryConstants.STATUS[10]) {
// 2022-9-15 10:50:57需求变更：代扣的要组装预估明细给EKP，EKP自己找差额、变更实缴结算状态。
//报账表 //报账表
List<EkpSalaryParam> ekpList = salaryAccountService.getEkpSalaryParamList(id); List<EkpSalaryParamVo> ekpList = salaryAccountService.getEkpSalaryParamList(id);
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if (user != null && ekpList != null && !ekpList.isEmpty()) { if (user != null && ekpList != null && !ekpList.isEmpty()) {
boolean sendStatus = true; boolean sendStatus = true;
...@@ -523,13 +533,26 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -523,13 +533,26 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
TSalaryAccount account; TSalaryAccount account;
Date sendTime = new Date(); Date sendTime = new Date();
String nowMonth = DateUtil.addMonth(0); String nowMonth = DateUtil.addMonth(0);
for (EkpSalaryParam sendParam : ekpList) { EkpSalaryParam salaryParam;
for (EkpSalaryParamVo sendParam : ekpList) {
salaryParam = new EkpSalaryParam();
BeanUtils.copyProperties(sendParam, salaryParam);
// 转化报账表的参数 // 转化报账表的参数
account = new TSalaryAccount(); account = new TSalaryAccount();
account.setId(sendParam.getFd_3b10af838eab5c()); account.setId(sendParam.getFd_3b10af838eab5c());
sendBack = ekpSalaryUtil.sendToEKP(sendParam); // 社保
if (Common.isNotNull(sendParam.getFd_3b16ce48a9735c())
&& !CommonConstants.ZERO_STRING.equals(sendParam.getFd_3b16ce48a9735c())) {
doSendForecastSocialToEkp(sendParam, s);
}
// 公积金
if (Common.isNotNull(sendParam.getFd_3b16ce4b7fc42a())
&& !CommonConstants.ZERO_STRING.equals(sendParam.getFd_3b16ce4b7fc42a())) {
doSendForecastFundToEkp(sendParam, s);
}
sendBack = ekpSalaryUtil.sendToEKP(salaryParam);
if (Common.isEmpty(sendBack) || sendBack.length() != 32) { if (Common.isEmpty(sendBack) || sendBack.length() != 32) {
sendBack = ekpSalaryUtil.sendToEKP(sendParam); sendBack = ekpSalaryUtil.sendToEKP(salaryParam);
} }
account.setSendTime(sendTime); account.setSendTime(sendTime);
account.setSendUser(user.getId()); account.setSendUser(user.getId());
...@@ -596,4 +619,223 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -596,4 +619,223 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
auditLogService.save(tApprovalRecord); auditLogService.save(tApprovalRecord);
} }
private void doSendForecastSocialToEkp(EkpSalaryParamVo account, TSalaryStandard s) {
EkpPushSocialParam socialParam = new EkpPushSocialParam();
//订单类型
socialParam.setFd_3add9dd7833db8("预估");
//是否有预估
socialParam.setFd_3add9de0be85e4(CommonConstants.IS_TRUE);
//与工资合并结算
socialParam.setFd_3add9e1a670144(CommonConstants.IS_FALSE);
//项目编码
socialParam.setFd_3adfe8c70d3fd4(account.getFd_3adfedf98ccba2());
//项目名称
socialParam.setFd_3adfe8c8468e54(account.getFd_3adfedf9d2bf1c());
//单号
socialParam.setFd_3adfe95c169c48(CommonConstants.EMPTY_STRING);
//客户编码
socialParam.setFd_3adfe8c73cb5a4(account.getFd_3adfedfacd65d6());
//客户名称
socialParam.setFd_3adfe8c81a0e42(account.getFd_3adfedfb174068());
//社保户
socialParam.setFd_3aeafa25916e82(CommonConstants.EMPTY_STRING);
//员工姓名
socialParam.setFd_3adfe8c79989d4(account.getFd_3adfedfb5a68a2());
//员工身份证
socialParam.setFd_3adfe8c7e4cf7a(account.getFd_3adfedfb8f76d4());
// 缴纳月份
socialParam.setFd_3adfe8cf632700(account.getDeduSocialMonth());
// 生成月份
socialParam.setFd_3adfe8cb96c41e(account.getDeduSocialMonth());
// 预估单位合计
socialParam.setFd_3adfeb4e8064a8(account.getUnitSocial());
// 预估个人合计
socialParam.setFd_3adfeb52a4d2e2(account.getFd_3b16ce48a9735c());
//应收
socialParam.setFd_3adfeb7b624f06(account.getSocialSum());
//预估合计
socialParam.setFd_3af9ed7e813b86(account.getSocialSum());
//单位养老金额
socialParam.setFd_3af9ec80a9de7a(CommonConstants.EMPTY_STRING);
//单位医疗金额
socialParam.setFd_3af9eba5899c90(CommonConstants.EMPTY_STRING);
//单位工伤金额
socialParam.setFd_3af9eba684f592(CommonConstants.EMPTY_STRING);
//单位失业金额
socialParam.setFd_3af9eba5f6e19e(CommonConstants.EMPTY_STRING);
//单位生育金额
socialParam.setFd_3af9eba71c0138(CommonConstants.EMPTY_STRING);
//单位大病金额
socialParam.setFd_3af9eba863c0ee(CommonConstants.EMPTY_STRING);
//个人养老金额
socialParam.setFd_3af9ebbd791662(CommonConstants.EMPTY_STRING);
//个人医疗金额
socialParam.setFd_3af9ebbdd9797e(CommonConstants.EMPTY_STRING);
//预估个人大病救助
socialParam.setFd_3af9ebbf3e8be2(CommonConstants.EMPTY_STRING);
//预估个人失业
socialParam.setFd_3af9ebbe29ce1c(CommonConstants.EMPTY_STRING);
//结算状态
socialParam.setFd_3add9ea428879a(CommonConstants.SALARY_UNFLAG);
//结算月份
socialParam.setFd_3adfe8cff746bc(CommonConstants.EMPTY_STRING);
//单位差异
socialParam.setFd_3adfeb53c70f72(CommonConstants.EMPTY_STRING);
//个人差异
socialParam.setFd_3adfeb5413fb44(CommonConstants.EMPTY_STRING);
//收款状态
socialParam.setFd_3add9eaeed2560(CommonConstants.EMPTY_STRING);
//结算单号
socialParam.setFd_3adfeb830523b6(CommonConstants.EMPTY_STRING);
//收款单号
socialParam.setFd_3adfeb8489e6c2(CommonConstants.EMPTY_STRING);
//应支出
socialParam.setFd_3adfeb7bd97464(CommonConstants.EMPTY_STRING);
//支出结算状态
socialParam.setFd_3add9edfbc6f7e(CommonConstants.EMPTY_STRING);
//付款状态
socialParam.setFd_3add9eed23894a(CommonConstants.EMPTY_STRING);
//支出缴纳单号
socialParam.setFd_3adfeb83a704c8(CommonConstants.EMPTY_STRING);
//实缴单位生育
socialParam.setFd_3af9ee3afb34c2(CommonConstants.EMPTY_STRING);
//付款单号
socialParam.setFd_3adfeb84175f28(CommonConstants.EMPTY_STRING);
//实缴个人合计
socialParam.setFd_3af9ee3cb6d4fa(CommonConstants.EMPTY_STRING);
//实缴单位合计
socialParam.setFd_3af9ee3c0bf286(CommonConstants.EMPTY_STRING);
//实缴个人补缴利息
socialParam.setFd_3af9ee3d634946(CommonConstants.EMPTY_STRING);
//实缴单位医疗
socialParam.setFd_3af9ee39dea6a8(CommonConstants.EMPTY_STRING);
//预估个人补缴利息
socialParam.setFd_3af9ebbecc4aa8(CommonConstants.EMPTY_STRING);
//预估单位补缴利息
socialParam.setFd_3af9eba7c3da5e(CommonConstants.EMPTY_STRING);
//实缴单位养老
socialParam.setFd_3af9ee3938170a(CommonConstants.EMPTY_STRING);
//实缴个人失业
socialParam.setFd_3af9ee3db44d96(CommonConstants.EMPTY_STRING);
//实缴单位补缴利息
socialParam.setFd_3af9ee3b5ddae8(CommonConstants.EMPTY_STRING);
//实缴单位大病救助
socialParam.setFd_3af9ee3ba76f54(CommonConstants.EMPTY_STRING);
//实缴单位工伤
socialParam.setFd_3af9ee3aa9c84a(CommonConstants.EMPTY_STRING);
//实缴合计
socialParam.setFd_3af9ee3c6bfc74(CommonConstants.EMPTY_STRING);
//实缴个人医疗
socialParam.setFd_3af9ee3e066d48(CommonConstants.EMPTY_STRING);
//实缴单位失业
socialParam.setFd_3af9ee3a46b7e6(CommonConstants.EMPTY_STRING);
//实缴个人养老
socialParam.setFd_3af9ee3e513962(CommonConstants.EMPTY_STRING);
//实缴个人大病救助
socialParam.setFd_3af9ee3d0ba3b6(CommonConstants.EMPTY_STRING);
//我司到款单位
socialParam.setFd_3b01953871b8be(s.getInvoiceTitle());
//社保id
socialParam.setFd_3b0afbe1f94a08(account.getFd_3b10af838eab5c());
String sendBack = ekpSocialUtil.sendToEKP(socialParam);
if (Common.isEmpty(sendBack) || sendBack.length() != 32) {
sendBack = ekpSocialUtil.sendToEKP(socialParam);
}
if (Common.isEmpty(sendBack) || sendBack.length() != 32) {
TSendEkpError error = new TSendEkpError();
error.setCreateTime(new Date());
error.setCreateDay(DateUtil.getThisDay());
error.setType(CommonConstants.ZERO_STRING);
error.setCreateUserName(s.getCreateName());
error.setLinkId(account.getFd_3b10af838eab5c());
error.setTitle(sendBack);
error.setNums(CommonConstants.ONE_INT);
HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
, "/tsendekperror/inner/saveError", error, Boolean.class, SecurityConstants.FROM_IN);
}
}
private void doSendForecastFundToEkp(EkpSalaryParamVo account, TSalaryStandard s) {
EkpPushFundParam socialParam = new EkpPushFundParam();
//订单类型
socialParam.setFd_3add9dd7833db8("预估");
//是否有预估
socialParam.setFd_3add9de0be85e4(CommonConstants.IS_TRUE);
//与工资合并结算
socialParam.setFd_3add9e1a670144(CommonConstants.IS_FALSE);
//项目编码
socialParam.setFd_3adfe8c70d3fd4(account.getFd_3adfedf98ccba2());
//项目名称
socialParam.setFd_3adfe8c8468e54(account.getFd_3adfedf9d2bf1c());
//单号
socialParam.setFd_3adfe95c169c48(CommonConstants.EMPTY_STRING);
//客户编码
socialParam.setFd_3adfe8c73cb5a4(account.getFd_3adfedfacd65d6());
//客户名称
socialParam.setFd_3adfe8c81a0e42(account.getFd_3adfedfb174068());
//公积金账户
socialParam.setFd_3aeafa8cc144bc(CommonConstants.EMPTY_STRING);
//员工姓名
socialParam.setFd_3adfe8c79989d4(account.getFd_3adfedfb5a68a2());
//员工身份证
socialParam.setFd_3adfe8c7e4cf7a(account.getFd_3adfedfb8f76d4());
// 预估单位代缴
socialParam.setFd_3adfeb4e8064a8(account.getUnitFund());
// 预估个人代缴
socialParam.setFd_3adfeb52a4d2e2(account.getFd_3b16ce4b7fc42a());
//应收
socialParam.setFd_3adfeb7b624f06(account.getFundSum());
// 缴纳月份
socialParam.setFd_3adfe8cf632700(account.getDeduProvidentMonth());
// 生成月份
socialParam.setFd_3adfe8cb96c41e(account.getDeduProvidentMonth());
//结算状态
socialParam.setFd_3add9ea428879a(CommonConstants.SALARY_UNFLAG);
//单位代缴
socialParam.setFd_3adfeb52fbe966(CommonConstants.EMPTY_STRING);
//个人代缴
socialParam.setFd_3adfeb5366dd82(CommonConstants.EMPTY_STRING);
//结算月份
socialParam.setFd_3adfe8cff746bc(CommonConstants.EMPTY_STRING);
//单位差异
socialParam.setFd_3adfeb53c70f72(CommonConstants.EMPTY_STRING);
//个人差异
socialParam.setFd_3adfeb5413fb44(CommonConstants.EMPTY_STRING);
//收款状态
socialParam.setFd_3add9eaeed2560(CommonConstants.EMPTY_STRING);
//结算单号
socialParam.setFd_3adfeb830523b6(CommonConstants.EMPTY_STRING);
//收款单号
socialParam.setFd_3adfeb8489e6c2(CommonConstants.EMPTY_STRING);
//应支出
socialParam.setFd_3adfeb7bd97464(CommonConstants.EMPTY_STRING);
//支出结算状态
socialParam.setFd_3add9edfbc6f7e(CommonConstants.EMPTY_STRING);
//付款状态
socialParam.setFd_3add9eed23894a(CommonConstants.EMPTY_STRING);
//支出缴纳单号
socialParam.setFd_3adfeb83a704c8(CommonConstants.EMPTY_STRING);
//付款单号
socialParam.setFd_3adfeb84175f28(CommonConstants.EMPTY_STRING);
//我司到款单位
socialParam.setFd_3b019a2e9bfdd6(s.getInvoiceTitle());
// 公积金id
socialParam.setFd_3b0afbaf10df2c(account.getFd_3b10af838eab5c());
String sendBack = ekpFundUtil.sendToEKP(socialParam);
if (Common.isEmpty(sendBack) || sendBack.length() != 32) {
sendBack = ekpFundUtil.sendToEKP(socialParam);
}
if (Common.isEmpty(sendBack) || sendBack.length() != 32) {
TSendEkpError error = new TSendEkpError();
error.setCreateTime(new Date());
error.setCreateDay(DateUtil.getThisDay());
error.setType(CommonConstants.ZERO_STRING);
error.setCreateUserName(s.getCreateName());
error.setLinkId(account.getFd_3b10af838eab5c());
error.setTitle(sendBack);
error.setNums(CommonConstants.ONE_INT);
HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
, "/tsendekperror/inner/saveError", error, Boolean.class, SecurityConstants.FROM_IN);
}
}
} }
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
View file @ d190a72f
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
</resultMap> </resultMap>
<!-- 对接EKP的参数 --> <!-- 对接EKP的参数 -->
<resultMap id="ekpSalaryParamVoMap" type="com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam"> <resultMap id="ekpSalaryParamVoMap" type="com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParamVo">
<result property="fd_3b10af838eab5c" column="fd_3b10af838eab5c"/> <result property="fd_3b10af838eab5c" column="fd_3b10af838eab5c"/>
<result property="fd_3adfedf98ccba2" column="fd_3adfedf98ccba2"/> <result property="fd_3adfedf98ccba2" column="fd_3adfedf98ccba2"/>
<result property="fd_3adfedf9d2bf1c" column="fd_3adfedf9d2bf1c"/> <result property="fd_3adfedf9d2bf1c" column="fd_3adfedf9d2bf1c"/>
...@@ -144,6 +144,14 @@ ...@@ -144,6 +144,14 @@
<result property="fd_3aeadf1992544c" column="fd_3aeadf1992544c"/> <result property="fd_3aeadf1992544c" column="fd_3aeadf1992544c"/>
<result property="fd_3af9d49d165e90" column="fd_3af9d49d165e90"/> <result property="fd_3af9d49d165e90" column="fd_3af9d49d165e90"/>
<result property="fd_3afab1895feea2" column="fd_3afab1895feea2"/> <result property="fd_3afab1895feea2" column="fd_3afab1895feea2"/>
<result property="fd_3b16ce48a9735c" column="fd_3b16ce48a9735c"/>
<result property="fd_3b16ce4b7fc42a" column="fd_3b16ce4b7fc42a"/>
<result property="deduSocialMonth" column="DEDU_SOCIAL_MONTH"/>
<result property="deduProvidentMonth" column="DEDU_PROVIDENT_MONTH"/>
<result property="unitSocial" column="unit_social"/>
<result property="unitFund" column="unit_fund"/>
<result property="socialSum" column="social_sum"/>
<result property="fundSum" column="fund_sum"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -504,6 +512,14 @@ ...@@ -504,6 +512,14 @@
,'' fd_3aeadf1992544c ,'' fd_3aeadf1992544c
,if(a.SALARY_GIVE_TIME='1','是','否') fd_3af9d49d165e90 ,if(a.SALARY_GIVE_TIME='1','是','否') fd_3af9d49d165e90
,ifnull(a.INVOICE_TITLE,'') fd_3afab1895feea2 ,ifnull(a.INVOICE_TITLE,'') fd_3afab1895feea2
,ifnull(withholidingPersonSocial.SALARY_MONEY,'') fd_3b16ce48a9735c
,ifnull(withholidingPersonFund.SALARY_MONEY,'') fd_3b16ce4b7fc42a
,ifnull(withholidingUnitSocial.SALARY_MONEY,'') unit_social
,ifnull(withholidingUnitFund.SALARY_MONEY,'') unit_fund
,ifnull(withholidingUnitSocial.SALARY_MONEY,'0')+ifnull(withholidingPersonSocial.SALARY_MONEY,'0') social_sum
,ifnull(withholidingUnitFund.SALARY_MONEY,'0')+ifnull(withholidingPersonFund.SALARY_MONEY,'0') fund_sum
,concat(left(ifnull(a.DEDU_SOCIAL_MONTH,'1970'),4),'-',right(ifnull(a.DEDU_SOCIAL_MONTH,'02'),2)) DEDU_SOCIAL_MONTH
,concat(left(ifnull(a.DEDU_PROVIDENT_MONTH,'1970'),4),'-',right(ifnull(a.DEDU_PROVIDENT_MONTH,'02'),2)) DEDU_PROVIDENT_MONTH
from t_salary_account a from t_salary_account a
LEFT JOIN t_salary_standard s on a.SALARY_FORM_ID=s.ID LEFT JOIN t_salary_standard s on a.SALARY_FORM_ID=s.ID
left join t_salary_account_item withholidingPersonSocial on withholidingPersonSocial.SALARY_ACCOUNT_ID = a.id and withholidingPersonSocial.JAVA_FIED_NAME='withholidingPersonSocial' left join t_salary_account_item withholidingPersonSocial on withholidingPersonSocial.SALARY_ACCOUNT_ID = a.id and withholidingPersonSocial.JAVA_FIED_NAME='withholidingPersonSocial'
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSendEkpError.java
View file @ d190a72f
...@@ -48,7 +48,7 @@ public class TSendEkpError { ...@@ -48,7 +48,7 @@ public class TSendEkpError {
private String title; private String title;
@ExcelAttribute(name = "类型") @ExcelAttribute(name = "类型")
@ExcelProperty("类型（1薪资明细2预估明细3缴费明细4实时收入5定时收入）") @ExcelProperty("类型（0:薪资代扣推送的社保公积金1薪资明细2预估明细3缴费明细4实时收入5定时收入）")
private String type; private String type;
@ExcelAttribute(name = "创建日") @ExcelAttribute(name = "创建日")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment