diff --git a/src/com/engine/bjcj220907/entity/JKDQBT.java b/src/com/engine/bjcj220907/entity/JKDQBT.java index 5b8ab27..1801bfb 100644 --- a/src/com/engine/bjcj220907/entity/JKDQBT.java +++ b/src/com/engine/bjcj220907/entity/JKDQBT.java @@ -17,7 +17,7 @@ import lombok.NoArgsConstructor; public class JKDQBT { /** - * 天数 + * 天数(1、境外常驻天数-第三国出差天数 2、第三国出差天数) */ private double days; diff --git a/src/com/engine/bjcj220907/service/impl/OverseasAllowanceCountServiceImpl.java b/src/com/engine/bjcj220907/service/impl/OverseasAllowanceCountServiceImpl.java index f1c64eb..3dd5153 100644 --- a/src/com/engine/bjcj220907/service/impl/OverseasAllowanceCountServiceImpl.java +++ b/src/com/engine/bjcj220907/service/impl/OverseasAllowanceCountServiceImpl.java @@ -61,6 +61,10 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse baseBean.writeLog("获取用户在考勤周期内存在境外常驻信息过滤出来,并且计算当月境外应常驻天数及境内工作天数,共::"+results.size()); // 将jwCZInfos中的艰苦地区常驻天数封装到results中 +// List aaa = jwCZInfos.stream().sorted((a, b) -> a.getXm().compareTo(b.getXm())).collect(Collectors.toList()); +// List bbb = results.stream().sorted((a, b) -> a.getUser().compareTo(b.getUser())).collect(Collectors.toList()); +// System.out.println("hj"); + // 计算考勤所属月员工的薪酬等级,获取相应的境外津贴标准 List users = results.stream().map(i -> i.getUser()).collect(Collectors.toList()); Map usersXSDJ = getOverseasAllowanceDAO().getXCDJByUsers(users,startAttendanceCal); @@ -73,7 +77,7 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse getXcdjAndJwjtbz(results,usersXSDJ,kqDatas); // TODO:验证一下188 陈涛有没有考勤数据 结果不再是0.0 baseBean.writeLog("封装薪酬等级、境外津贴标准、考勤天数、境外实际常驻天数并计算实出勤天数、境外津贴,共:"+results.size()); - // 处理艰苦地区补贴 + // 处理第三国出差艰苦地区补贴 }