Commit a26cf442 authored by huyuchen's avatar huyuchen

明细接口改造

parent cc5eca32
......@@ -201,7 +201,7 @@ public class EkpFundInfoServiceImpl extends ServiceImpl<EkpFundInfoMapper, EkpFu
}
}
} catch (Exception e) {
log.error("公积金明细推送失败");
log.error("公积金明细推送失败",e);
return null;
}
return null;
......
......@@ -114,6 +114,14 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
Double shdw = Common.isEmpty(socialInfo.getFd_3af9f2e9208e4e()) ? 0 : socialInfo.getFd_3af9f2e9208e4e();
//实缴个人合计
Double shgr = Common.isEmpty(socialInfo.getFd_3af9f303037214()) ? 0 : socialInfo.getFd_3af9f303037214();
//预估合计
Double yghj = Common.isEmpty(socialInfo.getFd_3af9f2883941b4()) ? 0 : socialInfo.getFd_3af9f2883941b4();
//预估个人合计
Double yggrhj = Common.isEmpty(socialInfo.getFd_3af9f285ee1e38()) ? 0 : socialInfo.getFd_3af9f285ee1e38();
//预估单位部分
Double ygdwbf = Common.isEmpty(socialInfo.getFd_3adfeb4e8064a8()) ? 0 : socialInfo.getFd_3adfeb4e8064a8();
//实缴合计
Double sjhj = Common.isEmpty(socialInfo.getFd_3af9f3059e5b9c()) ? 0 : socialInfo.getFd_3af9f3059e5b9c();
//单位差异
if ("是".equals(socialInfo.getFd_3add9de0be85e4()) && "实缴".equals(socialInfo.getFd_3add9dd7833db8())) {
//单位差异
......@@ -136,11 +144,11 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
if ("实缴".equals(deptInfo.getSettleType())) {
if ("预估".equals(socialInfo.getFd_3add9dd7833db8())) {
//$列表.求总和$($社保订单明细*总数(预估合计)$) + $预估合计$ - $列表.求总和$($社保订单明细*总数(应收)$)
socialInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(ygSum, socialInfo.getFd_3af9f2883941b4()), -ys));
socialInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(ygSum, yghj), -ys));
//$列表.求总和$($社保订单明细*总数(预估个人合计)$) + $预估个人合计$ - $列表.求总和$($社保订单明细*总数(个人应收)$)
socialInfo.setFd_3b35a57aee1428(Double.sum(Double.sum(ygPersonSum, socialInfo.getFd_3af9f285ee1e38()), -personYs));
socialInfo.setFd_3b35a57aee1428(Double.sum(Double.sum(ygPersonSum, yggrhj), -personYs));
//$列表.求总和$($社保订单明细*总数(预估单位合计)$) + $预估单位合计$ - $列表.求总和$($社保订单明细*总数(单位应收)$)
socialInfo.setFd_3b35a57b6e9d0a(Double.sum(Double.sum(ygDwSum, socialInfo.getFd_3adfeb4e8064a8()), -dwYs));
socialInfo.setFd_3b35a57b6e9d0a(Double.sum(Double.sum(ygDwSum, ygdwbf), -dwYs));
} else {
if (ygSum > 0) {
//应收
......@@ -151,7 +159,7 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
socialInfo.setFd_3b35a57b6e9d0a(CommonConstants.ZERO_INTEGER.doubleValue());
} else {
//$列表.求总和$($社保订单明细*总数(实缴合计)$)+ $实缴合计$ - $列表.求总和$($社保订单明细*总数(应收)$)
socialInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(sjSum, socialInfo.getFd_3af9f3059e5b9c()), -ys));
socialInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(sjSum, sjhj), -ys));
//$列表.求总和$($社保订单明细*总数(实缴个人合计)$)+ $实缴个人合计$ - $列表.求总和$($社保订单明细*总数(个人应收)$)
socialInfo.setFd_3b35a57aee1428(Double.sum(Double.sum(sjPersonSum, shgr), -personYs));
//列表.求总和$($社保订单明细*总数(实缴单位合计)$)+ $实缴单位合计$ - $列表.求总和$($社保订单明细*总数(单位应收)$)
......@@ -161,14 +169,14 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
} else {
if ("预估".equals(socialInfo.getFd_3add9dd7833db8())) {
//$列表.求总和$($社保订单明细*总数(预估合计)$) + $预估合计$-$列表.求总和$($社保订单明细*总数(应收)$)
socialInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(ygSum, socialInfo.getFd_3af9f2883941b4()), -ys));
socialInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(ygSum, yghj), -ys));
//$列表.求总和$( $社保订单明细*总数(预估个人合计)$) + $预估个人合计$-$列表.求总和$($社保订单明细*总数(个人应收)$)
socialInfo.setFd_3b35a57aee1428(Double.sum(Double.sum(ygPersonSum, socialInfo.getFd_3af9f285ee1e38()), -personYs));
socialInfo.setFd_3b35a57aee1428(Double.sum(Double.sum(ygPersonSum, yggrhj), -personYs));
//$列表.求总和$($社保订单明细*总数(预估单位合计)$) + $预估单位合计$-$列表.求总和$($社保订单明细*总数(单位应收)$)
socialInfo.setFd_3b35a57b6e9d0a(Double.sum(Double.sum(ygDwSum, socialInfo.getFd_3adfeb4e8064a8()), -dwYs));
socialInfo.setFd_3b35a57b6e9d0a(Double.sum(Double.sum(ygDwSum, ygdwbf), -dwYs));
} else {
//$列表.求总和$($社保订单明细*总数(实缴合计)$)+ $实缴合计$ - $列表.求总和$($社保订单明细*总数(应收)$)
socialInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(sjSum, socialInfo.getFd_3af9f3059e5b9c()), -ys));
socialInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(sjSum, sjhj), -ys));
//$列表.求总和$($社保订单明细*总数(实缴个人合计)$)+ $实缴个人合计$ - $列表.求总和$($社保订单明细*总数(个人应收)$)
socialInfo.setFd_3b35a57aee1428(Double.sum(Double.sum(sjPersonSum, shgr), -personYs));
//$列表.求总和$($社保订单明细*总数(实缴单位合计)$)+ $实缴单位合计$ - $列表.求总和$($社保订单明细*总数(单位应收)$)
......@@ -217,7 +225,7 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
}
}
}catch (Exception e) {
log.error("社保明细推送失败");
log.error("社保明细推送失败",e);
return null;
}
return null;
......
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