Commit 7099f031 authored by 廖旭伟's avatar 廖旭伟

考勤汇总时正常考勤增加一条正常明细

parent 61abed36
...@@ -236,6 +236,8 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc ...@@ -236,6 +236,8 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
log.info("考勤人数:"+vacationBalanceSummaryVoList.size()); log.info("考勤人数:"+vacationBalanceSummaryVoList.size());
List<AttendanceStatEntity> insertList = new ArrayList<>(); List<AttendanceStatEntity> insertList = new ArrayList<>();
List<AttendanceStatEntity> updateList = new ArrayList<>(); List<AttendanceStatEntity> updateList = new ArrayList<>();
List<AttendanceStaffStatEntity> addStaffStat = new ArrayList<>();
List<AttendanceStaffStatEntity> updateStaffStat = new ArrayList<>();
for (VacationBalanceSummaryVo item : vacationBalanceSummaryVoList) { for (VacationBalanceSummaryVo item : vacationBalanceSummaryVoList) {
if(item.getStatus() == StaffSatusEnum.离职.getValue()){ if(item.getStatus() == StaffSatusEnum.离职.getValue()){
//离职状态时判断当前汇总日期是否在离职后 //离职状态时判断当前汇总日期是否在离职后
...@@ -291,6 +293,20 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc ...@@ -291,6 +293,20 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
attendanceStatEntity.setUpdateTime(new Date()); attendanceStatEntity.setUpdateTime(new Date());
updateList.add(attendanceStatEntity); updateList.add(attendanceStatEntity);
} }
AttendanceStaffStatEntity staffStat = new AttendanceStaffStatEntity();
staffStat.initAttrValue();
BeanUtils.copyProperties(item, staffStat, BeanUtil.getNullPropertyNames(item));
staffStat.setAttendanceSummary("正常");
AttendanceStaffStatEntity staffStatTemp = attendanceStaffStatService.selectOne(new AttendanceStaffStatQuery().staffId(item.getStaffId()).year(item.getYear()).month(item.getMonth()).day(item.getDay()));
if (staffStatTemp != null) {
staffStat.setId(staffStatTemp.getId());
staffStat.setUpdateTime(new Date());
updateStaffStat.add(staffStat);
} else {
staffStat.setCreateTime(DateUtils.StrToDate(query.getSummaryTime()));
staffStat.setCreateUserId(1l);
addStaffStat.add(staffStat);
}
} }
if(insertList.size()>0){ if(insertList.size()>0){
this.dao.insertBatch(insertList); this.dao.insertBatch(insertList);
...@@ -298,6 +314,12 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc ...@@ -298,6 +314,12 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
if(updateList.size()>0){ if(updateList.size()>0){
this.dao.updateBatch(updateList); this.dao.updateBatch(updateList);
} }
if(addStaffStat.size()>0){
attendanceStaffStatService.save(addStaffStat);
}
if(updateStaffStat.size()>0){
attendanceStaffStatService.update(updateStaffStat);
}
} }
log.info("完成汇总当前日期假期余额....."); log.info("完成汇总当前日期假期余额.....");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment