Commit ca665b22 authored by huyuchen's avatar huyuchen

明细接口改造

parent 10d8e9d0
...@@ -67,11 +67,13 @@ public class EkpFundInfoServiceImpl extends ServiceImpl<EkpFundInfoMapper, EkpFu ...@@ -67,11 +67,13 @@ public class EkpFundInfoServiceImpl extends ServiceImpl<EkpFundInfoMapper, EkpFu
fundInfo.setFd_3b16e37baa5650(deptInfo.getFdId()); fundInfo.setFd_3b16e37baa5650(deptInfo.getFdId());
//实际结算月份 //实际结算月份
if ("生成月本月数据".equals(deptInfo.getSocialType())) { if ("生成月本月数据".equals(deptInfo.getSocialType())) {
fundInfo.setFd_3adfe8cff746bc(fundInfo.getFd_3adfe8cb96c41e()); fundInfo.setFd_3adfe8cff746bc(dateStringInsert(fundInfo.getFd_3adfe8cb96c41e()));
} else if ("生成月上月数据".equals(deptInfo.getSocialType())) { } else if ("生成月上月数据".equals(deptInfo.getSocialType())) {
fundInfo.setFd_3adfe8cff746bc(DateUtil.dateToString(DateUtil.addMonthByDate(DateUtil.parseDate(fundInfo.getFd_3adfe8cb96c41e(), "yyyyMM"), -1), "yyyy-MM")); fundInfo.setFd_3adfe8cff746bc(DateUtil.dateToString(DateUtil.addMonthByDate(DateUtil.parseDate(fundInfo.getFd_3adfe8cb96c41e(), "yyyyMM"), -1), "yyyy-MM"));
} else if ("生成月次月数据".equals(deptInfo.getSocialType())) { } else if ("生成月次月数据".equals(deptInfo.getSocialType())) {
fundInfo.setFd_3adfe8cff746bc(DateUtil.dateToString(DateUtil.addMonthByDate(DateUtil.parseDate(fundInfo.getFd_3adfe8cb96c41e(), "yyyyMM"), 1), "yyyy-MM")); fundInfo.setFd_3adfe8cff746bc(DateUtil.dateToString(DateUtil.addMonthByDate(DateUtil.parseDate(fundInfo.getFd_3adfe8cb96c41e(), "yyyyMM"), 1), "yyyy-MM"));
} else {
fundInfo.setFd_3adfe8cff746bc("");
} }
//是否全部结算 //是否全部结算
if ("全量未结算数据".equals(deptInfo.getSocialType())) { if ("全量未结算数据".equals(deptInfo.getSocialType())) {
...@@ -79,6 +81,7 @@ public class EkpFundInfoServiceImpl extends ServiceImpl<EkpFundInfoMapper, EkpFu ...@@ -79,6 +81,7 @@ public class EkpFundInfoServiceImpl extends ServiceImpl<EkpFundInfoMapper, EkpFu
} else { } else {
fundInfo.setFd_3b13afd1ef7798(CommonConstants.IS_FALSE); fundInfo.setFd_3b13afd1ef7798(CommonConstants.IS_FALSE);
} }
fundInfo.setFd_3adfe8cb96c41e(dateStringInsert(fundInfo.getFd_3adfe8cb96c41e()));
//获取社保订单明细合计 //获取社保订单明细合计
socialSumInfo = baseMapper.getCostSumInfo(fundInfo.getFd_3adfe8c7e4cf7a(), fundInfo.getFd_3adfe8cb96c41e()); socialSumInfo = baseMapper.getCostSumInfo(fundInfo.getFd_3adfe8c7e4cf7a(), fundInfo.getFd_3adfe8cb96c41e());
...@@ -96,14 +99,23 @@ public class EkpFundInfoServiceImpl extends ServiceImpl<EkpFundInfoMapper, EkpFu ...@@ -96,14 +99,23 @@ public class EkpFundInfoServiceImpl extends ServiceImpl<EkpFundInfoMapper, EkpFu
Double personYs = Common.isEmpty(socialSumInfo) ? 0 : socialSumInfo.getPersonYs(); Double personYs = Common.isEmpty(socialSumInfo) ? 0 : socialSumInfo.getPersonYs();
//单位应收 //单位应收
Double dwYs = Common.isEmpty(socialSumInfo) ? 0 : socialSumInfo.getDwYs(); Double dwYs = Common.isEmpty(socialSumInfo) ? 0 : socialSumInfo.getDwYs();
//预估个人部分
Double yggr = Common.isEmpty(fundInfo.getFd_3adfeb52a4d2e2()) ? 0 : fundInfo.getFd_3adfeb52a4d2e2();
//预估单位部分
Double ygdw = Common.isEmpty(fundInfo.getFd_3adfeb4e8064a8()) ? 0 : fundInfo.getFd_3adfeb4e8064a8();
//实缴单位部分
Double sjdw = Common.isEmpty(fundInfo.getFd_3adfeb52fbe966()) ? 0 : fundInfo.getFd_3adfeb52fbe966();
//实缴个人部分
Double sjgr = Common.isEmpty(fundInfo.getFd_3adfeb5366dd82()) ? 0 : fundInfo.getFd_3adfeb5366dd82();
//单位差异 //单位差异
if ("是".equals(fundInfo.getFd_3add9de0be85e4()) && "实缴".equals(fundInfo.getFd_3add9dd7833db8())) { if ("是".equals(fundInfo.getFd_3add9de0be85e4()) && "实缴".equals(fundInfo.getFd_3add9dd7833db8())) {
//单位差异 //单位差异
//$列表.求总和$($公积金订单明细*总数(单位代缴)$)+$单位代缴$) -($列表.求总和$($公积金订单明细*总数(预估单位代缴)$) + $预估单位代缴$) //$列表.求总和$($公积金订单明细*总数(单位代缴)$)+$单位代缴$) -($列表.求总和$($公积金订单明细*总数(预估单位代缴)$) + $预估单位代缴$)
fundInfo.setFd_3adfeb53c70f72(Double.sum(Double.sum(sjDwSum, fundInfo.getFd_3adfeb52fbe966()), -Double.sum(ygDwSum,fundInfo.getFd_3adfeb52a4d2e2()))); fundInfo.setFd_3adfeb53c70f72(Double.sum(Double.sum(sjDwSum, sjdw), -Double.sum(ygDwSum,yggr)));
//个人差异 //个人差异
//$列表.求总和$($公积金订单明细*总数(个人代缴)$)+ $个人代缴$ - $列表.求总和$($公积金订单明细*总数(预估个人代缴)$) //$列表.求总和$($公积金订单明细*总数(个人代缴)$)+ $个人代缴$ - $列表.求总和$($公积金订单明细*总数(预估个人代缴)$)
fundInfo.setFd_3adfeb5413fb44(Double.sum(Double.sum(sjPersonSum, fundInfo.getFd_3adfeb5366dd82()), -ygPersonSum)); fundInfo.setFd_3adfeb5413fb44(Double.sum(Double.sum(sjPersonSum, sjgr), -ygPersonSum));
} }
//Fd_3adfeb7b624f06应收;Fd_3b35a65138a7fc个人应收;fd_3b35a6518b73b2单位应收 //Fd_3adfeb7b624f06应收;Fd_3b35a65138a7fc个人应收;fd_3b35a6518b73b2单位应收
...@@ -118,11 +130,11 @@ public class EkpFundInfoServiceImpl extends ServiceImpl<EkpFundInfoMapper, EkpFu ...@@ -118,11 +130,11 @@ public class EkpFundInfoServiceImpl extends ServiceImpl<EkpFundInfoMapper, EkpFu
if ("实缴".equals(deptInfo.getSettleType())) { if ("实缴".equals(deptInfo.getSettleType())) {
if ("预估".equals(fundInfo.getFd_3add9dd7833db8())) { if ("预估".equals(fundInfo.getFd_3add9dd7833db8())) {
//$列表.求总和$($公积金订单明细*总数(预估单位代缴)$) + $列表.求总和$($公积金订单明细*总数(预估个人代缴)$) + $预估个人代缴$ + $预估单位代缴$ - $列表.求总和$($公积金订单明细*总数(应收)$) //$列表.求总和$($公积金订单明细*总数(预估单位代缴)$) + $列表.求总和$($公积金订单明细*总数(预估个人代缴)$) + $预估个人代缴$ + $预估单位代缴$ - $列表.求总和$($公积金订单明细*总数(应收)$)
fundInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(ygDwSum, ygPersonSum),Double.sum(fundInfo.getFd_3adfeb52a4d2e2(),fundInfo.getFd_3adfeb4e8064a8()) -ys)); fundInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(ygDwSum, ygPersonSum),Double.sum(yggr,ygdw) -ys));
//$列表.求总和$($公积金订单明细*总数(预估个人代缴)$) + $预估个人代缴$ - $列表.求总和$($公积金订单明细*总数(个人应收)$) //$列表.求总和$($公积金订单明细*总数(预估个人代缴)$) + $预估个人代缴$ - $列表.求总和$($公积金订单明细*总数(个人应收)$)
fundInfo.setFd_3b35a65138a7fc(Double.sum(Double.sum(ygPersonSum, fundInfo.getFd_3adfeb52a4d2e2()), -personYs)); fundInfo.setFd_3b35a65138a7fc(Double.sum(Double.sum(ygPersonSum, yggr), -personYs));
//$列表.求总和$($公积金订单明细*总数(预估单位代缴)$) + $预估单位代缴$ - $列表.求总和$($公积金订单明细*总数(单位应收)$) //$列表.求总和$($公积金订单明细*总数(预估单位代缴)$) + $预估单位代缴$ - $列表.求总和$($公积金订单明细*总数(单位应收)$)
fundInfo.setFd_3b35a6518b73b2(Double.sum(Double.sum(ygDwSum, fundInfo.getFd_3adfeb4e8064a8()), -dwYs)); fundInfo.setFd_3b35a6518b73b2(Double.sum(Double.sum(ygDwSum, ygdw), -dwYs));
} else { } else {
if (Double.sum(ygDwSum, ygPersonSum) > 0) { if (Double.sum(ygDwSum, ygPersonSum) > 0) {
//应收 //应收
...@@ -133,28 +145,28 @@ public class EkpFundInfoServiceImpl extends ServiceImpl<EkpFundInfoMapper, EkpFu ...@@ -133,28 +145,28 @@ public class EkpFundInfoServiceImpl extends ServiceImpl<EkpFundInfoMapper, EkpFu
fundInfo.setFd_3b35a6518b73b2(CommonConstants.ZERO_INTEGER.doubleValue()); fundInfo.setFd_3b35a6518b73b2(CommonConstants.ZERO_INTEGER.doubleValue());
} else { } else {
// $列表.求总和$($公积金订单明细*总数(单位代缴)$) +$列表.求总和$($公积金订单明细*总数(个人代缴)$) + $单位代缴$ + $个人代缴$ - $列表.求总和$($公积金订单明细*总数(应收)$) // $列表.求总和$($公积金订单明细*总数(单位代缴)$) +$列表.求总和$($公积金订单明细*总数(个人代缴)$) + $单位代缴$ + $个人代缴$ - $列表.求总和$($公积金订单明细*总数(应收)$)
fundInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(sjDwSum, sjPersonSum),Double.sum(fundInfo.getFd_3adfeb52fbe966(),fundInfo.getFd_3adfeb5366dd82()) -ys)); fundInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(sjDwSum, sjPersonSum),Double.sum(sjdw,sjgr) -ys));
//$列表.求总和$($公积金订单明细*总数(个人代缴)$) + $个人代缴$ - $列表.求总和$($公积金订单明细*总数(个人应收)$) //$列表.求总和$($公积金订单明细*总数(个人代缴)$) + $个人代缴$ - $列表.求总和$($公积金订单明细*总数(个人应收)$)
fundInfo.setFd_3b35a65138a7fc(Double.sum(Double.sum(sjPersonSum, fundInfo.getFd_3adfeb5366dd82()), -personYs)); fundInfo.setFd_3b35a65138a7fc(Double.sum(Double.sum(sjPersonSum, sjgr), -personYs));
//$列表.求总和$($公积金订单明细*总数(单位代缴)$) + $单位代缴$ - $列表.求总和$($公积金订单明细*总数(单位应收)$) //$列表.求总和$($公积金订单明细*总数(单位代缴)$) + $单位代缴$ - $列表.求总和$($公积金订单明细*总数(单位应收)$)
fundInfo.setFd_3b35a6518b73b2(Double.sum(Double.sum(sjDwSum, fundInfo.getFd_3adfeb52fbe966()), -dwYs)); fundInfo.setFd_3b35a6518b73b2(Double.sum(Double.sum(sjDwSum, sjdw), -dwYs));
} }
} }
} else { } else {
if ("预估".equals(fundInfo.getFd_3add9dd7833db8())) { if ("预估".equals(fundInfo.getFd_3add9dd7833db8())) {
// $列表.求总和$($公积金订单明细*总数(预估个人代缴)$) + $列表.求总和$($公积金订单明细*总数(预估单位代缴)$) + $预估个人代缴$ + $预估单位代缴$ -$列表.求总和$($公积金订单明细*总数(应收)$) // $列表.求总和$($公积金订单明细*总数(预估个人代缴)$) + $列表.求总和$($公积金订单明细*总数(预估单位代缴)$) + $预估个人代缴$ + $预估单位代缴$ -$列表.求总和$($公积金订单明细*总数(应收)$)
fundInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(ygPersonSum, ygDwSum),Double.sum(fundInfo.getFd_3adfeb52a4d2e2(),fundInfo.getFd_3adfeb4e8064a8()) -ys)); fundInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(ygPersonSum, ygDwSum),Double.sum(yggr,ygdw) -ys));
//$列表.求总和$($公积金订单明细*总数(预估个人代缴)$) + $预估个人代缴$ -$列表.求总和$($公积金订单明细*总数(个人应收)$) //$列表.求总和$($公积金订单明细*总数(预估个人代缴)$) + $预估个人代缴$ -$列表.求总和$($公积金订单明细*总数(个人应收)$)
fundInfo.setFd_3b35a65138a7fc(Double.sum(Double.sum(ygPersonSum, fundInfo.getFd_3adfeb52a4d2e2()), -personYs)); fundInfo.setFd_3b35a65138a7fc(Double.sum(Double.sum(ygPersonSum, yggr), -personYs));
// $列表.求总和$($公积金订单明细*总数(预估单位代缴)$) + $预估单位代缴$ -$列表.求总和$($公积金订单明细*总数(单位应收)$) // $列表.求总和$($公积金订单明细*总数(预估单位代缴)$) + $预估单位代缴$ -$列表.求总和$($公积金订单明细*总数(单位应收)$)
fundInfo.setFd_3b35a6518b73b2(Double.sum(Double.sum(ygDwSum, fundInfo.getFd_3adfeb4e8064a8()), -dwYs)); fundInfo.setFd_3b35a6518b73b2(Double.sum(Double.sum(ygDwSum, ygdw), -dwYs));
} else { } else {
//$列表.求总和$($公积金订单明细*总数(单位代缴)$) +$列表.求总和$($公积金订单明细*总数(个人代缴)$) + $单位代缴$ + $个人代缴$ - $列表.求总和$($公积金订单明细*总数(应收)$) //$列表.求总和$($公积金订单明细*总数(单位代缴)$) +$列表.求总和$($公积金订单明细*总数(个人代缴)$) + $单位代缴$ + $个人代缴$ - $列表.求总和$($公积金订单明细*总数(应收)$)
fundInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(sjDwSum, sjPersonSum),Double.sum(fundInfo.getFd_3adfeb52fbe966(),fundInfo.getFd_3adfeb5366dd82()) -ys)); fundInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(sjDwSum, sjPersonSum),Double.sum(sjdw,sjgr) -ys));
//$列表.求总和$($公积金订单明细*总数(个人代缴)$) + $个人代缴$ - $列表.求总和$($公积金订单明细*总数(个人应收)$) //$列表.求总和$($公积金订单明细*总数(个人代缴)$) + $个人代缴$ - $列表.求总和$($公积金订单明细*总数(个人应收)$)
fundInfo.setFd_3b35a65138a7fc(Double.sum(Double.sum(sjPersonSum, fundInfo.getFd_3adfeb5366dd82()), -personYs)); fundInfo.setFd_3b35a65138a7fc(Double.sum(Double.sum(sjPersonSum, sjgr), -personYs));
//$列表.求总和$($公积金订单明细*总数(单位代缴)$) + $单位代缴$ - $列表.求总和$($公积金订单明细*总数(单位应收)$) //$列表.求总和$($公积金订单明细*总数(单位代缴)$) + $单位代缴$ - $列表.求总和$($公积金订单明细*总数(单位应收)$)
fundInfo.setFd_3b35a6518b73b2(Double.sum(Double.sum(sjDwSum, fundInfo.getFd_3adfeb52fbe966()), -dwYs)); fundInfo.setFd_3b35a6518b73b2(Double.sum(Double.sum(sjDwSum, sjdw), -dwYs));
} }
} }
} }
...@@ -251,4 +263,14 @@ public class EkpFundInfoServiceImpl extends ServiceImpl<EkpFundInfoMapper, EkpFu ...@@ -251,4 +263,14 @@ public class EkpFundInfoServiceImpl extends ServiceImpl<EkpFundInfoMapper, EkpFu
//支出结算状态 //支出结算状态
socialInfo.setFd_3add9edfbc6f7e("未结算"); socialInfo.setFd_3add9edfbc6f7e("未结算");
} }
/**
* @Description: 推送ekp时更改日期格式
* @Author: huyc
**/
public String dateStringInsert(String month) {
StringBuilder sb = new StringBuilder(month);
sb.insert(4, "-");
return sb.toString();
}
} }
...@@ -78,6 +78,8 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E ...@@ -78,6 +78,8 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
socialInfo.setFd_3adfe8cff746bc(DateUtil.dateToString(DateUtil.addMonthByDate(DateUtil.parseDate(socialInfo.getFd_3adfe8cb96c41e(), "yyyyMM"), -1), "yyyy-MM")); socialInfo.setFd_3adfe8cff746bc(DateUtil.dateToString(DateUtil.addMonthByDate(DateUtil.parseDate(socialInfo.getFd_3adfe8cb96c41e(), "yyyyMM"), -1), "yyyy-MM"));
} else if ("生成月次月数据".equals(deptInfo.getSocialType())) { } else if ("生成月次月数据".equals(deptInfo.getSocialType())) {
socialInfo.setFd_3adfe8cff746bc(DateUtil.dateToString(DateUtil.addMonthByDate(DateUtil.parseDate(socialInfo.getFd_3adfe8cb96c41e(), "yyyyMM"), 1), "yyyy-MM")); socialInfo.setFd_3adfe8cff746bc(DateUtil.dateToString(DateUtil.addMonthByDate(DateUtil.parseDate(socialInfo.getFd_3adfe8cb96c41e(), "yyyyMM"), 1), "yyyy-MM"));
} else {
socialInfo.setFd_3adfe8cff746bc("");
} }
//是否全部结算 //是否全部结算
if ("全量未结算数据".equals(deptInfo.getSocialType())) { if ("全量未结算数据".equals(deptInfo.getSocialType())) {
...@@ -85,6 +87,8 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E ...@@ -85,6 +87,8 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
} else { } else {
socialInfo.setFd_3b1354c3add8c2(CommonConstants.IS_FALSE); socialInfo.setFd_3b1354c3add8c2(CommonConstants.IS_FALSE);
} }
//生成月份
socialInfo.setFd_3adfe8cb96c41e(dateStringInsert(socialInfo.getFd_3adfe8cb96c41e()));
//获取社保订单明细合计 //获取社保订单明细合计
socialSumInfo = baseMapper.getCostSumInfo(socialInfo.getFd_3adfe8c7e4cf7a(), socialInfo.getFd_3adfe8cb96c41e()); socialSumInfo = baseMapper.getCostSumInfo(socialInfo.getFd_3adfe8c7e4cf7a(), socialInfo.getFd_3adfe8cb96c41e());
//预估合计 //预估合计
...@@ -105,14 +109,19 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E ...@@ -105,14 +109,19 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
Double personYs = Common.isEmpty(socialSumInfo) ? 0 : socialSumInfo.getPersonYs(); Double personYs = Common.isEmpty(socialSumInfo) ? 0 : socialSumInfo.getPersonYs();
//单位应收 //单位应收
Double dwYs = Common.isEmpty(socialSumInfo) ? 0 : socialSumInfo.getDwYs(); Double dwYs = Common.isEmpty(socialSumInfo) ? 0 : socialSumInfo.getDwYs();
//实缴单位合计
Double shdw = Common.isEmpty(socialInfo.getFd_3af9f2e9208e4e()) ? 0 : socialInfo.getFd_3af9f2e9208e4e();
//实缴个人合计
Double shgr = Common.isEmpty(socialInfo.getFd_3af9f303037214()) ? 0 : socialInfo.getFd_3af9f303037214();
//单位差异 //单位差异
if ("是".equals(socialInfo.getFd_3add9de0be85e4()) && "实缴".equals(socialInfo.getFd_3add9dd7833db8())) { if ("是".equals(socialInfo.getFd_3add9de0be85e4()) && "实缴".equals(socialInfo.getFd_3add9dd7833db8())) {
//单位差异 //单位差异
//$列表.求总和$($社保订单明细*总数(实缴单位合计)$)+ $实缴单位合计$ - $列表.求总和$($社保订单明细*总数(预估单位合计)$) //$列表.求总和$($社保订单明细*总数(实缴单位合计)$)+ $实缴单位合计$ - $列表.求总和$($社保订单明细*总数(预估单位合计)$)
socialInfo.setFd_3adfeb53c70f72(Double.sum(Double.sum(sjDwSum, socialInfo.getFd_3af9f2e9208e4e()), -ygDwSum)); socialInfo.setFd_3adfeb53c70f72(Double.sum(Double.sum(sjDwSum, shdw), -ygDwSum));
//个人差异 //个人差异
//$列表.求总和$($社保订单明细*总数(实缴个人合计)$)+ $实缴个人合计$ - $列表.求总和$($社保订单明细*总数(预估个人合计)$) //$列表.求总和$($社保订单明细*总数(实缴个人合计)$)+ $实缴个人合计$ - $列表.求总和$($社保订单明细*总数(预估个人合计)$)
socialInfo.setFd_3adfeb5413fb44(Double.sum(Double.sum(sjPersonSum, socialInfo.getFd_3af9f303037214()), -ygPersonSum)); socialInfo.setFd_3adfeb5413fb44(Double.sum(Double.sum(sjPersonSum, shgr), -ygPersonSum));
} }
//Fd_3adfeb7b624f06应收;Fd_3b35a57aee1428个人应收;fd_3b35a57b6e9d0a单位应收 //Fd_3adfeb7b624f06应收;Fd_3b35a57aee1428个人应收;fd_3b35a57b6e9d0a单位应收
...@@ -144,9 +153,9 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E ...@@ -144,9 +153,9 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
//$列表.求总和$($社保订单明细*总数(实缴合计)$)+ $实缴合计$ - $列表.求总和$($社保订单明细*总数(应收)$) //$列表.求总和$($社保订单明细*总数(实缴合计)$)+ $实缴合计$ - $列表.求总和$($社保订单明细*总数(应收)$)
socialInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(sjSum, socialInfo.getFd_3af9f3059e5b9c()), -ys)); socialInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(sjSum, socialInfo.getFd_3af9f3059e5b9c()), -ys));
//$列表.求总和$($社保订单明细*总数(实缴个人合计)$)+ $实缴个人合计$ - $列表.求总和$($社保订单明细*总数(个人应收)$) //$列表.求总和$($社保订单明细*总数(实缴个人合计)$)+ $实缴个人合计$ - $列表.求总和$($社保订单明细*总数(个人应收)$)
socialInfo.setFd_3b35a57aee1428(Double.sum(Double.sum(sjPersonSum, socialInfo.getFd_3af9f303037214()), -personYs)); socialInfo.setFd_3b35a57aee1428(Double.sum(Double.sum(sjPersonSum, shgr), -personYs));
//列表.求总和$($社保订单明细*总数(实缴单位合计)$)+ $实缴单位合计$ - $列表.求总和$($社保订单明细*总数(单位应收)$) //列表.求总和$($社保订单明细*总数(实缴单位合计)$)+ $实缴单位合计$ - $列表.求总和$($社保订单明细*总数(单位应收)$)
socialInfo.setFd_3b35a57b6e9d0a(Double.sum(Double.sum(sjDwSum, socialInfo.getFd_3af9f2e9208e4e()), -dwYs)); socialInfo.setFd_3b35a57b6e9d0a(Double.sum(Double.sum(sjDwSum, shdw), -dwYs));
} }
} }
} else { } else {
...@@ -161,9 +170,9 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E ...@@ -161,9 +170,9 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
//$列表.求总和$($社保订单明细*总数(实缴合计)$)+ $实缴合计$ - $列表.求总和$($社保订单明细*总数(应收)$) //$列表.求总和$($社保订单明细*总数(实缴合计)$)+ $实缴合计$ - $列表.求总和$($社保订单明细*总数(应收)$)
socialInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(sjSum, socialInfo.getFd_3af9f3059e5b9c()), -ys)); socialInfo.setFd_3adfeb7b624f06(Double.sum(Double.sum(sjSum, socialInfo.getFd_3af9f3059e5b9c()), -ys));
//$列表.求总和$($社保订单明细*总数(实缴个人合计)$)+ $实缴个人合计$ - $列表.求总和$($社保订单明细*总数(个人应收)$) //$列表.求总和$($社保订单明细*总数(实缴个人合计)$)+ $实缴个人合计$ - $列表.求总和$($社保订单明细*总数(个人应收)$)
socialInfo.setFd_3b35a57aee1428(Double.sum(Double.sum(sjPersonSum, socialInfo.getFd_3af9f303037214()), -personYs)); socialInfo.setFd_3b35a57aee1428(Double.sum(Double.sum(sjPersonSum, shgr), -personYs));
//$列表.求总和$($社保订单明细*总数(实缴单位合计)$)+ $实缴单位合计$ - $列表.求总和$($社保订单明细*总数(单位应收)$) //$列表.求总和$($社保订单明细*总数(实缴单位合计)$)+ $实缴单位合计$ - $列表.求总和$($社保订单明细*总数(单位应收)$)
socialInfo.setFd_3b35a57b6e9d0a(Double.sum(Double.sum(sjDwSum, socialInfo.getFd_3af9f2e9208e4e()), -dwYs)); socialInfo.setFd_3b35a57b6e9d0a(Double.sum(Double.sum(sjDwSum, shdw), -dwYs));
} }
} }
} }
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
a.fd_id as fdId, a.fd_id as fdId,
a.fd_3b1480cd9dcb60 as settleType, a.fd_3b1480cd9dcb60 as settleType,
a.fd_3b15f64dd59a28 as isBpo, a.fd_3b15f64dd59a28 as isBpo,
a.fd_3b13479cedebd4 as socialType, a.fd_3b13b25ea90966 as socialType,
a.fd_3a2b38c61ef9aa as deptName, a.fd_3a2b38c61ef9aa as deptName,
a.fd_3a37fe508071fe as deptNo a.fd_3a37fe508071fe as deptNo
from ekp_24a8e6a7fc143bb8c48a a from ekp_24a8e6a7fc143bb8c48a a
......
...@@ -93,7 +93,7 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> { ...@@ -93,7 +93,7 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
* @param searchVo 缴费库 * @param searchVo 缴费库
* @return * @return
*/ */
List<TPaymentInfoPushVo> getTPaymentInfoSumPushList(@Param("tPaymentInfo") TPaymentInfoSearchVo searchVo,@Param("l") int l); List<TPaymentInfoPushVo> getTPaymentInfoSumPushList(@Param("tPaymentInfo") TPaymentInfoSearchVo searchVo);
/** /**
* 缴费库合并导出查询 * 缴费库合并导出查询
...@@ -232,15 +232,14 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> { ...@@ -232,15 +232,14 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
* @return * @return
*/ */
List<TPaymentInfo> getTPaymentFundPushInfo(@Param("tPaymentInfo") TPaymentInfoSearchVo searchVo, List<TPaymentInfo> getTPaymentFundPushInfo(@Param("tPaymentInfo") TPaymentInfoSearchVo searchVo,
@Param("userId") String userId,@Param("k") int k); @Param("userId") String userId);
/** /**
* 缴费库公积金推送查询 * 缴费库公积金推送查询
* @param k 分页区间
* @return * @return
*/ */
List<TPaymentInfo> getTPaymentFundAllPushInfo(@Param("k") int k); List<TPaymentInfo> getTPaymentFundAllPushInfo();
/** /**
* 缴费库社保收入推送查询 * 缴费库社保收入推送查询
......
...@@ -2929,17 +2929,24 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -2929,17 +2929,24 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//获取所有未推送的社保实缴明细数据 //获取所有未推送的社保实缴明细数据
long count = baseMapper.getTPaymentInfoSumPushCount(null); long count = baseMapper.getTPaymentInfoSumPushCount(null);
if (count > 0) { if (count > 0) {
List<TPaymentInfoPushVo> unPushs;
int i = (int) Math.ceil((double) count / CommonConstants.ONE_THOUSAND_INT); int i = (int) Math.ceil((double) count / CommonConstants.ONE_THOUSAND_INT);
Map<String, TSettleDomainSelectVo> mapSelectVo = this.getSelectVoMap(); Map<String, TSettleDomainSelectVo> mapSelectVo = this.getSelectVoMap();
int k = 0; List<TPaymentInfoPushVo> unPushs = baseMapper.getTPaymentInfoSumPushList(null);
for (int j = 0; j < i; j++) { if (!unPushs.isEmpty()) {
synchronized (this) { List<TPaymentInfoPushVo> pushList;
unPushs = baseMapper.getTPaymentInfoSumPushList(null, k); int k = 0;
k = k + 1000; for (int j = 0; j < i; j++) {
if (Common.isNotNull(unPushs)) { synchronized (this) {
//推送数据封装并推送 if (j == i-1) {
doJointSocialTask.asynchronousEkpPaymentSocial(unPushs, mapSelectVo); pushList = unPushs.subList(k, unPushs.size());
} else {
pushList = unPushs.subList(k, k+1000);
}
k = k + 1000;
if (Common.isNotNull(pushList)) {
//推送数据封装并推送
doJointSocialTask.asynchronousEkpPaymentSocial(pushList, mapSelectVo);
}
} }
} }
} }
...@@ -2952,19 +2959,26 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -2952,19 +2959,26 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
.eq(TPaymentInfo::getPushStatus, CommonConstants.ONE_STRING) .eq(TPaymentInfo::getPushStatus, CommonConstants.ONE_STRING)
.eq(TPaymentInfo::getLockStatus, CommonConstants.ONE_STRING) .eq(TPaymentInfo::getLockStatus, CommonConstants.ONE_STRING)
.isNotNull(TPaymentInfo::getFundId)); .isNotNull(TPaymentInfo::getFundId));
if (count > 0) { if (count > 0) {
List<TPaymentInfo> unPushInfo;
int i = (int) Math.ceil((double) count / CommonConstants.ONE_THOUSAND_INT);
Map<String, TSettleDomainSelectVo> mapSelectVo = this.getSelectVoMap(); Map<String, TSettleDomainSelectVo> mapSelectVo = this.getSelectVoMap();
int k = 0; List<TPaymentInfo> unPushs = baseMapper.getTPaymentFundAllPushInfo();
for (int j = 0; j < i; j++) { int i = (int) Math.ceil((double) count / CommonConstants.ONE_THOUSAND_INT);
synchronized (this) { if (!unPushs.isEmpty()) {
//获取所有未推送的公积金实缴明细数据 List<TPaymentInfo> pushList;
unPushInfo = baseMapper.getTPaymentFundAllPushInfo(k); int k = 0;
k = k + 1000; for (int j = 0; j < i; j++) {
if (Common.isNotNull(unPushInfo)) { synchronized (this) {
//推送数据封装并推送 if (j == i - 1) {
doJointSocialTask.asynchronousEkpPaymentFund(unPushInfo, mapSelectVo); pushList = unPushs.subList(k, unPushs.size());
} else {
pushList = unPushs.subList(k, k + 1000);
}
k = k + 1000;
if (Common.isNotNull(pushList)) {
//推送数据封装并推送
doJointSocialTask.asynchronousEkpPaymentFund(pushList, mapSelectVo);
}
} }
} }
} }
...@@ -3133,16 +3147,23 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -3133,16 +3147,23 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
searchVo.setCreateBy(user.getId()); searchVo.setCreateBy(user.getId());
long count = baseMapper.getTPaymentInfoSumPushCount(searchVo); long count = baseMapper.getTPaymentInfoSumPushCount(searchVo);
if (count > 0) { if (count > 0) {
List<TPaymentInfoPushVo> unPushInfo; List<TPaymentInfoPushVo> unPushs = baseMapper.getTPaymentInfoSumPushList(searchVo);
int i = (int) Math.ceil((double) count / CommonConstants.ONE_THOUSAND_INT); int i = (int) Math.ceil((double) count / CommonConstants.ONE_THOUSAND_INT);
int k = 0; if (!unPushs.isEmpty()) {
for (int j = 0; j < i; j++) { List<TPaymentInfoPushVo> pushList;
synchronized (this) { int k = 0;
unPushInfo = baseMapper.getTPaymentInfoSumPushList(searchVo, k); for (int j = 0; j < i; j++) {
k = k + 1000; synchronized (this) {
if (Common.isNotNull(unPushInfo)) { if (j == i - 1) {
//推送数据封装并推送 pushList = unPushs.subList(k, unPushs.size());
doJointSocialTask.asynchronousEkpPaymentSocial(unPushInfo, mapSelectVo); } else {
pushList = unPushs.subList(k, k + 1000);
}
k = k + 1000;
if (Common.isNotNull(pushList)) {
//推送数据封装并推送
doJointSocialTask.asynchronousEkpPaymentSocial(pushList, mapSelectVo);
}
} }
} }
} }
...@@ -3155,16 +3176,23 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -3155,16 +3176,23 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
searchVo.setLockStatus(CommonConstants.ONE_STRING); searchVo.setLockStatus(CommonConstants.ONE_STRING);
long count = baseMapper.getTPaymentFundPushCount(searchVo, user.getId()); long count = baseMapper.getTPaymentFundPushCount(searchVo, user.getId());
if (count > 0) { if (count > 0) {
List<TPaymentInfo> unPushInfo; List<TPaymentInfo> unPushs = baseMapper.getTPaymentFundPushInfo(searchVo, user.getId());
int i = (int) Math.ceil((double) count / CommonConstants.ONE_THOUSAND_INT); int i = (int) Math.ceil((double) count / CommonConstants.ONE_THOUSAND_INT);
int k = 0; if (!unPushs.isEmpty()) {
for (int j = 0; j < i; j++) { List<TPaymentInfo> pushList;
synchronized (this) { int k = 0;
unPushInfo = baseMapper.getTPaymentFundPushInfo(searchVo, user.getId(),k); for (int j = 0; j < i; j++) {
k = k + 1000; synchronized (this) {
if (Common.isNotNull(unPushInfo)) { if (j == i - 1) {
//推送数据封装并推送 pushList = unPushs.subList(k, unPushs.size());
doJointSocialTask.asynchronousEkpPaymentFund(unPushInfo, mapSelectVo); } else {
pushList = unPushs.subList(k, k + 1000);
}
k = k + 1000;
if (Common.isNotNull(pushList)) {
//推送数据封装并推送
doJointSocialTask.asynchronousEkpPaymentFund(pushList, mapSelectVo);
}
} }
} }
} }
......
...@@ -1123,7 +1123,12 @@ public class DoJointSocialTask { ...@@ -1123,7 +1123,12 @@ public class DoJointSocialTask {
socialParam.setFd_3b3cab77923f44(CommonConstants.EMPTY_STRING); socialParam.setFd_3b3cab77923f44(CommonConstants.EMPTY_STRING);
//预估 //预估
socialParam.setYgFlag(CommonConstants.ONE_STRING); socialParam.setYgFlag(CommonConstants.ONE_STRING);
//创建人姓名
if (Common.isNotNull(library.getCreateName())) {
socialParam.setFd_3b438e33f37378(library.getCreateName());
} else {
socialParam.setFd_3b438e33f37378(CommonConstants.EMPTY_STRING);
}
//缴纳地拼接 //缴纳地拼接
StringBuilder adress = new StringBuilder(); StringBuilder adress = new StringBuilder();
adress.append(null!= library.getSocialProvince() ? RedisUtil.redis.opsForValue().get(CacheConstants.AREA_LABEL + library.getSocialProvince()) : "") adress.append(null!= library.getSocialProvince() ? RedisUtil.redis.opsForValue().get(CacheConstants.AREA_LABEL + library.getSocialProvince()) : "")
...@@ -1302,6 +1307,12 @@ public class DoJointSocialTask { ...@@ -1302,6 +1307,12 @@ public class DoJointSocialTask {
fundParam.setFd_3b0afbaf10df2c(library.getId()); fundParam.setFd_3b0afbaf10df2c(library.getId());
// 薪酬申请编号 // 薪酬申请编号
fundParam.setFd_3b3cabde83d1d0(CommonConstants.EMPTY_STRING); fundParam.setFd_3b3cabde83d1d0(CommonConstants.EMPTY_STRING);
//创建人姓名
if (Common.isNotNull(library.getCreateName())) {
fundParam.setFd_3b43922217c6f8(library.getCreateName());
} else {
fundParam.setFd_3b43922217c6f8(CommonConstants.EMPTY_STRING);
}
//缴纳地拼接 //缴纳地拼接
StringBuilder adress = new StringBuilder(); StringBuilder adress = new StringBuilder();
adress.append(null != library.getFundProvince() ? RedisUtil.redis.opsForValue().get(CacheConstants.AREA_LABEL + library.getFundProvince()) : "") adress.append(null != library.getFundProvince() ? RedisUtil.redis.opsForValue().get(CacheConstants.AREA_LABEL + library.getFundProvince()) : "")
......
...@@ -2162,7 +2162,6 @@ ...@@ -2162,7 +2162,6 @@
<include refid="tPaymentInfo_export_push_where"/> <include refid="tPaymentInfo_export_push_where"/>
</where> </where>
GROUP BY a.EMP_IDCARD,a.SOCIAL_PAY_MONTH,a.SOCIAL_CREATE_MONTH,a.SOCIAL_PAY_ADDR GROUP BY a.EMP_IDCARD,a.SOCIAL_PAY_MONTH,a.SOCIAL_CREATE_MONTH,a.SOCIAL_PAY_ADDR
limit #{l},1000
</select> </select>
<!--tPaymentInfo合并查询--> <!--tPaymentInfo合并查询-->
...@@ -2467,7 +2466,6 @@ ...@@ -2467,7 +2466,6 @@
a.PUSH_STATUS = '1' AND a.FUND_ID IS NOT NULL AND a.CREATE_BY = #{userId} a.PUSH_STATUS = '1' AND a.FUND_ID IS NOT NULL AND a.CREATE_BY = #{userId}
<include refid="tPaymentInfo_export_where"/> <include refid="tPaymentInfo_export_where"/>
</where> </where>
limit #{k},1000
</select> </select>
<!--tPaymentInfo公积金推送查询--> <!--tPaymentInfo公积金推送查询-->
...@@ -2478,7 +2476,6 @@ ...@@ -2478,7 +2476,6 @@
FROM t_payment_info a FROM t_payment_info a
where where
a.PUSH_STATUS = '1' AND a.FUND_ID IS NOT NULL AND lOCK_STATUS = '1' a.PUSH_STATUS = '1' AND a.FUND_ID IS NOT NULL AND lOCK_STATUS = '1'
limit #{k},1000
</select> </select>
<!--tPaymentInfo社保收入推送查询--> <!--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