Commit 87e39f52 authored by huyuchen's avatar huyuchen

明细接口改造

parent 9e292f2b
......@@ -61,7 +61,7 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
socialInfo.setFd_3b16e2f436ff98_text(deptInfo.getDeptName());
socialInfo.setFd_3b16e2f436ff98(deptInfo.getFdId());
//实际结算月份
if("生成月本月数据" .equals(deptInfo.getSocialType())){
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)));
......@@ -69,7 +69,7 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
socialInfo.setFd_3adfe8cff746bc(DateUtil.dateToString(DateUtil.addMonthByDate(DateUtil.stringToDate(socialInfo.getFd_3adfe8cb96c41e(),"yyyy-MM"),1)));
}
//是否全部结算
if("全量未结算数据" .equals(deptInfo.getSocialType())){
if("全量未结算数据".equals(deptInfo.getSocialType())){
socialInfo.setFd_3b1354c3add8c2(CommonConstants.IS_TRUE);
}else {
socialInfo.setFd_3b1354c3add8c2(CommonConstants.IS_FALSE);
......@@ -99,7 +99,7 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
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()));
......
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