Skip to content

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

明细接口改造

parent 74f9d016
Show whitespace changes
Inline Side-by-side
Showing with 75 additions and 63 deletions
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpFundInfoServiceImpl.java
View file @ 13a020a6
......@@ -8,12 +8,14 @@ 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.BigDecimalUtils;
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.ekp.vo.EkpPushFundParam;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
......@@ -86,36 +88,36 @@ public class EkpFundInfoServiceImpl extends ServiceImpl<EkpFundInfoMapper, EkpFu
socialSumInfo = baseMapper.getCostSumInfo(fundInfo.getFd_3adfe8c7e4cf7a(), fundInfo.getFd_3adfe8cb96c41e());
//预估个人合计
Double ygPersonSum = Common.isEmpty(socialSumInfo) ? 0 : socialSumInfo.getYgPersonSum();
BigDecimal ygPersonSum = Common.isEmpty(socialSumInfo) ? BigDecimal.ZERO : BigDecimal.valueOf(socialSumInfo.getYgPersonSum());
//预估单位合计
Double ygDwSum = Common.isEmpty(socialSumInfo) ? 0 : socialSumInfo.getYgDwSum();
BigDecimal ygDwSum = Common.isEmpty(socialSumInfo) ? BigDecimal.ZERO : BigDecimal.valueOf(socialSumInfo.getYgDwSum());
//实缴单位合计
Double sjDwSum = Common.isEmpty(socialSumInfo) ? 0 : socialSumInfo.getSjDwSum();
BigDecimal sjDwSum = Common.isEmpty(socialSumInfo) ? BigDecimal.ZERO : BigDecimal.valueOf(socialSumInfo.getSjDwSum());
//实缴个人合计
Double sjPersonSum = Common.isEmpty(socialSumInfo) ? 0 : socialSumInfo.getSjPersonSum();
BigDecimal sjPersonSum = Common.isEmpty(socialSumInfo) ? BigDecimal.ZERO : BigDecimal.valueOf(socialSumInfo.getSjPersonSum());
//应收
Double ys = Common.isEmpty(socialSumInfo) ? 0 : socialSumInfo.getYs();
BigDecimal ys = Common.isEmpty(socialSumInfo) ? BigDecimal.ZERO : BigDecimal.valueOf(socialSumInfo.getYs());
//个人应收
Double personYs = Common.isEmpty(socialSumInfo) ? 0 : socialSumInfo.getPersonYs();
BigDecimal personYs = Common.isEmpty(socialSumInfo) ? BigDecimal.ZERO : BigDecimal.valueOf(socialSumInfo.getPersonYs());
//单位应收
Double dwYs = Common.isEmpty(socialSumInfo) ? 0 : socialSumInfo.getDwYs();
BigDecimal dwYs = Common.isEmpty(socialSumInfo) ? BigDecimal.ZERO : BigDecimal.valueOf(socialSumInfo.getDwYs());
//预估个人部分
Double yggr = Common.isEmpty(fundInfo.getFd_3adfeb52a4d2e2()) ? 0 : fundInfo.getFd_3adfeb52a4d2e2();
BigDecimal yggr = Common.isEmpty(fundInfo.getFd_3adfeb52a4d2e2()) ? BigDecimal.ZERO : BigDecimal.valueOf(fundInfo.getFd_3adfeb52a4d2e2());
//预估单位部分
Double ygdw = Common.isEmpty(fundInfo.getFd_3adfeb4e8064a8()) ? 0 : fundInfo.getFd_3adfeb4e8064a8();
BigDecimal ygdw = Common.isEmpty(fundInfo.getFd_3adfeb4e8064a8()) ? BigDecimal.ZERO : BigDecimal.valueOf(fundInfo.getFd_3adfeb4e8064a8());
//实缴单位部分
Double sjdw = Common.isEmpty(fundInfo.getFd_3adfeb52fbe966()) ? 0 : fundInfo.getFd_3adfeb52fbe966();
BigDecimal sjdw = Common.isEmpty(fundInfo.getFd_3adfeb52fbe966()) ? BigDecimal.ZERO : BigDecimal.valueOf(fundInfo.getFd_3adfeb52fbe966());
//实缴个人部分
Double sjgr = Common.isEmpty(fundInfo.getFd_3adfeb5366dd82()) ? 0 : fundInfo.getFd_3adfeb5366dd82();
BigDecimal sjgr = Common.isEmpty(fundInfo.getFd_3adfeb5366dd82()) ? BigDecimal.ZERO : BigDecimal.valueOf(fundInfo.getFd_3adfeb5366dd82());
//单位差异
if ("是".equals(fundInfo.getFd_3add9de0be85e4()) && "实缴".equals(fundInfo.getFd_3add9dd7833db8())) {
//单位差异
//$列表.求总和$($公积金订单明细*总数(单位代缴)$)+$单位代缴$) -($列表.求总和$($公积金订单明细*总数(预估单位代缴)$) + $预估单位代缴$)
fundInfo.setFd_3adfeb53c70f72(Double.sum(Double.sum(sjDwSum, sjdw), -Double.sum(ygDwSum,yggr)));
fundInfo.setFd_3adfeb53c70f72(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(sjDwSum,sjdw),BigDecimalUtils.safeAdd(ygDwSum,yggr)).doubleValue());
//个人差异
//$列表.求总和$($公积金订单明细*总数(个人代缴)$)+ $个人代缴$ - $列表.求总和$($公积金订单明细*总数(预估个人代缴)$)
fundInfo.setFd_3adfeb5413fb44(Double.sum(Double.sum(sjPersonSum, sjgr), -ygPersonSum));
fundInfo.setFd_3adfeb5413fb44(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(sjPersonSum,sjgr),ygPersonSum).doubleValue());
}
//Fd_3adfeb7b624f06应收；Fd_3b35a65138a7fc个人应收；fd_3b35a6518b73b2单位应收
......@@ -130,13 +132,13 @@ public class EkpFundInfoServiceImpl extends ServiceImpl<EkpFundInfoMapper, EkpFu
if ("实缴".equals(deptInfo.getSettleType())) {
if ("预估".equals(fundInfo.getFd_3add9dd7833db8())) {
//$列表.求总和$($公积金订单明细*总数(预估单位代缴)$) + $列表.求总和$($公积金订单明细*总数(预估个人代缴)$) + $预估个人代缴$ + $预估单位代缴$ - $列表.求总和$($公积金订单明细*总数(应收)$)
fundInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(ygDwSum, ygPersonSum),Double.sum(yggr,ygdw) -ys));
fundInfo.setFd_3adfeb7b624f06(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(ygDwSum,ygPersonSum,yggr,ygdw),ys).doubleValue());
//$列表.求总和$($公积金订单明细*总数(预估个人代缴)$) + $预估个人代缴$ - $列表.求总和$($公积金订单明细*总数(个人应收)$)
fundInfo.setFd_3b35a65138a7fc(Double.sum(Double.sum(ygPersonSum, yggr), -personYs));
fundInfo.setFd_3b35a65138a7fc(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(ygPersonSum, yggr),personYs).doubleValue());
//$列表.求总和$($公积金订单明细*总数(预估单位代缴)$) + $预估单位代缴$ - $列表.求总和$($公积金订单明细*总数(单位应收)$)
fundInfo.setFd_3b35a6518b73b2(Double.sum(Double.sum(ygDwSum, ygdw), -dwYs));
fundInfo.setFd_3b35a6518b73b2(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(ygDwSum, ygdw),dwYs).doubleValue());
} else {
if (Double.sum(ygDwSum, ygPersonSum) > 0) {
if (BigDecimalUtils.safeAdd(ygDwSum, ygPersonSum).doubleValue() > 0) {
//应收
fundInfo.setFd_3adfeb7b624f06(CommonConstants.ZERO_INTEGER.doubleValue());
//个人应收
......@@ -145,28 +147,28 @@ public class EkpFundInfoServiceImpl extends ServiceImpl<EkpFundInfoMapper, EkpFu
fundInfo.setFd_3b35a6518b73b2(CommonConstants.ZERO_INTEGER.doubleValue());
} else {
// $列表.求总和$($公积金订单明细*总数(单位代缴)$) +$列表.求总和$($公积金订单明细*总数(个人代缴)$) + $单位代缴$ + $个人代缴$ - $列表.求总和$($公积金订单明细*总数(应收)$)
fundInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(sjDwSum, sjPersonSum),Double.sum(sjdw,sjgr) -ys));
fundInfo.setFd_3adfeb7b624f06(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(sjDwSum,sjPersonSum,sjdw,sjgr),ys).doubleValue());
//$列表.求总和$($公积金订单明细*总数(个人代缴)$) + $个人代缴$ - $列表.求总和$($公积金订单明细*总数(个人应收)$)
fundInfo.setFd_3b35a65138a7fc(Double.sum(Double.sum(sjPersonSum, sjgr), -personYs));
fundInfo.setFd_3b35a65138a7fc(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(sjPersonSum,sjgr),personYs).doubleValue());
//$列表.求总和$($公积金订单明细*总数(单位代缴)$) + $单位代缴$ - $列表.求总和$($公积金订单明细*总数(单位应收)$)
fundInfo.setFd_3b35a6518b73b2(Double.sum(Double.sum(sjDwSum, sjdw), -dwYs));
fundInfo.setFd_3b35a6518b73b2(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(sjDwSum,sjdw),dwYs).doubleValue());
}
}
} else {
if ("预估".equals(fundInfo.getFd_3add9dd7833db8())) {
// $列表.求总和$($公积金订单明细*总数(预估个人代缴)$) + $列表.求总和$($公积金订单明细*总数(预估单位代缴)$) + $预估个人代缴$ + $预估单位代缴$ -$列表.求总和$($公积金订单明细*总数(应收)$)
fundInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(ygPersonSum, ygDwSum),Double.sum(yggr,ygdw) -ys));
fundInfo.setFd_3adfeb7b624f06(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(ygPersonSum,ygDwSum,yggr,ygdw),ys).doubleValue());
//$列表.求总和$($公积金订单明细*总数(预估个人代缴)$) + $预估个人代缴$ -$列表.求总和$($公积金订单明细*总数(个人应收)$)
fundInfo.setFd_3b35a65138a7fc(Double.sum(Double.sum(ygPersonSum, yggr), -personYs));
fundInfo.setFd_3b35a65138a7fc(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(ygPersonSum,yggr),personYs).doubleValue());
// $列表.求总和$($公积金订单明细*总数(预估单位代缴)$) + $预估单位代缴$ -$列表.求总和$($公积金订单明细*总数(单位应收)$)
fundInfo.setFd_3b35a6518b73b2(Double.sum(Double.sum(ygDwSum, ygdw), -dwYs));
fundInfo.setFd_3b35a6518b73b2(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(ygDwSum,ygdw),dwYs).doubleValue());
} else {
//$列表.求总和$($公积金订单明细*总数(单位代缴)$) +$列表.求总和$($公积金订单明细*总数(个人代缴)$) + $单位代缴$ + $个人代缴$ - $列表.求总和$($公积金订单明细*总数(应收)$)
fundInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(sjDwSum, sjPersonSum),Double.sum(sjdw,sjgr) -ys));
fundInfo.setFd_3adfeb7b624f06(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(sjDwSum,sjPersonSum,sjdw,sjgr),ys).doubleValue());
//$列表.求总和$($公积金订单明细*总数(个人代缴)$) + $个人代缴$ - $列表.求总和$($公积金订单明细*总数(个人应收)$)
fundInfo.setFd_3b35a65138a7fc(Double.sum(Double.sum(sjPersonSum, sjgr), -personYs));
fundInfo.setFd_3b35a65138a7fc(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(sjPersonSum,sjgr),personYs).doubleValue());
//$列表.求总和$($公积金订单明细*总数(单位代缴)$) + $单位代缴$ - $列表.求总和$($公积金订单明细*总数(单位应收)$)
fundInfo.setFd_3b35a6518b73b2(Double.sum(Double.sum(sjDwSum, sjdw), -dwYs));
fundInfo.setFd_3b35a6518b73b2(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(sjDwSum,sjdw),dwYs).doubleValue());
}
}
}
......
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpSalaryInfoServiceImpl.java
View file @ 13a020a6
......@@ -7,12 +7,14 @@ import com.yifu.cloud.plus.v1.ekp.mapper.EkpSalaryInfoMapper;
import com.yifu.cloud.plus.v1.ekp.service.EkpSalaryInfoService;
import com.yifu.cloud.plus.v1.ekp.vo.EkpDeptInfoVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.BigDecimalUtils;
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.ekp.vo.EkpSalaryParam;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
......@@ -68,13 +70,15 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
salaryInfo.setFd_3b13b1b91f5b34("全量未结算数据".equals(deptInfo.getSocialType()) ? "是" : "否");
//应收
salaryInfo.setFd_3adfee21802434("是".equals(salaryInfo.getFd_3b178f3e24cc32()) ? CommonConstants.ZERO_INTEGER.doubleValue() : salaryInfo.getFd_3adfee20fe5ba4());
//代扣费用应支出 = $个人社保$ Fd_3adfee1e88723e + $单位公积金$ Fd_3adfee1ee24680 + $个人公积金$ Fd_3adfee1f32fa24 + $单位社保$ Fd_3adfee1e2b2f78 + $个人代扣$ Fd_3adfee1374ed7a
Double[] numbers = {Common.isEmpty(salaryInfo.getFd_3adfee1e88723e()) ? 0 :salaryInfo.getFd_3adfee1e88723e(),
Common.isEmpty(salaryInfo.getFd_3adfee1ee24680()) ? 0 :salaryInfo.getFd_3adfee1e88723e(),
Common.isEmpty(salaryInfo.getFd_3adfee1f32fa24()) ? 0 :salaryInfo.getFd_3adfee1f32fa24(),
Common.isEmpty(salaryInfo.getFd_3adfee1e2b2f78()) ? 0 :salaryInfo.getFd_3adfee1e2b2f78(),
Common.isEmpty(salaryInfo.getFd_3adfee1374ed7a()) ? 0 :salaryInfo.getFd_3adfee1374ed7a()};
salaryInfo.setFd_3adfeeb34ea0ea(Arrays.stream(numbers).reduce(Double::sum).orElse(0.0));
BigDecimal zhichu1 = Common.isEmpty(salaryInfo.getFd_3adfee1e88723e()) ? BigDecimal.ZERO : BigDecimal.valueOf(salaryInfo.getFd_3adfee1e88723e());
BigDecimal zhichu2 = Common.isEmpty(salaryInfo.getFd_3adfee1ee24680()) ? BigDecimal.ZERO : BigDecimal.valueOf(salaryInfo.getFd_3adfee1ee24680());
BigDecimal zhichu3 = Common.isEmpty(salaryInfo.getFd_3adfee1f32fa24()) ? BigDecimal.ZERO : BigDecimal.valueOf(salaryInfo.getFd_3adfee1f32fa24());
BigDecimal zhichu4 = Common.isEmpty(salaryInfo.getFd_3adfee1e2b2f78()) ? BigDecimal.ZERO : BigDecimal.valueOf(salaryInfo.getFd_3adfee1e2b2f78());
BigDecimal zhichu5 = Common.isEmpty(salaryInfo.getFd_3adfee1374ed7a()) ? BigDecimal.ZERO : BigDecimal.valueOf(salaryInfo.getFd_3adfee1374ed7a());
// salaryInfo.setFd_3adfeeb34ea0ea(Arrays.stream(numbers).reduce(Double::sum).orElse(0.0));
salaryInfo.setFd_3adfeeb34ea0ea(BigDecimalUtils.safeAdd(zhichu1,zhichu2,zhichu3,zhichu4,zhichu5).doubleValue());
//创建时间
salaryInfo.setCreateTime(DateUtil.getCurrentDateTime());
......@@ -232,7 +236,7 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
//个税应支出
salaryInfo.setFd_3adfeec6db8766(CommonConstants.EMPTY_STRING.equals(salaryParam.getFd_3adfee1f901c46()) ? null : Double.parseDouble(salaryParam.getFd_3adfee1f901c46()));
//实发合计应支出
salaryInfo.setFd_3adfeec730ec44(CommonConstants.EMPTY_STRING.equals(salaryParam.getFd_3adfeec730ec44()) ? null : Double.parseDouble(salaryParam.getFd_3adfeec730ec44()));
salaryInfo.setFd_3adfeec730ec44(CommonConstants.EMPTY_STRING.equals(salaryParam.getFd_3adfee20fe5ba4()) ? null : Double.parseDouble(salaryParam.getFd_3adfee20fe5ba4()));
//企业年金单位应支出
salaryInfo.setFd_3adfeec782070a(CommonConstants.EMPTY_STRING.equals(salaryParam.getFd_3adfeec782070a()) ? null : Double.parseDouble(salaryParam.getFd_3adfeec782070a()));
//企业年金个人应支出
......
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpSocialInfoServiceImpl.java
View file @ 13a020a6
......@@ -9,6 +9,7 @@ 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.BigDecimalUtils;
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.ekp.vo.EkpPushSocialParam;
......@@ -16,6 +17,7 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentSocialPush;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
......@@ -92,44 +94,44 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
//获取社保订单明细合计
socialSumInfo = baseMapper.getCostSumInfo(socialInfo.getFd_3adfe8c7e4cf7a(), socialInfo.getFd_3adfe8cb96c41e());
//预估合计
Double ygSum = Common.isEmpty(socialSumInfo) ? 0 : socialSumInfo.getYgSum();
BigDecimal ygSum = Common.isEmpty(socialSumInfo) ? BigDecimal.ZERO : BigDecimal.valueOf(socialSumInfo.getYgSum());
//预估个人合计
Double ygPersonSum = Common.isEmpty(socialSumInfo) ? 0 : socialSumInfo.getYgPersonSum();
BigDecimal ygPersonSum = Common.isEmpty(socialSumInfo) ? BigDecimal.ZERO : BigDecimal.valueOf(socialSumInfo.getYgPersonSum());
//实缴合计
Double sjSum = Common.isEmpty(socialSumInfo) ? 0 : socialSumInfo.getSjSum();
BigDecimal sjSum = Common.isEmpty(socialSumInfo) ? BigDecimal.ZERO : BigDecimal.valueOf(socialSumInfo.getSjSum());
//预估单位合计
Double ygDwSum = Common.isEmpty(socialSumInfo) ? 0 : socialSumInfo.getYgDwSum();
BigDecimal ygDwSum = Common.isEmpty(socialSumInfo) ? BigDecimal.ZERO : BigDecimal.valueOf(socialSumInfo.getYgDwSum());
//实缴单位合计
Double sjDwSum = Common.isEmpty(socialSumInfo) ? 0 : socialSumInfo.getSjDwSum();
BigDecimal sjDwSum = Common.isEmpty(socialSumInfo) ? BigDecimal.ZERO : BigDecimal.valueOf(socialSumInfo.getSjDwSum());
//实缴个人合计
Double sjPersonSum = Common.isEmpty(socialSumInfo) ? 0 : socialSumInfo.getSjPersonSum();
BigDecimal sjPersonSum = Common.isEmpty(socialSumInfo) ? BigDecimal.ZERO : BigDecimal.valueOf(socialSumInfo.getSjPersonSum());
//应收
Double ys = Common.isEmpty(socialSumInfo) ? 0 : socialSumInfo.getYs();
BigDecimal ys = Common.isEmpty(socialSumInfo) ? BigDecimal.ZERO : BigDecimal.valueOf(socialSumInfo.getYs());
//个人应收
Double personYs = Common.isEmpty(socialSumInfo) ? 0 : socialSumInfo.getPersonYs();
BigDecimal personYs = Common.isEmpty(socialSumInfo) ? BigDecimal.ZERO : BigDecimal.valueOf(socialSumInfo.getPersonYs());
//单位应收
Double dwYs = Common.isEmpty(socialSumInfo) ? 0 : socialSumInfo.getDwYs();
BigDecimal dwYs = Common.isEmpty(socialSumInfo) ? BigDecimal.ZERO : BigDecimal.valueOf(socialSumInfo.getDwYs());
//实缴单位合计
Double shdw = Common.isEmpty(socialInfo.getFd_3af9f2e9208e4e()) ? 0 : socialInfo.getFd_3af9f2e9208e4e();
BigDecimal shdw = Common.isEmpty(socialInfo.getFd_3af9f2e9208e4e()) ? BigDecimal.ZERO : BigDecimal.valueOf(socialInfo.getFd_3af9f2e9208e4e());
//实缴个人合计
Double shgr = Common.isEmpty(socialInfo.getFd_3af9f303037214()) ? 0 : socialInfo.getFd_3af9f303037214();
BigDecimal shgr = Common.isEmpty(socialInfo.getFd_3af9f303037214()) ? BigDecimal.ZERO : BigDecimal.valueOf(socialInfo.getFd_3af9f303037214());
//预估合计
Double yghj = Common.isEmpty(socialInfo.getFd_3af9f2883941b4()) ? 0 : socialInfo.getFd_3af9f2883941b4();
BigDecimal yghj = Common.isEmpty(socialInfo.getFd_3af9f2883941b4()) ? BigDecimal.ZERO : BigDecimal.valueOf(socialInfo.getFd_3af9f2883941b4());
//预估个人合计
Double yggrhj = Common.isEmpty(socialInfo.getFd_3af9f285ee1e38()) ? 0 : socialInfo.getFd_3af9f285ee1e38();
BigDecimal yggrhj = Common.isEmpty(socialInfo.getFd_3af9f285ee1e38()) ? BigDecimal.ZERO : BigDecimal.valueOf(socialInfo.getFd_3af9f285ee1e38());
//预估单位部分
Double ygdwbf = Common.isEmpty(socialInfo.getFd_3adfeb4e8064a8()) ? 0 : socialInfo.getFd_3adfeb4e8064a8();
BigDecimal ygdwbf = Common.isEmpty(socialInfo.getFd_3adfeb4e8064a8()) ? BigDecimal.ZERO : BigDecimal.valueOf(socialInfo.getFd_3adfeb4e8064a8());
//实缴合计
Double sjhj = Common.isEmpty(socialInfo.getFd_3af9f3059e5b9c()) ? 0 : socialInfo.getFd_3af9f3059e5b9c();
BigDecimal sjhj = Common.isEmpty(socialInfo.getFd_3af9f3059e5b9c()) ? BigDecimal.ZERO : BigDecimal.valueOf(socialInfo.getFd_3af9f3059e5b9c());
//单位差异
if ("是".equals(socialInfo.getFd_3add9de0be85e4()) && "实缴".equals(socialInfo.getFd_3add9dd7833db8())) {
//单位差异
//$列表.求总和$($社保订单明细*总数(实缴单位合计)$)+ $实缴单位合计$ - $列表.求总和$($社保订单明细*总数(预估单位合计)$)
socialInfo.setFd_3adfeb53c70f72(Double.sum(Double.sum(sjDwSum, shdw), -ygDwSum));
socialInfo.setFd_3adfeb53c70f72(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(sjDwSum, shdw),ygDwSum).doubleValue());
//个人差异
//$列表.求总和$($社保订单明细*总数(实缴个人合计)$)+ $实缴个人合计$ - $列表.求总和$($社保订单明细*总数(预估个人合计)$)
socialInfo.setFd_3adfeb5413fb44(Double.sum(Double.sum(sjPersonSum, shgr), -ygPersonSum));
socialInfo.setFd_3adfeb5413fb44(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(sjPersonSum, shgr),ygPersonSum).doubleValue());
}
//Fd_3adfeb7b624f06应收；Fd_3b35a57aee1428个人应收；fd_3b35a57b6e9d0a单位应收
......@@ -144,13 +146,13 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
if ("实缴".equals(deptInfo.getSettleType())) {
if ("预估".equals(socialInfo.getFd_3add9dd7833db8())) {
//$列表.求总和$($社保订单明细*总数(预估合计)$) + $预估合计$ - $列表.求总和$($社保订单明细*总数(应收)$)
socialInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(ygSum, yghj), -ys));
socialInfo.setFd_3adfeb7b624f06(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(ygSum, yghj),ys).doubleValue());
//$列表.求总和$($社保订单明细*总数(预估个人合计)$) + $预估个人合计$ - $列表.求总和$($社保订单明细*总数(个人应收)$)
socialInfo.setFd_3b35a57aee1428(Double.sum(Double.sum(ygPersonSum, yggrhj), -personYs));
socialInfo.setFd_3b35a57aee1428(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(ygPersonSum, yggrhj),personYs).doubleValue());
//$列表.求总和$($社保订单明细*总数(预估单位合计)$) + $预估单位合计$ - $列表.求总和$($社保订单明细*总数(单位应收)$)
socialInfo.setFd_3b35a57b6e9d0a(Double.sum(Double.sum(ygDwSum, ygdwbf), -dwYs));
socialInfo.setFd_3b35a57b6e9d0a(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(ygDwSum, ygdwbf),dwYs).doubleValue());
} else {
if (ygSum > 0) {
if (ygSum.doubleValue() > 0) {
//应收
socialInfo.setFd_3adfeb7b624f06(CommonConstants.ZERO_INTEGER.doubleValue());
//个人应收
......@@ -159,28 +161,28 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
socialInfo.setFd_3b35a57b6e9d0a(CommonConstants.ZERO_INTEGER.doubleValue());
} else {
//$列表.求总和$($社保订单明细*总数(实缴合计)$)+ $实缴合计$ - $列表.求总和$($社保订单明细*总数(应收)$)
socialInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(sjSum, sjhj), -ys));
socialInfo.setFd_3adfeb7b624f06(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(sjSum, sjhj),ys).doubleValue());
//$列表.求总和$($社保订单明细*总数(实缴个人合计)$)+ $实缴个人合计$ - $列表.求总和$($社保订单明细*总数(个人应收)$)
socialInfo.setFd_3b35a57aee1428(Double.sum(Double.sum(sjPersonSum, shgr), -personYs));
socialInfo.setFd_3b35a57aee1428(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(sjPersonSum, shgr),personYs).doubleValue());
//列表.求总和$($社保订单明细*总数(实缴单位合计)$)+ $实缴单位合计$ - $列表.求总和$($社保订单明细*总数(单位应收)$)
socialInfo.setFd_3b35a57b6e9d0a(Double.sum(Double.sum(sjDwSum, shdw), -dwYs));
socialInfo.setFd_3b35a57b6e9d0a(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(sjDwSum, shdw),dwYs).doubleValue());
}
}
} else {
if ("预估".equals(socialInfo.getFd_3add9dd7833db8())) {
//$列表.求总和$($社保订单明细*总数(预估合计)$) + $预估合计$-$列表.求总和$($社保订单明细*总数(应收)$)
socialInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(ygSum, yghj), -ys));
socialInfo.setFd_3adfeb7b624f06(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(ygSum, yghj),ys).doubleValue());
//$列表.求总和$( $社保订单明细*总数(预估个人合计)$) + $预估个人合计$-$列表.求总和$($社保订单明细*总数(个人应收)$)
socialInfo.setFd_3b35a57aee1428(Double.sum(Double.sum(ygPersonSum, yggrhj), -personYs));
socialInfo.setFd_3b35a57aee1428(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(ygPersonSum, yggrhj),personYs).doubleValue());
//$列表.求总和$($社保订单明细*总数(预估单位合计)$) + $预估单位合计$-$列表.求总和$($社保订单明细*总数(单位应收)$)
socialInfo.setFd_3b35a57b6e9d0a(Double.sum(Double.sum(ygDwSum, ygdwbf), -dwYs));
socialInfo.setFd_3b35a57b6e9d0a(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(ygDwSum, ygdwbf),dwYs).doubleValue());
} else {
//$列表.求总和$($社保订单明细*总数(实缴合计)$)+ $实缴合计$ - $列表.求总和$($社保订单明细*总数(应收)$)
socialInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(sjSum, sjhj), -ys));
socialInfo.setFd_3adfeb7b624f06(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(sjSum, sjhj),ys).doubleValue());
//$列表.求总和$($社保订单明细*总数(实缴个人合计)$)+ $实缴个人合计$ - $列表.求总和$($社保订单明细*总数(个人应收)$)
socialInfo.setFd_3b35a57aee1428(Double.sum(Double.sum(sjPersonSum, shgr), -personYs));
socialInfo.setFd_3b35a57aee1428(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(sjPersonSum, shgr),personYs).doubleValue());
//$列表.求总和$($社保订单明细*总数(实缴单位合计)$)+ $实缴单位合计$ - $列表.求总和$($社保订单明细*总数(单位应收)$)
socialInfo.setFd_3b35a57b6e9d0a(Double.sum(Double.sum(sjDwSum, shdw), -dwYs));
socialInfo.setFd_3b35a57b6e9d0a(BigDecimalUtils.safeSubtract(BigDecimalUtils.safeAdd(sjDwSum, shdw),dwYs).doubleValue());
}
}
}
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @ 13a020a6
......@@ -770,6 +770,8 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
socialParam.setFd_3b3cab77923f44(s.getApplyNo() == null ? "" : s.getApplyNo());
//预估
socialParam.setYgFlag(CommonConstants.ONE_STRING);
//创建人姓名
socialParam.setFd_3b438e33f37378(account.getFd_3adfedfb5a68a2());
socialPushList.add(socialParam);
}
......@@ -843,6 +845,8 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
socialParam.setFd_3b178ea361cabe(s.getBpoFlag());
// 薪酬申请编号
socialParam.setFd_3b3cabde83d1d0(s.getApplyNo() == null ? "" : s.getApplyNo());
//创建人姓名
socialParam.setFd_3b43922217c6f8(account.getFd_3adfedfb5a68a2());
fundPushList.add(socialParam);
}
......
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