Skip to content

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

明细接口改造

parent adc8cdc8
Hide whitespace changes
Inline Side-by-side
Showing with 590 additions and 567 deletions
yifu-common/yifu-common-dapr/pom.xml
View file @ 10d6ec94
......@@ -56,6 +56,12 @@
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.yifu.cloud.plus.v1</groupId>
<artifactId>yifu-ekp-api</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<properties>
......
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/EkpDaprUtils.java
View file @ 10d6ec94
package com.yifu.cloud.plus.v1.yifu.common.dapr.util;
import com.alibaba.fastjson.JSON;
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;
......@@ -31,7 +32,7 @@ public class EkpDaprUtils {
* @Param
* @return
**/
public R<Boolean> pushSocialInfoToEkp(List<EkpPushSocialParam> unPushList) {
return HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/ekpSocialPush/inner/pushSocialInfoToEkp", JSON.toJSONString(unPushList), Boolean.class, SecurityConstants.FROM_IN);
public R<EkpSocialPushInfoVo> pushSocialInfoToEkp(List<EkpPushSocialParam> unPushList) {
return HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/ekpSocialPush/inner/pushSocialInfoToEkp", JSON.toJSONString(unPushList), EkpSocialPushInfoVo.class, SecurityConstants.FROM_IN);
}
}
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpPushSocialParam.java
View file @ 10d6ec94
......@@ -261,5 +261,8 @@ public class EkpPushSocialParam implements Serializable {
* 社保创建人姓名
**/
private String fd_3b5cc58d1a70fe;
/**
* 社保ids
**/
private String socialIds;
}
\ No newline at end of file
yifu-ekp/yifu-ekp-api/pom.xml
View file @ 10d6ec94
......@@ -42,5 +42,17 @@
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.yifu.cloud.plus.v1</groupId>
<artifactId>yifu-common-ekp</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.yifu.cloud.plus.v1</groupId>
<artifactId>yifu-social-api</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/entity/EkpSocialInfo.java
View file @ 10d6ec94
package com.yifu.cloud.plus.v1.ekp.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
......@@ -19,157 +22,157 @@ import java.util.Date;
@Schema(description = "社保明细表")
public class EkpSocialInfo {
@Schema(description = "fdId")
private String fdId;
@TableId(type = IdType.ASSIGN_ID)
private String fd_id;
private String fd3add9dd7833db8;
private String fd_3add9dd7833db8;
private String fd3add9de0be85e4;
private String fd_3add9de0be85e4;
private String fd3add9e1a670144;
private String fd_3add9e1a670144;
private String fd3adfe8c70d3fd4;
private String fd_3adfe8c70d3fd4;
private String fd3adfe8c8468e54;
private String fd_3adfe8c8468e54;
private String fd3adfe95c169c48;
private String fd_3adfe95c169c48;
private String fd3adfe8c73cb5a4;
private String fd_3adfe8c73cb5a4;
private String fd3adfe8c81a0e42;
private String fd_3adfe8c81a0e42;
private String fd3adfe8c79989d4;
private String fd_3adfe8c79989d4;
private String fd3adfe8c7e4cf7a;
private String fd_3adfe8c7e4cf7a;
private Date fd3adfe8cb96c41e;
private String fd_3adfe8cb96c41e;
private Date fd3adfe8cf632700;
private String fd_3adfe8cf632700;
private Date fd3adfe8cff746bc;
private String fd_3adfe8cff746bc;
private Double fd3adfeb4e8064a8;
private Double fd_3adfeb4e8064a8;
private Double fd3adfeb52a4d2e2;
private Double fd_3adfeb52a4d2e2;
private Double fd3adfeb52fbe966;
private Double fd_3adfeb52fbe966;
private Double fd3adfeb5366dd82;
private Double fd_3adfeb5366dd82;
private Double fd3adfeb53c70f72;
private Double fd_3adfeb53c70f72;
private Double fd3adfeb5413fb44;
private Double fd_3adfeb5413fb44;
private Double fd3adfeb7b624f06;
private Double fd_3adfeb7b624f06;
private String fd3add9ea428879a;
private String fd_3add9ea428879a;
private String fd3add9eaeed2560;
private String fd_3add9eaeed2560;
private String fd3adfeb830523b6;
private String fd_3adfeb830523b6;
private String fd3adfeb8489e6c2;
private String fd_3adfeb8489e6c2;
private Double fd3adfeb7bd97464;
private Double fd_3adfeb7bd97464;
private String fd3add9edfbc6f7e;
private String fd_3add9edfbc6f7e;
private String fd3add9eed23894a;
private String fd_3add9eed23894a;
private String fd3adfeb83a704c8;
private String fd_3adfeb83a704c8;
private String fd3adfeb84175f28;
private String fd_3adfeb84175f28;
private String fd3aeafa25916e82;
private String fd_3aeafa25916e82;
private Double fd3af9f2fa79ee72;
private Double fd_3af9f2fa79ee72;
private Double fd3af9f2ec516c30;
private Double fd_3af9f2ec516c30;
private Double fd3af9f2fcde9158;
private Double fd_3af9f2fcde9158;
private Double fd3af9f285ee1e38;
private Double fd_3af9f285ee1e38;
private Double fd3af9f2dd5d8fb8;
private Double fd_3af9f2dd5d8fb8;
private Double fd3af9f2e03295dc;
private Double fd_3af9f2e03295dc;
private Double fd3af9f27a3974e6;
private Double fd_3af9f27a3974e6;
private Double fd3af9f25b851e94;
private Double fd_3af9f25b851e94;
private Double fd3af9f27efdd912;
private Double fd_3af9f3059e5b9c;
private Double fd3af9f3059e5b9c;
private Double fd_3af9f26a3cae94;
private Double fd3af9f26a3cae94;
private Double fd_3af9f263e094c6;
private Double fd3af9f263e094c6;
private Double fd_3af9f2617e530a;
private Double fd3af9f2617e530a;
private Double fd_3af9f281651734;
private Double fd3af9f281651734;
private Double fd_3af9f2e9208e4e;
private Double fd3af9f2e9208e4e;
private Double fd_3af9f2e6dfb3f4;
private Double fd3af9f2e6dfb3f4;
private Double fd_3af9f2f8290f24;
private Double fd3af9f2f8290f24;
private Double fd_3af9f2e237f794;
private Double fd3af9f2e237f794;
private Double fd_3af9f2e45a5d78;
private Double fd3af9f2e45a5d78;
private Double fd_3af9f283a6f288;
private Double fd3af9f283a6f288;
private Double fd_3af9f2db1e5e16;
private Double fd3af9f2db1e5e16;
private Double fd_3af9f27ce947ac;
private Double fd3af9f27ce947ac;
private Double fd_3af9f2ff2c9f42;
private Double fd3af9f2ff2c9f42;
private Double fd_3af9f25f5e9cc4;
private Double fd3af9f25f5e9cc4;
private Double fd_3af9f2883941b4;
private Double fd3af9f2883941b4;
private Double fd_3af9f267a03bd6;
private Double fd3af9f267a03bd6;
private Double fd_3af9f303037214;
private Double fd3af9f303037214;
private Double fd_3af9f2d8df88c0;
private Double fd3af9f2d8df88c0;
private Double fd_3af9f257b1b586;
private Double fd3af9f257b1b586;
private String fd_3b0194c7336de0;
private String fd3b0194c7336de0;
private String fd_3b0b716e771e06;
private String fd3b0b716e771e06;
private String fd_3b1354c3add8c2;
private String fd3b1354c3add8c2;
private String fd_3b16e2f436ff98_text;
private String fd3b16e2f436ff98Text;
private String fd_3b16e2f436ff98;
private String fd3b16e2f436ff98;
private String fd_3b178e3ba5e258;
private String fd3b178e3ba5e258;
private Double fd_3b35a57b6e9d0a;
private Double fd3b35a57b6e9d0a;
private Double fd_3b35a5b0b04d54;
private Double fd3b35a5b0b04d54;
private Double fd_3b35a57aee1428;
private Double fd3b35a57aee1428;
private Double fd_3b35a5b03100c4;
private Double fd3b35a5b03100c4;
private String fd_3b3cab5f343a90;
private String fd3b3cab5f343a90;
private String fd_3b3e41ac916e66;
private String fd3b3e41ac916e66;
private String fd_3b438e61af0a56;
private String fd3b438e61af0a56;
private String fd_3b5cc5e697079a;
private String fd3b5cc5e697079a;
private String fd3b6495a5ad6e10;
private String fd_3b6495a5ad6e10;
private Date createTime;
@TableField(exist = false)
private String socialIds;
}
yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/vo/EkpDeptInfoVo.java 0 → 100644
View file @ 10d6ec94
package com.yifu.cloud.plus.v1.ekp.vo;
import lombok.Data;
import java.io.Serializable;
/**
* @Author huyc
* @Date 2024/3/1
* @Description 获取项目明细信息
* @Version 1.0
*/
@Data
public class EkpDeptInfoVo implements Serializable {
/**
* fdId
**/
private String fdId;
/**
* 是否为BPO项目
**/
private String isBpo;
/**
* 社保费用
**/
private String socialType;
/**
* 结算方式
**/
private String settleType;
/**
* 项目名称
**/
private String deptName;
/**
* 项目编码
**/
private String deptNo;
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/vo/EkpSocialPushInfoVo.java → yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/vo/EkpSocialPushInfoVo.java
View file @ 10d6ec94
package com.yifu.cloud.plus.v1.ekp.vo;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpPushSocialParam;
import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentSocialPush;
import lombok.Data;
import java.io.Serializable;
......@@ -18,6 +18,10 @@ public class EkpSocialPushInfoVo implements Serializable {
/**
* 社保明细
**/
private List<EkpPushSocialParam> unPushInfo;
private List<TPaymentSocialPush> unPushInfo;
/**
* 社保id集合
**/
private List<String> paymentIds;
}
yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/vo/EkpSocialSumInfoVo.java 0 → 100644
View file @ 10d6ec94
package com.yifu.cloud.plus.v1.ekp.vo;
import lombok.Data;
import java.io.Serializable;
/**
* @Author huyc
* @Date 2024/3/1
* @Description 获取项目明细信息
* @Version 1.0
*/
@Data
public class EkpSocialSumInfoVo implements Serializable {
/**
* 预估合计
**/
private Double ygSum;
/**
* 预估个人合计
**/
private Double ygPersonSum;
/**
* 实缴合计
**/
private Double sjSum;
/**
* 预估单位合计
**/
private Double ygDwSum;
/**
* 实缴单位合计
**/
private Double sjDwSum;
/**
* 实缴个人合计
**/
private Double sjPersonSum;
/**
* 应收
**/
private Double ys;
/**
* 个人应收
**/
private Double personYs;
/**
* 单位应收
**/
private Double dwYs;
/**
* 应支出
**/
private Double yzc;
/**
* 个人应支
**/
private Double personYzc;
/**
* 单位应支
**/
private Double dwYzc;
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/controller/TEkpSocialInfoController.java
View file @ 10d6ec94
package com.yifu.cloud.plus.v1.ekp.controller;
import com.yifu.cloud.plus.v1.ekp.service.EkpSocialInfoService;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpSocialViewVo;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpPushSocialParam;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -23,8 +25,10 @@ import java.util.List;
@Tag(name = "社保明细推送")
public class TEkpSocialInfoController {
private final EkpSocialInfoService socialInfoService;
/**
* @param viewVo
* @param unPushList
* @Description: 推送社保明细数据
* @Author: huyc
* @Date: 2024/2/29
......@@ -32,8 +36,7 @@ public class TEkpSocialInfoController {
**/
@Inner
@PostMapping("/inner/pushSocialInfoToEkp")
public Boolean pushSocialInfoToEkp(@RequestBody List<EkpSocialViewVo> viewVo) {
// return tPaymentInfoService.updateSocialSettleStatus(viewVo);
return null;
public EkpSocialPushInfoVo pushSocialInfoToEkp(@RequestBody List<EkpPushSocialParam> unPushList) {
return socialInfoService.pushSocialInfoToEkp(unPushList);
}
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/mapper/EkpSocialInfoMapper.java
View file @ 10d6ec94
......@@ -2,7 +2,12 @@ package com.yifu.cloud.plus.v1.ekp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpDeptInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialSumInfoVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 社保明细表
......@@ -13,4 +18,17 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface EkpSocialInfoMapper extends BaseMapper<EkpSocialInfo> {
/**
* 获取所有项目信息
* @param
* @return
*/
List<EkpDeptInfoVo> getAllEkpDeptInfo();
/**
* 根据身份证和生成月份获取费用合计
* @param
* @return
*/
EkpSocialSumInfoVo getCostSumInfo(@Param("card") String empIdCard, @Param("month") String createMonth);
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/EkpSocialInfoService.java
View file @ 10d6ec94
......@@ -2,6 +2,10 @@ package com.yifu.cloud.plus.v1.ekp.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpPushSocialParam;
import java.util.List;
/**
* 社保明细表
......@@ -11,4 +15,5 @@ import com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo;
*/
public interface EkpSocialInfoService extends IService<EkpSocialInfo> {
EkpSocialPushInfoVo pushSocialInfoToEkp(List<EkpPushSocialParam> unPushList);
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpSocialInfoServiceImpl.java
View file @ 10d6ec94
......@@ -4,9 +4,20 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo;
import com.yifu.cloud.plus.v1.ekp.mapper.EkpSocialInfoMapper;
import com.yifu.cloud.plus.v1.ekp.service.EkpSocialInfoService;
import com.yifu.cloud.plus.v1.ekp.vo.EkpDeptInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialSumInfoVo;
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.EkpPushSocialParam;
import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentSocialPush;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.stream.Collectors;
/**
* 社保明细表
*
......@@ -17,4 +28,148 @@ import org.springframework.stereotype.Service;
@Service
public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, EkpSocialInfo> implements EkpSocialInfoService {
/**
* @Description: 社保明细推送至ekp
* @Author: huyc
* @Date: 2024-2-29
* @return: void
**/
public EkpSocialPushInfoVo pushSocialInfoToEkp(List<EkpPushSocialParam> unPushList) {
//插入数据集合
List<EkpSocialInfo> socialInfoList = new ArrayList<>();
//社保推送记录表
List<TPaymentSocialPush> socialPushList = new ArrayList<>();
//社保id集合 用于更新社保状态
List<String> paymentIds = new ArrayList<>();
//获取ekp所有项目信息
List<EkpDeptInfoVo> deptInfoVoList = baseMapper.getAllEkpDeptInfo();
Map<String,EkpDeptInfoVo> map = new HashMap<>();
EkpDeptInfoVo deptInfo;
EkpSocialSumInfoVo socialSumInfo;
if (Optional.ofNullable(deptInfoVoList).isPresent()) {
map = deptInfoVoList.stream().collect(Collectors.toMap(EkpDeptInfoVo::getDeptNo, k->k));
}
for (EkpPushSocialParam socialParam : unPushList) {
EkpSocialInfo socialInfo = new EkpSocialInfo();
BeanUtils.copyProperties(socialParam,socialInfo);
//社保信息
deptInfo = map.get(socialInfo.getFd_3adfe8c70d3fd4());
socialInfo.setFd_3b16e2f436ff98_text(deptInfo.getDeptName());
socialInfo.setFd_3b16e2f436ff98(deptInfo.getFdId());
//实际结算月份
if("生成月本月数据" .equals(deptInfo.getSocialType())){
socialInfo.setFd_3adfe8cff746bc(socialInfo.getFd_3adfe8cb96c41e());
}else if("生成月上月数据".equals(deptInfo.getSocialType())){
socialInfo.setFd_3adfe8cff746bc(DateUtil.dateToString(DateUtil.addMonthByDate(DateUtil.stringToDate(socialInfo.getFd_3adfe8cb96c41e(),"yyyy-MM"),-1)));
}else if("生成月次月数据".equals(deptInfo.getSocialType())){
socialInfo.setFd_3adfe8cff746bc(DateUtil.dateToString(DateUtil.addMonthByDate(DateUtil.stringToDate(socialInfo.getFd_3adfe8cb96c41e(),"yyyy-MM"),1)));
}
//是否全部结算
if("全量未结算数据" .equals(deptInfo.getSocialType())){
socialInfo.setFd_3b1354c3add8c2(CommonConstants.IS_TRUE);
}else {
socialInfo.setFd_3b1354c3add8c2(CommonConstants.IS_FALSE);
}
//获取社保订单明细合计
socialSumInfo = baseMapper.getCostSumInfo(socialInfo.getFd_3adfe8c7e4cf7a(),socialInfo.getFd_3adfe8cb96c41e());
//单位差异
if("是".equals(socialInfo.getFd_3add9de0be85e4()) && "实缴".equals(socialInfo.getFd_3add9dd7833db8())){
//单位差异
//$列表.求总和$($社保订单明细*总数(实缴单位合计)$)+ $实缴单位合计$ - $列表.求总和$($社保订单明细*总数(预估单位合计)$)
socialInfo.setFd_3adfeb53c70f72(Double.sum(Double.sum(socialSumInfo.getSjDwSum(),socialInfo.getFd_3af9f2e9208e4e()),-socialSumInfo.getYgDwSum()));
//个人差异
//$列表.求总和$($社保订单明细*总数(实缴个人合计)$)+ $实缴个人合计$ - $列表.求总和$($社保订单明细*总数(预估个人合计)$)
socialInfo.setFd_3adfeb5413fb44(Double.sum(Double.sum(socialSumInfo.getSjPersonSum(),socialInfo.getFd_3af9f303037214()),-socialSumInfo.getYgPersonSum()));
}
//Fd_3adfeb7b624f06应收；Fd_3b35a57aee1428个人应收；fd_3b35a57b6e9d0a单位应收
if("是".equals(deptInfo.getIsBpo())){
//应收
socialInfo.setFd_3adfeb7b624f06(CommonConstants.ZERO_INTEGER.doubleValue());
//个人应收
socialInfo.setFd_3b35a57aee1428(CommonConstants.ZERO_INTEGER.doubleValue());
//单位应收
socialInfo.setFd_3b35a57b6e9d0a(CommonConstants.ZERO_INTEGER.doubleValue());
}else{
if("实缴".equals(deptInfo.getSettleType())){
if("预估".equals(socialInfo.getFd_3add9dd7833db8())){
//$列表.求总和$($社保订单明细*总数(预估合计)$) + $预估合计$ - $列表.求总和$($社保订单明细*总数(应收)$)
socialInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(socialSumInfo.getYgSum(),socialInfo.getFd_3af9f2883941b4()),-socialSumInfo.getYs()));
//$列表.求总和$( $社保订单明细*总数(预估个人合计)$) + $预估个人合计$ - $列表.求总和$($社保订单明细*总数(个人应收)$)
socialInfo.setFd_3b35a57aee1428(Double.sum(Double.sum(socialSumInfo.getYgPersonSum(),socialInfo.getFd_3af9f285ee1e38()),-socialSumInfo.getPersonYs()));
//$列表.求总和$($社保订单明细*总数(预估单位合计)$) + $预估单位合计$ - $列表.求总和$($社保订单明细*总数(单位应收)$)
socialInfo.setFd_3b35a57b6e9d0a(Double.sum(Double.sum(socialSumInfo.getYgDwSum(),socialInfo.getFd_3adfeb4e8064a8()),-socialSumInfo.getDwYs()));
}else{
if(socialSumInfo.getYgSum()>0){
//应收
socialInfo.setFd_3adfeb7b624f06(CommonConstants.ZERO_INTEGER.doubleValue());
//个人应收
socialInfo.setFd_3b35a57aee1428(CommonConstants.ZERO_INTEGER.doubleValue());
//单位应收
socialInfo.setFd_3b35a57b6e9d0a(CommonConstants.ZERO_INTEGER.doubleValue());
}else{
//$列表.求总和$($社保订单明细*总数(实缴合计)$)+ $实缴合计$ - $列表.求总和$($社保订单明细*总数(应收)$)
socialInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(socialSumInfo.getSjSum(),socialInfo.getFd_3af9f3059e5b9c()),-socialSumInfo.getYs()));
//$列表.求总和$($社保订单明细*总数(实缴个人合计)$)+ $实缴个人合计$ - $列表.求总和$($社保订单明细*总数(个人应收)$)
socialInfo.setFd_3b35a57aee1428(Double.sum(Double.sum(socialSumInfo.getSjPersonSum(),socialInfo.getFd_3af9f303037214()),-socialSumInfo.getPersonYs()));
//列表.求总和$($社保订单明细*总数(实缴单位合计)$)+ $实缴单位合计$ - $列表.求总和$($社保订单明细*总数(单位应收)$)
socialInfo.setFd_3b35a57b6e9d0a(Double.sum(Double.sum(socialSumInfo.getSjDwSum(),socialInfo.getFd_3af9f2e9208e4e()),-socialSumInfo.getDwYs()));
}
}
}else{
if("预估".equals(socialInfo.getFd_3add9dd7833db8())){
//$列表.求总和$($社保订单明细*总数(预估合计)$) + $预估合计$-$列表.求总和$($社保订单明细*总数(应收)$)
socialInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(socialSumInfo.getYgSum(),socialInfo.getFd_3af9f2883941b4()),-socialSumInfo.getYs()));
//$列表.求总和$( $社保订单明细*总数(预估个人合计)$) + $预估个人合计$-$列表.求总和$($社保订单明细*总数(个人应收)$)
socialInfo.setFd_3b35a57aee1428(Double.sum(Double.sum(socialSumInfo.getYgPersonSum(),socialInfo.getFd_3af9f285ee1e38()),-socialSumInfo.getPersonYs()));
//$列表.求总和$($社保订单明细*总数(预估单位合计)$) + $预估单位合计$-$列表.求总和$($社保订单明细*总数(单位应收)$)
socialInfo.setFd_3b35a57b6e9d0a(Double.sum(Double.sum(socialSumInfo.getYgDwSum(),socialInfo.getFd_3adfeb4e8064a8()),-socialSumInfo.getDwYs()));
}else{
//$列表.求总和$($社保订单明细*总数(实缴合计)$)+ $实缴合计$ - $列表.求总和$($社保订单明细*总数(应收)$)
socialInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(socialSumInfo.getSjSum(),socialInfo.getFd_3af9f3059e5b9c()),-socialSumInfo.getYs()));
//$列表.求总和$($社保订单明细*总数(实缴个人合计)$)+ $实缴个人合计$ - $列表.求总和$($社保订单明细*总数(个人应收)$)
socialInfo.setFd_3b35a57aee1428(Double.sum(Double.sum(socialSumInfo.getSjPersonSum(),socialInfo.getFd_3af9f303037214()),-socialSumInfo.getPersonYs()));
//$列表.求总和$($社保订单明细*总数(实缴单位合计)$)+ $实缴单位合计$ - $列表.求总和$($社保订单明细*总数(单位应收)$)
socialInfo.setFd_3b35a57b6e9d0a(Double.sum(Double.sum(socialSumInfo.getSjDwSum(),socialInfo.getFd_3af9f2e9208e4e()),-socialSumInfo.getDwYs()));
}
}
}
if("预估".equals(socialInfo.getFd_3add9dd7833db8())){
//应支出
socialInfo.setFd_3adfeb7bd97464(CommonConstants.ZERO_INTEGER.doubleValue());
//个人应支
socialInfo.setFd_3b35a5b03100c4(CommonConstants.ZERO_INTEGER.doubleValue());
//单位应支
socialInfo.setFd_3b35a5b0b04d54(CommonConstants.ZERO_INTEGER.doubleValue());
}else{
//应支出
socialInfo.setFd_3adfeb7bd97464(socialInfo.getFd_3af9f3059e5b9c());
//个人应支
socialInfo.setFd_3b35a5b03100c4(socialInfo.getFd_3af9f303037214());
//单位应支
socialInfo.setFd_3b35a5b0b04d54(socialInfo.getFd_3af9f2e9208e4e());
}
//创建时间
socialInfo.setCreateTime(DateUtil.getCurrentDateTime());
socialInfoList.add(socialInfo);
TPaymentSocialPush a = new TPaymentSocialPush();
a.setPaymentIds(socialParam.getSocialIds());
a.setId(socialParam.getFd_3b0afbe1f94a08());
socialPushList.add(a);
paymentIds.add(socialParam.getSocialIds());
}
boolean flag = this.saveBatch(socialInfoList);
if (flag) {
EkpSocialPushInfoVo pushInfoVo = new EkpSocialPushInfoVo();
pushInfoVo.setUnPushInfo(socialPushList);
pushInfoVo.setPaymentIds(paymentIds);
return pushInfoVo;
}
return null;
}
}
yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpSocialInfoMapper.xml
View file @ 10d6ec94
......@@ -6,82 +6,112 @@
<mapper namespace="com.yifu.cloud.plus.v1.ekp.mapper.EkpSocialInfoMapper">
<resultMap id="ekpSocialInfoMap" type="com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo">
<id property="fdId" column="fd_id"/>
<result property="fd3add9dd7833db8" column="fd_3add9dd7833db8"/>
<result property="fd3add9de0be85e4" column="fd_3add9de0be85e4"/>
<result property="fd3add9e1a670144" column="fd_3add9e1a670144"/>
<result property="fd3adfe8c70d3fd4" column="fd_3adfe8c70d3fd4"/>
<result property="fd3adfe8c8468e54" column="fd_3adfe8c8468e54"/>
<result property="fd3adfe95c169c48" column="fd_3adfe95c169c48"/>
<result property="fd3adfe8c73cb5a4" column="fd_3adfe8c73cb5a4"/>
<result property="fd3adfe8c81a0e42" column="fd_3adfe8c81a0e42"/>
<result property="fd3adfe8c79989d4" column="fd_3adfe8c79989d4"/>
<result property="fd3adfe8c7e4cf7a" column="fd_3adfe8c7e4cf7a"/>
<result property="fd3adfe8cb96c41e" column="fd_3adfe8cb96c41e"/>
<result property="fd3adfe8cf632700" column="fd_3adfe8cf632700"/>
<result property="fd3adfe8cff746bc" column="fd_3adfe8cff746bc"/>
<result property="fd3adfeb4e8064a8" column="fd_3adfeb4e8064a8"/>
<result property="fd3adfeb52a4d2e2" column="fd_3adfeb52a4d2e2"/>
<result property="fd3adfeb52fbe966" column="fd_3adfeb52fbe966"/>
<result property="fd3adfeb5366dd82" column="fd_3adfeb5366dd82"/>
<result property="fd3adfeb53c70f72" column="fd_3adfeb53c70f72"/>
<result property="fd3adfeb5413fb44" column="fd_3adfeb5413fb44"/>
<result property="fd3adfeb7b624f06" column="fd_3adfeb7b624f06"/>
<result property="fd3add9ea428879a" column="fd_3add9ea428879a"/>
<result property="fd3add9eaeed2560" column="fd_3add9eaeed2560"/>
<result property="fd3adfeb830523b6" column="fd_3adfeb830523b6"/>
<result property="fd3adfeb8489e6c2" column="fd_3adfeb8489e6c2"/>
<result property="fd3adfeb7bd97464" column="fd_3adfeb7bd97464"/>
<result property="fd3add9edfbc6f7e" column="fd_3add9edfbc6f7e"/>
<result property="fd3add9eed23894a" column="fd_3add9eed23894a"/>
<result property="fd3adfeb83a704c8" column="fd_3adfeb83a704c8"/>
<result property="fd3adfeb84175f28" column="fd_3adfeb84175f28"/>
<result property="fd3aeafa25916e82" column="fd_3aeafa25916e82"/>
<result property="fd3af9f2fa79ee72" column="fd_3af9f2fa79ee72"/>
<result property="fd3af9f2ec516c30" column="fd_3af9f2ec516c30"/>
<result property="fd3af9f2fcde9158" column="fd_3af9f2fcde9158"/>
<result property="fd3af9f285ee1e38" column="fd_3af9f285ee1e38"/>
<result property="fd3af9f2dd5d8fb8" column="fd_3af9f2dd5d8fb8"/>
<result property="fd3af9f2e03295dc" column="fd_3af9f2e03295dc"/>
<result property="fd3af9f27a3974e6" column="fd_3af9f27a3974e6"/>
<result property="fd3af9f25b851e94" column="fd_3af9f25b851e94"/>
<result property="fd3af9f27efdd912" column="fd_3af9f27efdd912"/>
<result property="fd3af9f3059e5b9c" column="fd_3af9f3059e5b9c"/>
<result property="fd3af9f26a3cae94" column="fd_3af9f26a3cae94"/>
<result property="fd3af9f263e094c6" column="fd_3af9f263e094c6"/>
<result property="fd3af9f2617e530a" column="fd_3af9f2617e530a"/>
<result property="fd3af9f281651734" column="fd_3af9f281651734"/>
<result property="fd3af9f2e9208e4e" column="fd_3af9f2e9208e4e"/>
<result property="fd3af9f2e6dfb3f4" column="fd_3af9f2e6dfb3f4"/>
<result property="fd3af9f2f8290f24" column="fd_3af9f2f8290f24"/>
<result property="fd3af9f2e237f794" column="fd_3af9f2e237f794"/>
<result property="fd3af9f2e45a5d78" column="fd_3af9f2e45a5d78"/>
<result property="fd3af9f283a6f288" column="fd_3af9f283a6f288"/>
<result property="fd3af9f2db1e5e16" column="fd_3af9f2db1e5e16"/>
<result property="fd3af9f27ce947ac" column="fd_3af9f27ce947ac"/>
<result property="fd3af9f2ff2c9f42" column="fd_3af9f2ff2c9f42"/>
<result property="fd3af9f25f5e9cc4" column="fd_3af9f25f5e9cc4"/>
<result property="fd3af9f2883941b4" column="fd_3af9f2883941b4"/>
<result property="fd3af9f267a03bd6" column="fd_3af9f267a03bd6"/>
<result property="fd3af9f303037214" column="fd_3af9f303037214"/>
<result property="fd3af9f2d8df88c0" column="fd_3af9f2d8df88c0"/>
<result property="fd3af9f257b1b586" column="fd_3af9f257b1b586"/>
<result property="fd3b0194c7336de0" column="fd_3b0194c7336de0"/>
<result property="fd3b0b716e771e06" column="fd_3b0b716e771e06"/>
<result property="fd3b1354c3add8c2" column="fd_3b1354c3add8c2"/>
<result property="fd3b16e2f436ff98Text" column="fd_3b16e2f436ff98_text"/>
<result property="fd3b16e2f436ff98" column="fd_3b16e2f436ff98"/>
<result property="fd3b178e3ba5e258" column="fd_3b178e3ba5e258"/>
<result property="fd3b35a57b6e9d0a" column="fd_3b35a57b6e9d0a"/>
<result property="fd3b35a5b0b04d54" column="fd_3b35a5b0b04d54"/>
<result property="fd3b35a57aee1428" column="fd_3b35a57aee1428"/>
<result property="fd3b35a5b03100c4" column="fd_3b35a5b03100c4"/>
<result property="fd3b3cab5f343a90" column="fd_3b3cab5f343a90"/>
<result property="fd3b3e41ac916e66" column="fd_3b3e41ac916e66"/>
<result property="fd3b438e61af0a56" column="fd_3b438e61af0a56"/>
<result property="fd3b5cc5e697079a" column="fd_3b5cc5e697079a"/>
<result property="fd3b6495a5ad6e10" column="fd_3b6495a5ad6e10"/>
<id property="fd_id" column="fd_id"/>
<result property="fd_3add9dd7833db8" column="fd_3add9dd7833db8"/>
<result property="fd_3add9de0be85e4" column="fd_3add9de0be85e4"/>
<result property="fd_3add9e1a670144" column="fd_3add9e1a670144"/>
<result property="fd_3adfe8c70d3fd4" column="fd_3adfe8c70d3fd4"/>
<result property="fd_3adfe8c8468e54" column="fd_3adfe8c8468e54"/>
<result property="fd_3adfe95c169c48" column="fd_3adfe95c169c48"/>
<result property="fd_3adfe8c73cb5a4" column="fd_3adfe8c73cb5a4"/>
<result property="fd_3adfe8c81a0e42" column="fd_3adfe8c81a0e42"/>
<result property="fd_3adfe8c79989d4" column="fd_3adfe8c79989d4"/>
<result property="fd_3adfe8c7e4cf7a" column="fd_3adfe8c7e4cf7a"/>
<result property="fd_3adfe8cb96c41e" column="fd_3adfe8cb96c41e"/>
<result property="fd_3adfe8cf632700" column="fd_3adfe8cf632700"/>
<result property="fd_3adfe8cff746bc" column="fd_3adfe8cff746bc"/>
<result property="fd_3adfeb4e8064a8" column="fd_3adfeb4e8064a8"/>
<result property="fd_3adfeb52a4d2e2" column="fd_3adfeb52a4d2e2"/>
<result property="fd_3adfeb52fbe966" column="fd_3adfeb52fbe966"/>
<result property="fd_3adfeb5366dd82" column="fd_3adfeb5366dd82"/>
<result property="fd_3adfeb53c70f72" column="fd_3adfeb53c70f72"/>
<result property="fd_3adfeb5413fb44" column="fd_3adfeb5413fb44"/>
<result property="fd_3adfeb7b624f06" column="fd_3adfeb7b624f06"/>
<result property="fd_3add9ea428879a" column="fd_3add9ea428879a"/>
<result property="fd_3add9eaeed2560" column="fd_3add9eaeed2560"/>
<result property="fd_3adfeb830523b6" column="fd_3adfeb830523b6"/>
<result property="fd_3adfeb8489e6c2" column="fd_3adfeb8489e6c2"/>
<result property="fd_3adfeb7bd97464" column="fd_3adfeb7bd97464"/>
<result property="fd_3add9edfbc6f7e" column="fd_3add9edfbc6f7e"/>
<result property="fd_3add9eed23894a" column="fd_3add9eed23894a"/>
<result property="fd_3adfeb83a704c8" column="fd_3adfeb83a704c8"/>
<result property="fd_3adfeb84175f28" column="fd_3adfeb84175f28"/>
<result property="fd_3aeafa25916e82" column="fd_3aeafa25916e82"/>
<result property="fd_3af9f2fa79ee72" column="fd_3af9f2fa79ee72"/>
<result property="fd_3af9f2ec516c30" column="fd_3af9f2ec516c30"/>
<result property="fd_3af9f2fcde9158" column="fd_3af9f2fcde9158"/>
<result property="fd_3af9f285ee1e38" column="fd_3af9f285ee1e38"/>
<result property="fd_3af9f2dd5d8fb8" column="fd_3af9f2dd5d8fb8"/>
<result property="fd_3af9f2e03295dc" column="fd_3af9f2e03295dc"/>
<result property="fd_3af9f27a3974e6" column="fd_3af9f27a3974e6"/>
<result property="fd_3af9f25b851e94" column="fd_3af9f25b851e94"/>
<result property="fd_3af9f3059e5b9c" column="fd_3af9f3059e5b9c"/>
<result property="fd_3af9f26a3cae94" column="fd_3af9f26a3cae94"/>
<result property="fd_3af9f263e094c6" column="fd_3af9f263e094c6"/>
<result property="fd_3af9f2617e530a" column="fd_3af9f2617e530a"/>
<result property="fd_3af9f281651734" column="fd_3af9f281651734"/>
<result property="fd_3af9f2e9208e4e" column="fd_3af9f2e9208e4e"/>
<result property="fd_3af9f2e6dfb3f4" column="fd_3af9f2e6dfb3f4"/>
<result property="fd_3af9f2f8290f24" column="fd_3af9f2f8290f24"/>
<result property="fd_3af9f2e237f794" column="fd_3af9f2e237f794"/>
<result property="fd_3af9f2e45a5d78" column="fd_3af9f2e45a5d78"/>
<result property="fd_3af9f283a6f288" column="fd_3af9f283a6f288"/>
<result property="fd_3af9f2db1e5e16" column="fd_3af9f2db1e5e16"/>
<result property="fd_3af9f27ce947ac" column="fd_3af9f27ce947ac"/>
<result property="fd_3af9f2ff2c9f42" column="fd_3af9f2ff2c9f42"/>
<result property="fd_3af9f25f5e9cc4" column="fd_3af9f25f5e9cc4"/>
<result property="fd_3af9f2883941b4" column="fd_3af9f2883941b4"/>
<result property="fd_3af9f267a03bd6" column="fd_3af9f267a03bd6"/>
<result property="fd_3af9f303037214" column="fd_3af9f303037214"/>
<result property="fd_3af9f2d8df88c0" column="fd_3af9f2d8df88c0"/>
<result property="fd_3af9f257b1b586" column="fd_3af9f257b1b586"/>
<result property="fd_3b0194c7336de0" column="fd_3b0194c7336de0"/>
<result property="fd_3b0b716e771e06" column="fd_3b0b716e771e06"/>
<result property="fd_3b1354c3add8c2" column="fd_3b1354c3add8c2"/>
<result property="fd_3b16e2f436ff98_text" column="fd_3b16e2f436ff98_text"/>
<result property="fd_3b16e2f436ff98" column="fd_3b16e2f436ff98"/>
<result property="fd_3b178e3ba5e258" column="fd_3b178e3ba5e258"/>
<result property="fd_3b35a57b6e9d0a" column="fd_3b35a57b6e9d0a"/>
<result property="fd_3b35a5b0b04d54" column="fd_3b35a5b0b04d54"/>
<result property="fd_3b35a57aee1428" column="fd_3b35a57aee1428"/>
<result property="fd_3b35a5b03100c4" column="fd_3b35a5b03100c4"/>
<result property="fd_3b3cab5f343a90" column="fd_3b3cab5f343a90"/>
<result property="fd_3b3e41ac916e66" column="fd_3b3e41ac916e66"/>
<result property="fd_3b438e61af0a56" column="fd_3b438e61af0a56"/>
<result property="fd_3b5cc5e697079a" column="fd_3b5cc5e697079a"/>
<result property="fd_3b6495a5ad6e10" column="fd_3b6495a5ad6e10"/>
<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,
a.fd_3b1480cd9dcb60 as settleType,
a.fd_3b15f64dd59a28 as isBpo,
a.fd_3b13479cedebd4 as socialType,
a.fd_3a2b38c61ef9aa as deptName,
a.fd_3a37fe508071fe as deptNo
from ekp_24a8e6a7fc143bb8c48a a
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,
round(sum(ifnull(fd_3af9f285ee1e38,0)),2) as ygPersonSum,
round(sum(ifnull(fd_3af9f3059e5b9c,0)),2) as sjSum,
round(sum(ifnull(fd_3adfeb4e8064a8,0)),2) as ygDwSum,
round(sum(ifnull(fd_3af9f2e9208e4e,0)),2) as sjDwSum,
round(sum(ifnull(fd_3af9f303037214,0)),2) as sjPersonSum,
round(sum(ifnull(fd_3adfeb7b624f06,0)),2) as ys,
round(sum(ifnull(fd_3b35a57aee1428,0)),2) as personYs,
round(sum(ifnull(fd_3b35a57b6e9d0a,0)),2) as dwYs,
round(sum(ifnull(fd_3adfeb7bd97464,0)),2) as yzc,
round(sum(ifnull(fd_3b35a5b03100c4,0)),2) as personYzc,
round(sum(ifnull(fd_3b35a5b0b04d54,0)),2) as dwYzc,
from ekp_9264ea0160848a681328
where fd_3adfe8c7e4cf7a = #{card} and DATE_FORMAT(fd_3adfe8cb96c41e,'%Y-%m') = #{month}
</select>
</mapper>
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @ 10d6ec94
......@@ -50,7 +50,6 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.util.EkpDaprUtils;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.InsuranceDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpPushSocialParam;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpSocialViewVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentBySalaryVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentVo;
......@@ -2931,7 +2930,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
long count = baseMapper.getTPaymentInfoSumPushCount(null);
if (count > 0) {
List<TPaymentInfoPushVo> unPushs;
int i = (int) Math.ceil((double) count / CommonConstants.TEN_THOUSAND_INT);
int i = (int) Math.ceil((double) count / CommonConstants.FIVES_INT);
Map<String, TSettleDomainSelectVo> mapSelectVo = this.getSelectVoMap();
for (int j = 0; j < i; j++) {
unPushs = baseMapper.getTPaymentInfoSumPushList(null);
......@@ -3134,12 +3133,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
long count = baseMapper.getTPaymentInfoSumPushCount(searchVo);
if (count > 0) {
List<TPaymentInfoPushVo> unPushInfo;
int i = (int) Math.ceil((double) count / CommonConstants.TEN_THOUSAND_INT);
int i = (int) Math.ceil((double) count / CommonConstants.FIVES_INT);
for (int j = 0; j < i; j++) {
unPushInfo = baseMapper.getTPaymentInfoSumPushList(searchVo);
if (Common.isNotNull(unPushInfo)) {
//推送数据封装并推送
this.asynchronousEkpPaymentSocial(unPushInfo, mapSelectVo);
doJointSocialTask.asynchronousEkpPaymentSocial(unPushInfo, mapSelectVo);
}
}
......@@ -4009,331 +4008,4 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
}
/**
* @Description: 实缴数据推送
* @Author: huyc
* @Date: 2022-11-17
* @return: void
**/
public void asynchronousEkpPaymentSocial(List<TPaymentInfoPushVo> unPushInfo, Map<String, TSettleDomainSelectVo> mapSelectVo) {
log.info("推送社保实缴费用到EKP-线程开始");
TSettleDomain settleDomain;
EkpPushSocialParam socialParam;
TPaymentSocialPush a;
List<EkpPushSocialParam> paramList = new ArrayList<>();
List<EkpPushSocialParam> insertList = new ArrayList<>();
Map<String,String> idMap = new HashMap<>();
for (TPaymentInfoPushVo library : unPushInfo) {
try {
//获取项目信息
if (Common.isNotNull(mapSelectVo)) {
settleDomain = mapSelectVo.get(library.getSettleDomainCode());
} else {
settleDomain = null;
}
socialParam = new EkpPushSocialParam();
//员工姓名
socialParam.setFd_3adfe8c79989d4(library.getEmpName());
//员工身份证
socialParam.setFd_3adfe8c7e4cf7a(library.getEmpIdcard());
//单位养老金额
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_3adfeb4e8064a8(CommonConstants.EMPTY_STRING);
//个人社保合计
socialParam.setFd_3adfeb52a4d2e2(CommonConstants.EMPTY_STRING);
//预估个人大病救助
socialParam.setFd_3af9ebbf3e8be2(CommonConstants.EMPTY_STRING);
//预估个人失业
socialParam.setFd_3af9ebbe29ce1c(CommonConstants.EMPTY_STRING);
//结算状态
// hgw2022-9-30 12:03:05根据倩倩的需求，改为默认空，未结算
socialParam.setFd_3add9ea428879a(CommonConstants.SALARY_UNFLAG);
//社保缴纳月份
if (Common.isNotNull(library.getSocialPayMonth())) {
socialParam.setFd_3adfe8cf632700(dateStringInsert(library.getSocialPayMonth()));
} else {
socialParam.setFd_3adfe8cf632700(CommonConstants.EMPTY_STRING);
}
//社保生成月份
if (Common.isNotNull(library.getSocialCreateMonth())) {
socialParam.setFd_3adfe8cb96c41e(dateStringInsert(library.getSocialCreateMonth()));
} else {
socialParam.setFd_3adfe8cb96c41e(CommonConstants.EMPTY_STRING);
}
//订单类型
socialParam.setFd_3add9dd7833db8(SocialConstants.DIFF_TYPE_THR);
//是否有预估
if (Common.isNotNull(settleDomain) && Common.isNotNull(settleDomain.getSocialType()) &&
CommonConstants.ONE_STRING.equals(settleDomain.getSocialType())) {
socialParam.setFd_3add9de0be85e4(CommonConstants.IS_TRUE);
} else {
socialParam.setFd_3add9de0be85e4(CommonConstants.IS_FALSE);
}
//与工资合并结算
socialParam.setFd_3add9e1a670144(CommonConstants.IS_FALSE);
//项目编码
socialParam.setFd_3adfe8c70d3fd4(library.getSettleDomainCode());
//项目名称
socialParam.setFd_3adfe8c8468e54(library.getSettleDomainName());
//单号
socialParam.setFd_3adfe95c169c48(CommonConstants.EMPTY_STRING);
//客户编码
if (Common.isNotNull(settleDomain) && Common.isNotNull(settleDomain.getCustomerNo())) {
socialParam.setFd_3adfe8c73cb5a4(settleDomain.getCustomerNo());
} else {
socialParam.setFd_3adfe8c73cb5a4(CommonConstants.EMPTY_STRING);
}
//是否为BPO业务
socialParam.setFd_3b178dfcf9e3e6(library.getBpoFlag());
//客户名称
if (Common.isNotNull(library.getUnitName())) {
socialParam.setFd_3adfe8c81a0e42(library.getUnitName());
} else {
socialParam.setFd_3adfe8c81a0e42(CommonConstants.EMPTY_STRING);
}
//社保户
if (Common.isNotNull(library.getSocialHousehold())) {
socialParam.setFd_3aeafa25916e82(library.getSocialHousehold());
} else {
socialParam.setFd_3aeafa25916e82(CommonConstants.EMPTY_STRING);
}
//结算月份
socialParam.setFd_3adfe8cff746bc(CommonConstants.EMPTY_STRING);
//单位差异
socialParam.setFd_3adfeb53c70f72(CommonConstants.EMPTY_STRING);
//个人差异
socialParam.setFd_3adfeb5413fb44(CommonConstants.EMPTY_STRING);
//应收
socialParam.setFd_3adfeb7b624f06(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);
//实缴单位生育
if (Common.isNotNull(library.getUnitBirthMoney())) {
socialParam.setFd_3af9ee3afb34c2(library.getUnitBirthMoney().toString());
} else {
socialParam.setFd_3af9ee3afb34c2(CommonConstants.EMPTY_STRING);
}
//付款单号
socialParam.setFd_3adfeb84175f28(CommonConstants.EMPTY_STRING);
//实缴个人合计
if (Common.isNotNull(library.getSocialSecurityPersonalSum())) {
socialParam.setFd_3af9ee3cb6d4fa(library.getSocialSecurityPersonalSum().toString());
} else {
socialParam.setFd_3af9ee3cb6d4fa(CommonConstants.EMPTY_STRING);
}
//预估合计
socialParam.setFd_3af9ed7e813b86(CommonConstants.EMPTY_STRING);
//实缴单位合计
if (Common.isNotNull(library.getUnitSocialSum())) {
socialParam.setFd_3af9ee3c0bf286(library.getUnitSocialSum().toString());
} else {
socialParam.setFd_3af9ee3c0bf286(CommonConstants.EMPTY_STRING);
}
//实缴个人补缴利息
if (Common.isNotNull(library.getPersonalAccrual())) {
socialParam.setFd_3af9ee3d634946(library.getPersonalAccrual().toString());
} else {
socialParam.setFd_3af9ee3d634946(CommonConstants.EMPTY_STRING);
}
//实缴单位医疗
if (Common.isNotNull(library.getUnitMedicalMoney())) {
socialParam.setFd_3af9ee39dea6a8(library.getUnitMedicalMoney().toString());
} else {
socialParam.setFd_3af9ee39dea6a8(CommonConstants.EMPTY_STRING);
}
//预估个人补缴利息
socialParam.setFd_3af9ebbecc4aa8(CommonConstants.EMPTY_STRING);
//预估单位补缴利息
socialParam.setFd_3af9eba7c3da5e(CommonConstants.EMPTY_STRING);
//实缴单位养老
if (Common.isNotNull(library.getUnitPensionMoney())) {
socialParam.setFd_3af9ee3938170a(library.getUnitPensionMoney().toString());
} else {
socialParam.setFd_3af9ee3938170a(CommonConstants.EMPTY_STRING);
}
//实缴个人失业
if (Common.isNotNull(library.getPersonalUnemploymentMoney())) {
socialParam.setFd_3af9ee3db44d96(library.getPersonalUnemploymentMoney().toString());
} else {
socialParam.setFd_3af9ee3db44d96(CommonConstants.EMPTY_STRING);
}
//实缴单位补缴利息
if (Common.isNotNull(library.getCompanyAccrual())) {
socialParam.setFd_3af9ee3b5ddae8(library.getCompanyAccrual().toString());
} else {
socialParam.setFd_3af9ee3b5ddae8(CommonConstants.EMPTY_STRING);
}
//实缴单位大病救助
if (Common.isNotNull(library.getUnitBigmailmentMoney())) {
socialParam.setFd_3af9ee3ba76f54(library.getUnitBigmailmentMoney().toString());
} else {
socialParam.setFd_3af9ee3ba76f54(CommonConstants.EMPTY_STRING);
}
//实缴单位工伤
if (Common.isNotNull(library.getUnitInjuryMoney())) {
socialParam.setFd_3af9ee3aa9c84a(library.getUnitInjuryMoney().toString());
} else {
socialParam.setFd_3af9ee3aa9c84a(CommonConstants.EMPTY_STRING);
}
//实缴合计
if (Common.isNotNull(library.getSocialSum())) {
socialParam.setFd_3af9ee3c6bfc74(library.getSocialSum().toString());
} else {
socialParam.setFd_3af9ee3c6bfc74(CommonConstants.EMPTY_STRING);
}
//实缴个人医疗
if (Common.isNotNull(library.getPersonalMedicalMoney())) {
socialParam.setFd_3af9ee3e066d48(library.getPersonalMedicalMoney().toString());
} else {
socialParam.setFd_3af9ee3e066d48(CommonConstants.EMPTY_STRING);
}
//实缴单位失业
if (Common.isNotNull(library.getUnitUnemploymentMoney())) {
socialParam.setFd_3af9ee3a46b7e6(library.getUnitUnemploymentMoney().toString());
} else {
socialParam.setFd_3af9ee3a46b7e6(CommonConstants.EMPTY_STRING);
}
//实缴个人养老
if (Common.isNotNull(library.getPersonalPensionMoney())) {
socialParam.setFd_3af9ee3e513962(library.getPersonalPensionMoney().toString());
} else {
socialParam.setFd_3af9ee3e513962(CommonConstants.EMPTY_STRING);
}
//实缴个人大病救助
if (Common.isNotNull(library.getPersonalBigmailmentMoney())) {
socialParam.setFd_3af9ee3d0ba3b6(library.getPersonalBigmailmentMoney().toString());
} else {
socialParam.setFd_3af9ee3d0ba3b6(CommonConstants.EMPTY_STRING);
}
//创建人姓名
if (Common.isNotNull(library.getCreateName())) {
socialParam.setFd_3b438e33f37378(library.getCreateName());
} else {
socialParam.setFd_3b438e33f37378(CommonConstants.EMPTY_STRING);
}
// 缴纳地
if (Common.isNotNull(library.getSocialPayAddr())) {
socialParam.setFd_3b5cc58d1a70fe(library.getSocialPayAddr());
} else {
socialParam.setFd_3b5cc58d1a70fe(CommonConstants.EMPTY_STRING);
}
//我司到款单位
socialParam.setFd_3b01953871b8be(CommonConstants.EMPTY_STRING);
//社保id
socialParam.setFd_3b0afbe1f94a08(library.getId());
// 薪酬申请编号
socialParam.setFd_3b3cab77923f44(CommonConstants.EMPTY_STRING);
insertList.add(socialParam);
ekpDaprUtil.pushSocialInfoToEkp(insertList);
String body = "";
if (Common.isEmpty(body) || body.length() != 32) {
paramList.add(socialParam);
idMap.put(library.getId(), library.getIds());
}
if (Common.isNotNull(body) && body.length() == 32) {
baseMapper.updateBySocialPaymentList(library.getIds());
a = new TPaymentSocialPush();
a.setId(library.getId());
a.setPaymentIds(library.getIds());
socialPushMapper.insert(a);
} else {
TSendEkpError error = new TSendEkpError();
error.setCreateTime(new Date());
error.setCreateDay(DateUtil.getThisDay());
error.setType(CommonConstants.THREE_STRING);
error.setCreateUserName("社保实缴费用推送");
error.setLinkId(library.getId());
error.setTitle(body);
error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error);
}
} catch (Exception e) {
TSendEkpError error = new TSendEkpError();
error.setCreateTime(new Date());
error.setCreateDay(DateUtil.getThisDay());
error.setType(CommonConstants.THREE_STRING);
error.setCreateUserName("社保实缴费用推送");
error.setLinkId(library.getId());
error.setTitle(e.getMessage());
error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error);
log.error("推送社保实缴费用到EKP错误", e);
}
}
//推送失败的数据重新推送
if (!paramList.isEmpty()) {
for (EkpPushSocialParam s:paramList) {
try {
String body = "";
if (Common.isNotNull(body) && body.length() == 32) {
baseMapper.updateBySocialPaymentList(idMap.get(s.getFd_3b0afbe1f94a08()));
a = new TPaymentSocialPush();
a.setId(s.getFd_3b0afbe1f94a08());
a.setPaymentIds(idMap.get(s.getFd_3b0afbe1f94a08()));
socialPushMapper.insert(a);
} else {
TSendEkpError error = new TSendEkpError();
error.setCreateTime(new Date());
error.setCreateDay(DateUtil.getThisDay());
error.setType(CommonConstants.THREE_STRING);
error.setCreateUserName("社保实缴费用推送");
error.setLinkId(s.getFd_3b0afbe1f94a08());
error.setTitle(body);
error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error);
}
}catch (Exception e) {
TSendEkpError error = new TSendEkpError();
error.setCreateTime(new Date());
error.setCreateDay(DateUtil.getThisDay());
error.setType(CommonConstants.THREE_STRING);
error.setCreateUserName("社保实缴费用推送");
error.setLinkId(s.getFd_3b0afbe1f94a08());
error.setTitle(e.getMessage());
error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error);
log.error("推送社保实缴费用到EKP错误", e);
}
}
}
idMap.clear();
log.info("推送社保实缴费用到EKP结束");
}
/**
* @Description: 推送ekp时更改日期格式
* @Author: huyc
**/
public String dateStringInsert(String month) {
StringBuilder sb = new StringBuilder(month);
sb.insert(4, "-");
return sb.toString();
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentSocialPushServiceImpl.java 0 → 100644
View file @ 10d6ec94
/*
* 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.yifu.social.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentSocialPush;
import com.yifu.cloud.plus.v1.yifu.social.mapper.TPaymentSocialPushMapper;
import com.yifu.cloud.plus.v1.yifu.social.service.TPaymentSocialPushService;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Service;
/**
* 收入明细表
*
* @author hgw
* @date 2022-08-30 17:34:58
*/
@Log4j2
@Service
public class TPaymentSocialPushServiceImpl extends ServiceImpl<TPaymentSocialPushMapper, TPaymentSocialPush> implements TPaymentSocialPushService {
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/util/DoJointSocialTask.java
View file @ 10d6ec94
package com.yifu.cloud.plus.v1.yifu.social.util;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
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.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.util.RedisUtil;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.EkpDaprUtils;
import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpFundUtil;
import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpIncomeUtil;
import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSocialUtil;
......@@ -18,7 +21,7 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.*;
import com.yifu.cloud.plus.v1.yifu.social.mapper.TForecastLibraryMapper;
import com.yifu.cloud.plus.v1.yifu.social.mapper.TIncomeMapper;
import com.yifu.cloud.plus.v1.yifu.social.mapper.TPaymentInfoMapper;
import com.yifu.cloud.plus.v1.yifu.social.mapper.TPaymentSocialPushMapper;
import com.yifu.cloud.plus.v1.yifu.social.service.TPaymentSocialPushService;
import com.yifu.cloud.plus.v1.yifu.social.service.TSendEkpErrorService;
import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoPushVo;
import lombok.extern.slf4j.Slf4j;
......@@ -60,11 +63,14 @@ public class DoJointSocialTask {
private TForecastLibraryMapper forecastLibraryMapper;
@Autowired
private TPaymentSocialPushMapper socialPushMapper;
private TPaymentSocialPushService socialPushService;
@Autowired
private RedisUtil redisUtil;
@Autowired
private EkpDaprUtils ekpDaprUtil;
/**
* @Description: 合同-批量更换负责人
* @Author: huyc
......@@ -431,11 +437,10 @@ public class DoJointSocialTask {
log.info("推送社保实缴费用到EKP-线程开始");
TSettleDomain settleDomain;
EkpPushSocialParam socialParam;
TPaymentSocialPush a;
List<EkpPushSocialParam> paramList = new ArrayList<>();
Map<String,String> idMap = new HashMap<>();
for (TPaymentInfoPushVo library : unPushInfo) {
try {
List<EkpPushSocialParam> insertList = new ArrayList<>();
try {
for (TPaymentInfoPushVo library : unPushInfo) {
//获取项目信息
if (Common.isNotNull(mapSelectVo)) {
settleDomain = mapSelectVo.get(library.getSettleDomainCode());
......@@ -532,7 +537,7 @@ public class DoJointSocialTask {
//应收
socialParam.setFd_3adfeb7b624f06(CommonConstants.EMPTY_STRING);
//收款状态
socialParam.setFd_3add9eaeed2560(CommonConstants.EMPTY_STRING);
socialParam.setFd_3add9eaeed2560("未收");
//结算单号
socialParam.setFd_3adfeb830523b6(CommonConstants.EMPTY_STRING);
//收款单号
......@@ -542,7 +547,7 @@ public class DoJointSocialTask {
//支出结算状态
socialParam.setFd_3add9edfbc6f7e(CommonConstants.EMPTY_STRING);
//付款状态
socialParam.setFd_3add9eed23894a(CommonConstants.EMPTY_STRING);
socialParam.setFd_3add9eed23894a("未付");
//支出缴纳单号
socialParam.setFd_3adfeb83a704c8(CommonConstants.EMPTY_STRING);
//实缴单位生育
......@@ -661,79 +666,41 @@ public class DoJointSocialTask {
socialParam.setFd_3b0afbe1f94a08(library.getId());
// 薪酬申请编号
socialParam.setFd_3b3cab77923f44(CommonConstants.EMPTY_STRING);
String body = ekpSocialUtil.sendToEKP(socialParam);
if (Common.isEmpty(body) || body.length() != 32) {
paramList.add(socialParam);
idMap.put(library.getId(), library.getIds());
}
if (Common.isNotNull(body) && body.length() == 32) {
paymentInfoMapper.updateBySocialPaymentList(library.getIds());
a = new TPaymentSocialPush();
a.setId(library.getId());
a.setPaymentIds(library.getIds());
socialPushMapper.insert(a);
} else {
TSendEkpError error = new TSendEkpError();
error.setCreateTime(new Date());
error.setCreateDay(DateUtil.getThisDay());
error.setType(CommonConstants.THREE_STRING);
error.setCreateUserName("社保实缴费用推送");
error.setLinkId(library.getId());
error.setTitle(body);
error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error);
}
} catch (Exception e) {
socialParam.setSocialIds(library.getIds());
insertList.add(socialParam);
}
R<EkpSocialPushInfoVo> info = ekpDaprUtil.pushSocialInfoToEkp(insertList);
if (Common.isNotNull(info) && Common.isNotNull(info.getData())) {
EkpSocialPushInfoVo vo = info.getData();
List<String> idList = vo.getPaymentIds();
for (String ids : idList) {
paymentInfoMapper.updateBySocialPaymentList(ids);
}
List<TPaymentSocialPush> list = vo.getUnPushInfo();
socialPushService.saveBatch(list);
} else {
TSendEkpError error = new TSendEkpError();
error.setCreateTime(new Date());
error.setCreateDay(DateUtil.getThisDay());
error.setType(CommonConstants.THREE_STRING);
error.setCreateUserName("社保实缴费用推送");
error.setLinkId(library.getId());
error.setTitle(e.getMessage());
error.setLinkId(unPushInfo.get(0).getId());
error.setTitle("社保明细批量保存失败");
error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error);
log.error("推送社保实缴费用到EKP错误", e);
}
}
//推送失败的数据重新推送
if (!paramList.isEmpty()) {
for (EkpPushSocialParam s:paramList) {
try {
String body = ekpSocialUtil.sendToEKP(s);
if (Common.isNotNull(body) && body.length() == 32) {
paymentInfoMapper.updateBySocialPaymentList(idMap.get(s.getFd_3b0afbe1f94a08()));
a = new TPaymentSocialPush();
a.setId(s.getFd_3b0afbe1f94a08());
a.setPaymentIds(idMap.get(s.getFd_3b0afbe1f94a08()));
socialPushMapper.insert(a);
} else {
TSendEkpError error = new TSendEkpError();
error.setCreateTime(new Date());
error.setCreateDay(DateUtil.getThisDay());
error.setType(CommonConstants.THREE_STRING);
error.setCreateUserName("社保实缴费用推送");
error.setLinkId(s.getFd_3b0afbe1f94a08());
error.setTitle(body);
error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error);
}
}catch (Exception e) {
TSendEkpError error = new TSendEkpError();
error.setCreateTime(new Date());
error.setCreateDay(DateUtil.getThisDay());
error.setType(CommonConstants.THREE_STRING);
error.setCreateUserName("社保实缴费用推送");
error.setLinkId(s.getFd_3b0afbe1f94a08());
error.setTitle(e.getMessage());
error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error);
log.error("推送社保实缴费用到EKP错误", e);
}
}
} catch (Exception e) {
TSendEkpError error = new TSendEkpError();
error.setCreateTime(new Date());
error.setCreateDay(DateUtil.getThisDay());
error.setType(CommonConstants.THREE_STRING);
error.setCreateUserName("社保实缴费用推送");
error.setLinkId(unPushInfo.get(0).getId());
error.setTitle(e.getMessage());
error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error);
log.error("推送社保实缴费用到EKP错误", e);
}
idMap.clear();
log.info("推送社保实缴费用到EKP结束");
}
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @ 10d6ec94
......@@ -2162,7 +2162,7 @@
<include refid="tPaymentInfo_export_push_where"/>
</where>
GROUP BY a.EMP_IDCARD,a.SOCIAL_PAY_MONTH,a.SOCIAL_CREATE_MONTH,a.SOCIAL_PAY_ADDR
limit 0,10000
limit 0,5000
</select>
<!--tPaymentInfo合并查询-->
......
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