Commit bf696e68 authored by 廖旭伟's avatar 廖旭伟

蓬溪问题处理

parent 5dbaf3b5
...@@ -41,6 +41,7 @@ public class AttendSummaryService implements IApplicationStartedService { ...@@ -41,6 +41,7 @@ public class AttendSummaryService implements IApplicationStartedService {
try { try {
AttendanceSummaryQuery query = cacheService.brpop(KEY_ATTENDANCE_STAT_CACHE, 60,AttendanceSummaryQuery.class); AttendanceSummaryQuery query = cacheService.brpop(KEY_ATTENDANCE_STAT_CACHE, 60,AttendanceSummaryQuery.class);
if(!ObjectUtils.isEmpty(query)){ if(!ObjectUtils.isEmpty(query)){
Thread.sleep(2000);
if (StringUtils.isNotEmpty(query.getSummaryTimeStart()) && StringUtils.isNotEmpty(query.getSummaryTimeEnd())) { if (StringUtils.isNotEmpty(query.getSummaryTimeStart()) && StringUtils.isNotEmpty(query.getSummaryTimeEnd())) {
List<String> dateList = getDatesBetween(query.getSummaryTimeStart(), query.getSummaryTimeEnd()); List<String> dateList = getDatesBetween(query.getSummaryTimeStart(), query.getSummaryTimeEnd());
for (String day : dateList) { for (String day : dateList) {
......
...@@ -338,12 +338,10 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc ...@@ -338,12 +338,10 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
if (staffStatTemp != null) { if (staffStatTemp != null) {
staffStat.setId(staffStatTemp.getId()); staffStat.setId(staffStatTemp.getId());
staffStat.setUpdateTime(new Date()); staffStat.setUpdateTime(new Date());
log.info(JSON.toJSONString(staffStat));
updateStaffStat.add(staffStat); updateStaffStat.add(staffStat);
} else { } else {
staffStat.setCreateTime(DateUtils.StrToDate(query.getSummaryTime())); staffStat.setCreateTime(DateUtils.StrToDate(query.getSummaryTime()));
staffStat.setCreateUserId(1l); staffStat.setCreateUserId(1l);
log.info(JSON.toJSONString(staffStat));
addStaffStat.add(staffStat); addStaffStat.add(staffStat);
} }
} }
...@@ -354,12 +352,10 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc ...@@ -354,12 +352,10 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
this.dao.updateBatch(updateList); this.dao.updateBatch(updateList);
} }
if(addStaffStat.size()>0){ if(addStaffStat.size()>0){
int u = attendanceStaffStatService.save(addStaffStat); attendanceStaffStatService.save(addStaffStat);
log.info("attendanceStaffStatService新增数据:"+u);
} }
if(updateStaffStat.size()>0){ if(updateStaffStat.size()>0){
int u = attendanceStaffStatService.update(updateStaffStat); attendanceStaffStatService.update(updateStaffStat);
log.info("attendanceStaffStatService更新数据:"+u);
} }
} }
log.info("完成汇总当前日期假期余额....."); log.info("完成汇总当前日期假期余额.....");
...@@ -450,13 +446,13 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc ...@@ -450,13 +446,13 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
staffStat.setId(staffStatTemp.getId()); staffStat.setId(staffStatTemp.getId());
staffStat.setUpdateTime(new Date()); staffStat.setUpdateTime(new Date());
//attendanceStaffStatService.update(staffStat); //attendanceStaffStatService.update(staffStat);
log.info(JSON.toJSONString(staffStat)); //log.info(JSON.toJSONString(staffStat));
updateStaffStat.add(staffStat); updateStaffStat.add(staffStat);
} else { } else {
staffStat.setCreateTime(DateUtils.StrToDate(query.getSummaryTime())); staffStat.setCreateTime(DateUtils.StrToDate(query.getSummaryTime()));
staffStat.setCreateUserId(1l); staffStat.setCreateUserId(1l);
//attendanceStaffStatService.save(staffStat); //attendanceStaffStatService.save(staffStat);
log.info(JSON.toJSONString(staffStat)); //log.info(JSON.toJSONString(staffStat));
addStaffStat.add(staffStat); addStaffStat.add(staffStat);
} }
} }
...@@ -464,12 +460,12 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc ...@@ -464,12 +460,12 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
this.dao.updateBatch(updateList); this.dao.updateBatch(updateList);
} }
if(addStaffStat.size()>0){ if(addStaffStat.size()>0){
int u = attendanceStaffStatService.save(addStaffStat); ttendanceStaffStatService.save(addStaffStat);
log.info("attendanceStaffStatService新增数据:"+u); //log.info("attendanceStaffStatService新增数据:"+u);
} }
if(updateStaffStat.size()>0){ if(updateStaffStat.size()>0){
int u = attendanceStaffStatService.update(updateStaffStat); ttendanceStaffStatService.update(updateStaffStat);
log.info("attendanceStaffStatService更新数据:"+u); //log.info("attendanceStaffStatService更新数据:"+u);
} }
} }
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