fix-离职人员bug
This commit is contained in:
parent
65c07e5960
commit
1bb79f42a1
|
|
@ -47,9 +47,10 @@ public class MonthBonusCountServiceImpl extends Service implements MonthBonusCou
|
|||
// 获取已经离职并且已经发放过绩效的人员信息
|
||||
baseBean.writeLog("获取已经离职并且已经发放过绩效的人员信息");
|
||||
List<Integer> haveSendDepartureInfo = getMonthBonusDAO().getHaveSendDepartureInfo().stream().map(i->i.getXm()).collect(Collectors.toList());
|
||||
baseBean.writeLog("获取已经离职并且已经发放过绩效的人员信息"+haveSendDepartureInfo+" 共:"+haveSendDepartureInfo.size());
|
||||
// 获取所有人的绩效等级 --> 绩效系数
|
||||
baseBean.writeLog("获取所有人的绩效等级、绩效系数等信息");
|
||||
List<CountMonthBonus> result = getMonthBonusDAO().getJXInfo(bonusSendMonth,bonusMonth,bonusYear,bonusSeason,haveSendDepartureInfo);
|
||||
baseBean.writeLog("获取所有人的绩效等级、绩效系数等信息,共计:"+result.size());
|
||||
// 获取所有本月(薪资发放月)离职人员信息
|
||||
List<DepartureInfo> departureInfo = getMonthBonusDAO().getDepartureInfo(bonusSendMonth);
|
||||
baseBean.writeLog("发放月离职人员信息:"+departureInfo);
|
||||
|
|
@ -83,7 +84,7 @@ public class MonthBonusCountServiceImpl extends Service implements MonthBonusCou
|
|||
|
||||
// 获取所有人的境外常驻信息
|
||||
List<JwCZInfoDetail> czInfos = getMonthBonusDAO().getCZInfo();
|
||||
baseBean.writeLog("获取所有人的境外常驻信息");
|
||||
baseBean.writeLog("获取所有人的境外常驻信息,共:"+czInfos.size());
|
||||
// 将境外常驻信息格式化
|
||||
List<JwCZInfo> jwCZInfos = formatJwCZInfo(czInfos);
|
||||
baseBean.writeLog("将境外常驻信息格式化");
|
||||
|
|
@ -263,8 +264,8 @@ public class MonthBonusCountServiceImpl extends Service implements MonthBonusCou
|
|||
}
|
||||
});
|
||||
// 先删除建模中脏数据
|
||||
baseBean.writeLog("先删除建模中脏数据");
|
||||
getMonthBonusDAO().clear(bonusMonth,bonusSendMonth,haveSendDepartureInfo);
|
||||
baseBean.writeLog("先删除建模中脏数据");
|
||||
// 将数据插入建模中
|
||||
List<Integer> departureUsers = departureInfo.stream().map(i -> i.getXm()).collect(Collectors.toList());
|
||||
baseBean.writeLog("将数据插入建模中");
|
||||
|
|
|
|||
Loading…
Reference in New Issue