考勤汇总任务优化

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/AttendanceSummaryTaskImpl.java

@@ -35,15 +35,15 @@ public class AttendanceSummaryTaskImpl  implements ITaskExcuteService {
         //考勤汇总前先自动处理前一天的异常考勤数据
         Calendar now = Calendar.getInstance();
         now.setTime(new Date());
-        now.add(Calendar.DAY_OF_MONTH, -1); //默认查前一天数据
+//        now.add(Calendar.DAY_OF_MONTH, -1); //默认查前一天数据
 //        attendanceRecordErrorService.doAutoProcess(now.getTime());
 
         AttendanceSummaryQuery query = new AttendanceSummaryQuery();
         query.setSummaryTimeEnd(DateUtils.getStrDate(now.getTime()));
-        now.add(Calendar.DAY_OF_MONTH, -19);
+        now.add(Calendar.DAY_OF_MONTH, -10);
         query.setSummaryTimeStart(DateUtils.getStrDate(now.getTime()));
         log.info("考勤汇总时间:"+DateUtils.getDateTime(now.getTime(),"yyyy-MM-dd HH:mm:ss"));
-        //重新汇总最近20天的考勤数据
+        //重新汇总最近10天的考勤数据
         cacheService.lpush(KEY_ATTENDANCE_STAT_CACHE,query);
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java

@@ -206,11 +206,11 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                 }
             }
 
-            Date today = DateUtils.getCurrDate();
-            if (DateUtils.StrToDate(query.getSummaryTime()).compareTo(today) >= 0) {
-                //当天不统计
-                isReturn = true;
-            }
+//            Date today = DateUtils.getCurrDate();
+//            if (DateUtils.StrToDate(query.getSummaryTime()).compareTo(today) >= 0) {
+//                //当天不统计
+//                isReturn = true;
+//            }
             if (isReturn) {
                 return;
             }
@@ -256,12 +256,29 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                         //BeanUtils.copyProperties(item, temp, BeanUtil.getNullPropertyNames(item));
                         //temp.setUpdateTime(new Date());
                         //this.dao.update(temp);
-                        //updateList.add(temp);
+                        AttendanceStatEntity attendanceStatEntity = new AttendanceStatEntity();
+                        attendanceStatEntity.initAttrValue();
+                        attendanceStatEntity.setStaffId(item.getStaffId());
+                        attendanceStatEntity.setStaffName(item.getStaffName());
+                        attendanceStatEntity.setDeptId(item.getDeptId());
+                        attendanceStatEntity.setDeptName(item.getDeptName());
+                        attendanceStatEntity.setPhoneNumer(item.getPhoneNumber());
+                        attendanceStatEntity.setYear(item.getYear());
+                        attendanceStatEntity.setMonth(item.getMonth());
+                        attendanceStatEntity.setDay(item.getDay());
+                        attendanceStatEntity.setGoTimes(1);   //默认当天全勤
+                        attendanceStatEntity.setId(temp.getId());
+                        attendanceStatEntity.setUpdateTime(new Date());
+                        updateList.add(attendanceStatEntity);
+                        updateList.add(temp);
                     }
                 }
                 if(insertList.size()>0){
                     this.dao.insertBatch(insertList);
                 }
+                if(updateList.size()>0){
+                    this.dao.updateBatch(updateList);
+                }
             }
             log.info("完成汇总当前日期假期余额.....");