From 3d9116b6ea5df86c87d94e98473ea5ced8bd9cbd Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Fri, 30 Sep 2022 09:35:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E7=AE=97=E5=9B=9B=E9=A1=B9=E8=A1=A5?= =?UTF-8?q?=E5=8A=A9=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OverseasAllowanceCountServiceImpl.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/com/engine/bjcj220907/service/impl/OverseasAllowanceCountServiceImpl.java b/src/com/engine/bjcj220907/service/impl/OverseasAllowanceCountServiceImpl.java index 99b11f5..53cd2f6 100644 --- a/src/com/engine/bjcj220907/service/impl/OverseasAllowanceCountServiceImpl.java +++ b/src/com/engine/bjcj220907/service/impl/OverseasAllowanceCountServiceImpl.java @@ -68,8 +68,8 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse Map 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 results ,Map usersXSDJ,Map kqDatas,int kqDays){ + public void getXcdjAndJwjtbz(List results ,Map usersXSDJ,Map 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 results) { - results.stream().forEach(i->{ - // 获取员工的公务回国天数和国内工作日天数 + results.stream().forEach(result->{ + // 获取员工的公务回国天数和国内工作日天数 * 四项补助日标准 + result.setSxbzhj((result.getGngzts()+result.getGwhgWorkdays()) * result.getSxbzhjrbz()); }); }