Skip to content

Y
yifu-mvp
Commit d718cfb0 authored by huyuchen's avatar huyuchen
Browse files
Options

明细接口改造

parent 87e39f52
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 9 deletions
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpPushSocialParam.java
View file @ d718cfb0
...@@ -258,7 +258,7 @@ public class EkpPushSocialParam implements Serializable { ...@@ -258,7 +258,7 @@ public class EkpPushSocialParam implements Serializable {
private String fd_3b438e33f37378; private String fd_3b438e33f37378;
/** /**
* 社保创建人姓名 * 缴纳地
**/ **/
private String fd_3b5cc58d1a70fe; private String fd_3b5cc58d1a70fe;
/** /**
......
yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/entity/EkpSocialInfo.java
View file @ d718cfb0
package com.yifu.cloud.plus.v1.ekp.entity; package com.yifu.cloud.plus.v1.ekp.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
...@@ -139,6 +138,8 @@ public class EkpSocialInfo { ...@@ -139,6 +138,8 @@ public class EkpSocialInfo {
private Double fd_3af9f2d8df88c0; private Double fd_3af9f2d8df88c0;
private Double fd_3af9f27efdd912;
private Double fd_3af9f257b1b586; private Double fd_3af9f257b1b586;
private String fd_3b0194c7336de0; private String fd_3b0194c7336de0;
...@@ -173,6 +174,5 @@ public class EkpSocialInfo { ...@@ -173,6 +174,5 @@ public class EkpSocialInfo {
private Date createTime; private Date createTime;
@TableField(exist = false) private String createName;
private String socialIds;
} }
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpSocialInfoServiceImpl.java
View file @ d718cfb0
...@@ -12,7 +12,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil; ...@@ -12,7 +12,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpPushSocialParam; import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpPushSocialParam;
import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentSocialPush; import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentSocialPush;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.*; import java.util.*;
...@@ -54,7 +53,8 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E ...@@ -54,7 +53,8 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
for (EkpPushSocialParam socialParam : unPushList) { for (EkpPushSocialParam socialParam : unPushList) {
EkpSocialInfo socialInfo = new EkpSocialInfo(); EkpSocialInfo socialInfo = new EkpSocialInfo();
BeanUtils.copyProperties(socialParam,socialInfo); //对象信息赋值
copyProperties(socialParam,socialInfo);
//社保信息 //社保信息
deptInfo = map.get(socialInfo.getFd_3adfe8c70d3fd4()); deptInfo = map.get(socialInfo.getFd_3adfe8c70d3fd4());
...@@ -164,6 +164,7 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E ...@@ -164,6 +164,7 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
} }
boolean flag = this.saveBatch(socialInfoList); boolean flag = this.saveBatch(socialInfoList);
if (flag) { if (flag) {
//推送成功保存社保明细合并的数据对应关系
EkpSocialPushInfoVo pushInfoVo = new EkpSocialPushInfoVo(); EkpSocialPushInfoVo pushInfoVo = new EkpSocialPushInfoVo();
pushInfoVo.setUnPushInfo(socialPushList); pushInfoVo.setUnPushInfo(socialPushList);
pushInfoVo.setPaymentIds(paymentIds); pushInfoVo.setPaymentIds(paymentIds);
...@@ -172,4 +173,113 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E ...@@ -172,4 +173,113 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
return null; return null;
} }
private void copyProperties(EkpPushSocialParam socialParam,EkpSocialInfo socialInfo) {
//订单类型
socialInfo.setFd_3add9dd7833db8(socialParam.getFd_3add9dd7833db8());
//与工资合并结算
socialInfo.setFd_3add9e1a670144(socialParam.getFd_3add9e1a670144());
//是否有预估
socialInfo.setFd_3add9de0be85e4(socialParam.getFd_3add9de0be85e4());
//是否为BPO业务
socialInfo.setFd_3b178e3ba5e258(socialParam.getFd_3b178dfcf9e3e6());
//创建人姓名
socialInfo.setFd_3b438e61af0a56(socialParam.getFd_3b438e33f37378());
//项目编码
socialInfo.setFd_3adfe8c70d3fd4(socialParam.getFd_3adfe8c70d3fd4());
//项目名称
socialInfo.setFd_3adfe8c8468e54(socialParam.getFd_3adfe8c8468e54());
//单号
socialInfo.setFd_3adfe95c169c48(socialParam.getFd_3adfe95c169c48());
//客户编码
socialInfo.setFd_3adfe8c73cb5a4(socialParam.getFd_3adfe8c73cb5a4());
//客户名称
socialInfo.setFd_3adfe8c81a0e42(socialParam.getFd_3adfe8c81a0e42());
//社保户
socialInfo.setFd_3aeafa25916e82(socialParam.getFd_3aeafa25916e82());
//姓名
socialInfo.setFd_3adfe8c79989d4(socialParam.getFd_3adfe8c79989d4());
//身份证号
socialInfo.setFd_3adfe8c7e4cf7a(socialParam.getFd_3adfe8c7e4cf7a());
//我司到款单位
socialInfo.setFd_3b0194c7336de0(socialParam.getFd_3b01953871b8be());
//生成月份
socialInfo.setFd_3adfe8cb96c41e(socialParam.getFd_3adfe8cb96c41e());
//缴纳月份
socialInfo.setFd_3adfe8cf632700(socialParam.getFd_3adfe8cf632700());
//社保ID
socialInfo.setFd_3b0b716e771e06(socialParam.getFd_3b0afbe1f94a08());
//薪酬申请编号
socialInfo.setFd_3b3cab5f343a90(socialParam.getFd_3b3cab77923f44());
//缴纳地
socialInfo.setFd_3b5cc5e697079a(socialParam.getFd_3b5cc58d1a70fe());
//社保合集ID
socialInfo.setFd_3b6495a5ad6e10(socialParam.getSocialIds());
//预估单位养老
socialInfo.setFd_3af9f257b1b586(Double.valueOf(socialParam.getFd_3af9ec80a9de7a()));
//预估单位医疗
socialInfo.setFd_3af9f25b851e94(Double.valueOf(socialParam.getFd_3af9eba5899c90()));
//预估单位失业
socialInfo.setFd_3af9f25f5e9cc4(Double.valueOf(socialParam.getFd_3af9eba5f6e19e()));
//预估单位工伤
socialInfo.setFd_3af9f2617e530a(Double.valueOf(socialParam.getFd_3af9eba684f592()));
//预估单位生育
socialInfo.setFd_3af9f263e094c6(Double.valueOf(socialParam.getFd_3af9eba71c0138()));
//预估单位补缴利息
socialInfo.setFd_3af9f267a03bd6(Double.valueOf(socialParam.getFd_3af9eba7c3da5e()));
//预估单位大病救助
socialInfo.setFd_3af9f26a3cae94(Double.valueOf(socialParam.getFd_3af9eba863c0ee()));
//预估单位合计
socialInfo.setFd_3adfeb4e8064a8(Double.valueOf(socialParam.getFd_3adfeb4e8064a8()));
//预估个人养老
socialInfo.setFd_3af9f27a3974e6(Double.valueOf(socialParam.getFd_3af9ebbd791662()));
//预估个人医疗
socialInfo.setFd_3af9f27ce947ac(Double.valueOf(socialParam.getFd_3af9ebbdd9797e()));
//预估个人失业
socialInfo.setFd_3af9f27efdd912(Double.valueOf(socialParam.getFd_3af9ebbe29ce1c()));
//预估个人补缴利息
socialInfo.setFd_3af9f281651734(Double.valueOf(socialParam.getFd_3af9ebbecc4aa8()));
//预估个人大病救助
socialInfo.setFd_3af9f283a6f288(Double.valueOf(socialParam.getFd_3af9ebbf3e8be2()));
//预估个人合计
socialInfo.setFd_3af9f285ee1e38(Double.valueOf(socialParam.getFd_3adfeb52a4d2e2()));
//预估合计
socialInfo.setFd_3af9f2883941b4(Double.valueOf(socialParam.getFd_3af9ed7e813b86()));
//实缴单位养老
socialInfo.setFd_3af9f2d8df88c0(Double.valueOf(socialParam.getFd_3af9ee3938170a()));
//实缴单位医疗
socialInfo.setFd_3af9f2db1e5e16(Double.valueOf(socialParam.getFd_3af9ee39dea6a8()));
//实缴单位失业
socialInfo.setFd_3af9f2dd5d8fb8(Double.valueOf(socialParam.getFd_3af9ee3a46b7e6()));
//实缴单位工伤
socialInfo.setFd_3af9f2e03295dc(Double.valueOf(socialParam.getFd_3af9ee3aa9c84a()));
//实缴单位生育
socialInfo.setFd_3af9f2e237f794(Double.valueOf(socialParam.getFd_3af9ee3afb34c2()));
//实缴单位补缴利息
socialInfo.setFd_3af9f2e45a5d78(Double.valueOf(socialParam.getFd_3af9ee3b5ddae8()));
//实缴单位合计
socialInfo.setFd_3af9f2e9208e4e(Double.valueOf(socialParam.getFd_3af9ee3c0bf286()));
//实缴个人养老
socialInfo.setFd_3af9f2ec516c30(Double.valueOf(socialParam.getFd_3af9ee3e513962()));
//实缴个人医疗
socialInfo.setFd_3af9f2f8290f24(Double.valueOf(socialParam.getFd_3af9ee3e066d48()));
//实缴个人失业
socialInfo.setFd_3af9f2fa79ee72(Double.valueOf(socialParam.getFd_3af9ee3db44d96()));
//实缴个人补缴利息
socialInfo.setFd_3af9f2fcde9158(Double.valueOf(socialParam.getFd_3af9ee3d634946()));
//实缴个人大病救助
socialInfo.setFd_3af9f2ff2c9f42(Double.valueOf(socialParam.getFd_3af9ee3d0ba3b6()));
//实缴个人合计
socialInfo.setFd_3af9f303037214(Double.valueOf(socialParam.getFd_3af9ee3cb6d4fa()));
//实缴合计
socialInfo.setFd_3af9f3059e5b9c(Double.valueOf(socialParam.getFd_3af9ee3c6bfc74()));
//结算状态
socialInfo.setFd_3add9ea428879a(socialParam.getFd_3add9ea428879a());
//收款状态
socialInfo.setFd_3add9eaeed2560("未收");
//付款状态
socialInfo.setFd_3add9eed23894a("未付");
//创建者姓名
socialInfo.setCreateName(socialParam.getFd_3b438e33f37378());
}
} }
yifu-ekp/yifu-ekp-biz/src/main/resources/application-dev.yml
View file @ d718cfb0
...@@ -33,7 +33,7 @@ spring: ...@@ -33,7 +33,7 @@ spring:
type: CLASS_BASED type: CLASS_BASED
tables: tables:
t_payment_info: t_payment_info:
actual-data-nodes: ds0.ekp_social_info_20$->{23..24} actual-data-nodes: ds0.ekp_social_fee_info_20$->{23..24}
key-generate-strategy: key-generate-strategy:
column: fd_id column: fd_id
key-generator-name: snowflake key-generator-name: snowflake
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/util/DoJointSocialTask.java
View file @ d718cfb0
...@@ -537,7 +537,7 @@ public class DoJointSocialTask { ...@@ -537,7 +537,7 @@ public class DoJointSocialTask {
//应收 //应收
socialParam.setFd_3adfeb7b624f06(CommonConstants.EMPTY_STRING); socialParam.setFd_3adfeb7b624f06(CommonConstants.EMPTY_STRING);
//收款状态 //收款状态
socialParam.setFd_3add9eaeed2560("未收"); socialParam.setFd_3add9eaeed2560(CommonConstants.EMPTY_STRING);
//结算单号 //结算单号
socialParam.setFd_3adfeb830523b6(CommonConstants.EMPTY_STRING); socialParam.setFd_3adfeb830523b6(CommonConstants.EMPTY_STRING);
//收款单号 //收款单号
...@@ -547,7 +547,7 @@ public class DoJointSocialTask { ...@@ -547,7 +547,7 @@ public class DoJointSocialTask {
//支出结算状态 //支出结算状态
socialParam.setFd_3add9edfbc6f7e(CommonConstants.EMPTY_STRING); socialParam.setFd_3add9edfbc6f7e(CommonConstants.EMPTY_STRING);
//付款状态 //付款状态
socialParam.setFd_3add9eed23894a("未付"); socialParam.setFd_3add9eed23894a(CommonConstants.EMPTY_STRING);
//支出缴纳单号 //支出缴纳单号
socialParam.setFd_3adfeb83a704c8(CommonConstants.EMPTY_STRING); socialParam.setFd_3adfeb83a704c8(CommonConstants.EMPTY_STRING);
//实缴单位生育 //实缴单位生育
......
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