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

fix-请假bug

This commit is contained in:
Harryxzy 2022-09-20 13:43:56 +08:00
parent 1bb79f42a1
commit 071483db7c
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/engine/bjcj220907/service/impl/GetKQ4MonthBonusServiceImpl.java
View File

@ -39,8 +39,8 @@ public class GetKQ4MonthBonusServiceImpl extends Service implements GetKQ4MonthB
try {
Map<String, Object> paramsMap = new HashMap<String, Object>();
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<Map> children =(List<Map>) 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<Map<String, String>>) execute.get("datas");
// 获取每个人的缺勤天数
Map<String, Double> qqDays = new HashMap<>();
@ -99,7 +100,4 @@ public class GetKQ4MonthBonusServiceImpl extends Service implements GetKQ4MonthB
}
return null;
}
}

8
src/com/engine/bjcj220907/service/impl/MonthBonusCountServiceImpl.java
View File

@ -91,7 +91,7 @@ public class MonthBonusCountServiceImpl extends Service implements MonthBonusCou
// 获取所有用户考勤模块中缺勤天数
Attend4MonthBonus p = Attend4MonthBonus.builder().beginDate(startAttendanceCal.getTime()).endDate(endAttendanceCal.getTime()).build();
Map<String, Double> qqDatas = getKQ4MonthBonusService().getKQDatas(p);
baseBean.writeLog("获取所有用户考勤模块中缺勤天数");
baseBean.writeLog("获取所有用户考勤模块中缺勤天数"+qqDatas);
// 循环将离职人员的各个月的缺勤天数取到
Map<String, Double> qqDatasDepar= new HashMap<>();
for(int i=0;i<departureTemp.size();i++){
@ -99,7 +99,7 @@ public class MonthBonusCountServiceImpl extends Service implements MonthBonusCou
Date eaDate = getEndAttendanceCal(departureTemp.get(i).getKqyf()).getTime();
qqDatasDepar.putAll(getKQ4MonthBonusService().getKQDatas(Attend4MonthBonus.builder().beginDate(saDate).endDate(eaDate).user(Integer.valueOf(departureTemp.get(i).getXm())).build()));
}
baseBean.writeLog("获取所有离职人员的各个月的缺勤天数");
baseBean.writeLog("获取所有离职人员的各个月的缺勤天数"+qqDatasDepar);
// 将缺勤信息合并
qqDatas.putAll(qqDatasDepar);
baseBean.writeLog("所有人员的各个月的缺勤天数"+qqDatas);
@ -265,10 +265,10 @@ public class MonthBonusCountServiceImpl extends Service implements MonthBonusCou
});
// 先删除建模中脏数据
getMonthBonusDAO().clear(bonusMonth,bonusSendMonth,haveSendDepartureInfo);
baseBean.writeLog("先删除建模中脏数据");
baseBean.writeLog("先删除建模中脏数据"+bonusMonth+bonusSendMonth+haveSendDepartureInfo);
// 将数据插入建模中
List<Integer> departureUsers = departureInfo.stream().map(i -> i.getXm()).collect(Collectors.toList());
baseBean.writeLog("将数据插入建模中");
baseBean.writeLog("将数据插入建模中共："+result.size());
getMonthBonusDAO().insertList(result,departureUsers,bonusSendMonth);
return "null";

2
weaver-bjcj.iml
View File

@ -10,7 +10,7 @@
<entry key="lastExternalPluginCheckTime" value="1663248149371" />
</map>
</option>
<option name="version" value="3" />
<option name="version" value="4" />
</configuration>
</facet>
</component>