核算四项补助合计

This commit is contained in:
Harryxzy 2022-09-30 09:35:29 +08:00
parent bfa7831e08
commit 3d9116b6ea
1 changed files with 7 additions and 6 deletions

View File

@ -68,8 +68,8 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse
Map<String, Double> kqDatas = GetKQ4OverseasAllowanceCountService().getKQDatas(build);
baseBean.writeLog("调用考勤接口获取公务回国天数 及 缺勤天数,共:"+usersXSDJ.size());
// 封装薪酬等级境外津贴标准考勤天数四项补助合计
int days = BjcjCommonUtils.getDays(startAttendanceCal.getTime(), endAttendanceCal.getTime());
getXcdjAndJwjtbz(results,usersXSDJ,kqDatas,days);
// int days = BjcjCommonUtils.getDays(startAttendanceCal.getTime(), endAttendanceCal.getTime());
getXcdjAndJwjtbz(results,usersXSDJ,kqDatas);
// TODO:验证一下188 陈涛有没有考勤数据 结果不再是0.00
baseBean.writeLog("封装薪酬等级、境外津贴标准、考勤天数、境外实际常驻天数并计算实出勤天数、境外津贴,共:"+results.size());
// 处理第三国出差(2)境外国内出差3艰苦地区补贴
@ -202,13 +202,13 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse
* @author Harryxzy
* @date 2022/9/27 15:37
*/
public void getXcdjAndJwjtbz(List<JWJT> results ,Map<Integer, XcdjJwjtParam> usersXSDJ,Map<String, Double> kqDatas,int kqDays){
public void getXcdjAndJwjtbz(List<JWJT> results ,Map<Integer, XcdjJwjtParam> usersXSDJ,Map<String, Double> kqDatas){
results.stream().forEach(item-> {
XcdjJwjtParam param = usersXSDJ.get(Integer.valueOf(item.getUser()));
item.setXcdj(param.getXcdj());
item.setJwjtbz(param.getJwjtbz());
item.setSxbzhjbz(param.getSxbzhj());
item.setSxbzhjrbz(param.getSxbzhj()/kqDays);
item.setSxbzhjrbz(param.getSxbzhj()/21.75);
if(kqDatas.get(item.getUser() + "-qq") == null){
// 目前该员工没有考勤数据
item.setQq(0.0);
@ -286,8 +286,9 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse
* @date 2022/9/29 17:59
*/
private void countSxbthj(List<JWJT> results) {
results.stream().forEach(i->{
// 获取员工的公务回国天数和国内工作日天数
results.stream().forEach(result->{
// 获取员工的公务回国天数和国内工作日天数 * 四项补助日标准
result.setSxbzhj((result.getGngzts()+result.getGwhgWorkdays()) * result.getSxbzhjrbz());
});
}