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

艰苦地区调整

This commit is contained in:
Harryxzy 2022-12-27 15:34:49 +08:00
parent 68feb15660
commit e2ab5a1340
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/bjcj220907/service/impl/GetKQ4OverseasAllowanceCountServiceImpl.java
View File

@ -85,7 +85,7 @@ public class GetKQ4OverseasAllowanceCountServiceImpl extends Service implements
List<Date> qqDate = new ArrayList<>(); List<Date> qqDate = new ArrayList<>();
attDateList.stream().forEach(a -> { attDateList.stream().forEach(a -> {
Object o = i.get(sdf.format(a)); Object o = i.get(sdf.format(a));
baseBean.writeLog("i.get(sdf.format(a)) o:"+o); // baseBean.writeLog("i.get(sdf.format(a)) o:"+o);
String attCal = ""; String attCal = "";
try{ try{
Map attCalMap =(Map) o; Map attCalMap =(Map) o;

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

@ -42,10 +42,6 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse
*/ */
@Override @Override
public void countOverseasAllowance(Calendar countCal) { public void countOverseasAllowance(Calendar countCal) {
//TODO
countCal.set(Calendar.MONTH,9);
// 境外津贴包含：境外津贴（天标准）+境外工龄补贴（月标准）+艰苦地区补贴（天标准） // 境外津贴包含：境外津贴（天标准）+境外工龄补贴（月标准）+艰苦地区补贴（天标准）
// 考勤开始日期 // 考勤开始日期
Calendar startAttendanceCal = BjcjCommonUtils.getStartAttendanceCal(countCal.getTime()); Calendar startAttendanceCal = BjcjCommonUtils.getStartAttendanceCal(countCal.getTime());
@ -105,6 +101,7 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse
* @date 2022/12/23 18:04 * @date 2022/12/23 18:04
*/ */
private void handleJkdqDays(List<JWJT> results, Map<String, Object> kqData, Map<Integer, List<JwCZInfoDetail>> gwhgInfos) { private void handleJkdqDays(List<JWJT> results, Map<String, Object> kqData, Map<Integer, List<JwCZInfoDetail>> gwhgInfos) {
baseBean.writeLog("开始处理艰苦地区补贴天数");
results.forEach(result -> { results.forEach(result -> {
// 获取境外常驻的艰苦地区 和 第三国出差及境外国内出差的艰苦地区 // 获取境外常驻的艰苦地区 和 第三国出差及境外国内出差的艰苦地区
ArrayList<JKDQBT> dsgAndJwgncc = new ArrayList<>(); ArrayList<JKDQBT> dsgAndJwgncc = new ArrayList<>();
@ -132,10 +129,8 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse
List<Date> qqDate = (List <Date>) kqData.get(result.getUser() + "-qq"); List<Date> qqDate = (List <Date>) kqData.get(result.getUser() + "-qq");
// 公务回国List // 公务回国List
List<JwCZInfoDetail> gwhgList = gwhgInfos.get(new Integer(result.getUser())); List<JwCZInfoDetail> gwhgList = gwhgInfos.get(new Integer(result.getUser()));
if(result.getUser().equals("109")){ baseBean.writeLog(result.getUser()+"缺勤List："+qqDate);
System.out.println("-"); baseBean.writeLog(result.getUser()+"公务回国List："+gwhgList);
}
// 减去缺勤、公务回国 // 减去缺勤、公务回国
jwcc.stream().forEach(cc -> { jwcc.stream().forEach(cc -> {
Calendar countKs = Calendar.getInstance(); Calendar countKs = Calendar.getInstance();
@ -165,6 +160,7 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse
}); });
}); });
baseBean.writeLog("处理艰苦地区补贴天数结束");
} }