diff --git a/src/com/engine/bjcj220907/service/impl/GetKQ4MonthBonusServiceImpl.java b/src/com/engine/bjcj220907/service/impl/GetKQ4MonthBonusServiceImpl.java index 0c2f635..a620488 100644 --- a/src/com/engine/bjcj220907/service/impl/GetKQ4MonthBonusServiceImpl.java +++ b/src/com/engine/bjcj220907/service/impl/GetKQ4MonthBonusServiceImpl.java @@ -39,8 +39,8 @@ public class GetKQ4MonthBonusServiceImpl extends Service implements GetKQ4MonthB try { Map paramsMap = new HashMap(); paramsMap.put("typeselect", "6"); - paramsMap.put("pageIndex", 1); - paramsMap.put("pageSize", 10000); + paramsMap.put("pageIndex", 1); + paramsMap.put("pageSize", 10000); paramsMap.put("fromDate", sdf.format(attend4MonthBonus.getBeginDate())); paramsMap.put("toDate", sdf.format(attend4MonthBonus.getEndDate())); paramsMap.put("viewScope", "0"); @@ -62,11 +62,12 @@ public class GetKQ4MonthBonusServiceImpl extends Service implements GetKQ4MonthB List children =(List) column.get("children"); children.stream().forEach(i->{ if((!i.get("title").equals("境内年假")) && (!i.get("title").equals("境外年假")) && (!i.get("title").equals("奖励假")) && (!i.get("title").equals("工伤")) && (!i.get("title").equals("隔离假")) ){ - c.add(column.get("dataIndex")); + c.add(i.get("dataIndex")); } }); } }); + baseBean.writeLog("计算缺勤列:"+c); dataList = (List>) execute.get("datas"); // 获取每个人的缺勤天数 Map qqDays = new HashMap<>(); @@ -99,7 +100,4 @@ public class GetKQ4MonthBonusServiceImpl extends Service implements GetKQ4MonthB } return null; } - - - } diff --git a/src/com/engine/bjcj220907/service/impl/MonthBonusCountServiceImpl.java b/src/com/engine/bjcj220907/service/impl/MonthBonusCountServiceImpl.java index f47dc0f..4d5cbdd 100644 --- a/src/com/engine/bjcj220907/service/impl/MonthBonusCountServiceImpl.java +++ b/src/com/engine/bjcj220907/service/impl/MonthBonusCountServiceImpl.java @@ -91,7 +91,7 @@ public class MonthBonusCountServiceImpl extends Service implements MonthBonusCou // 获取所有用户考勤模块中缺勤天数 Attend4MonthBonus p = Attend4MonthBonus.builder().beginDate(startAttendanceCal.getTime()).endDate(endAttendanceCal.getTime()).build(); Map qqDatas = getKQ4MonthBonusService().getKQDatas(p); - baseBean.writeLog("获取所有用户考勤模块中缺勤天数"); + baseBean.writeLog("获取所有用户考勤模块中缺勤天数"+qqDatas); // 循环将离职人员的各个月的缺勤天数取到 Map qqDatasDepar= new HashMap<>(); for(int i=0;i departureUsers = departureInfo.stream().map(i -> i.getXm()).collect(Collectors.toList()); - baseBean.writeLog("将数据插入建模中"); + baseBean.writeLog("将数据插入建模中共:"+result.size()); getMonthBonusDAO().insertList(result,departureUsers,bonusSendMonth); return "null"; diff --git a/weaver-bjcj.iml b/weaver-bjcj.iml index 6c9fbdd..3e39e95 100644 --- a/weaver-bjcj.iml +++ b/weaver-bjcj.iml @@ -10,7 +10,7 @@ -