qt
/
weaver-bjcj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

加入境外常驻地区的艰苦地区补贴-2

This commit is contained in:
Harryxzy 2022-09-29 11:28:26 +08:00
parent 62593dd3ab
commit 6e83db95e3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/bjcj220907/entity/JKDQBT.java
View File

@ -17,7 +17,7 @@ import lombok.NoArgsConstructor;
public class JKDQBT { public class JKDQBT {
/** /**
* 天数 * 天数（1、境外常驻天数-第三国出差天数 2、第三国出差天数）
*/ */
private double days; private double days;

6
src/com/engine/bjcj220907/service/impl/OverseasAllowanceCountServiceImpl.java
View File

@ -61,6 +61,10 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse
baseBean.writeLog("获取用户在考勤周期内存在境外常驻信息过滤出来，并且计算当月境外应常驻天数及境内工作天数,共：："+results.size()); baseBean.writeLog("获取用户在考勤周期内存在境外常驻信息过滤出来，并且计算当月境外应常驻天数及境内工作天数,共：："+results.size());
// 将jwCZInfos中的艰苦地区常驻天数封装到results中 // 将jwCZInfos中的艰苦地区常驻天数封装到results中
// List<JwCZInfo> aaa = jwCZInfos.stream().sorted((a, b) -> a.getXm().compareTo(b.getXm())).collect(Collectors.toList());
// List<JWJT> bbb = results.stream().sorted((a, b) -> a.getUser().compareTo(b.getUser())).collect(Collectors.toList());
// System.out.println("hj");
// 计算考勤所属月员工的薪酬等级，获取相应的境外津贴标准 // 计算考勤所属月员工的薪酬等级，获取相应的境外津贴标准
List<String> users = results.stream().map(i -> i.getUser()).collect(Collectors.toList()); List<String> users = results.stream().map(i -> i.getUser()).collect(Collectors.toList());
Map<Integer, XcdjJwjtParam> usersXSDJ = getOverseasAllowanceDAO().getXCDJByUsers(users,startAttendanceCal); Map<Integer, XcdjJwjtParam> usersXSDJ = getOverseasAllowanceDAO().getXCDJByUsers(users,startAttendanceCal);
@ -73,7 +77,7 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse
getXcdjAndJwjtbz(results,usersXSDJ,kqDatas); getXcdjAndJwjtbz(results,usersXSDJ,kqDatas);
// TODO:验证一下188 陈涛有没有考勤数据 结果不再是0.0 // TODO:验证一下188 陈涛有没有考勤数据 结果不再是0.0
baseBean.writeLog("封装薪酬等级、境外津贴标准、考勤天数、境外实际常驻天数并计算实出勤天数、境外津贴,共:"+results.size()); baseBean.writeLog("封装薪酬等级、境外津贴标准、考勤天数、境外实际常驻天数并计算实出勤天数、境外津贴,共:"+results.size());
// 处理艰苦地区补贴 // 处理第三国出差艰苦地区补贴
} }