考勤汇总任务增加特定节假日判断

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

@@ -16,6 +16,9 @@ import com.mortals.xhx.module.attendance.model.vo.ErrorSummaryVo;
 import com.mortals.xhx.module.attendance.model.vo.LeaveSummaryVo;
 import com.mortals.xhx.module.attendance.model.vo.VacationBalanceSummaryVo;
 import com.mortals.xhx.module.attendance.service.AttendanceStaffStatService;
+import com.mortals.xhx.module.holiday.model.HolidayEntity;
+import com.mortals.xhx.module.holiday.model.HolidayQuery;
+import com.mortals.xhx.module.holiday.service.HolidayService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +49,8 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
     private AttendanceStaffStatService attendanceStaffStatService;
     @Autowired
     private AttendanceSummaryDao attendanceSummaryDao;
+    @Autowired
+    private HolidayService holidayService;
 
     @Override
     protected void findAfter(AttendanceStatEntity entity, Context context, List<AttendanceStatEntity> list) throws AppException {
@@ -158,17 +163,35 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                 now.add(Calendar.DAY_OF_MONTH, -1); //默认查前一天数据
                 query.setSummaryTime(DateUtils.getStrDate(now.getTime()));
             }
+            boolean isReturn = false;
+            //判断是否为特定节假日
+            HolidayQuery holidayQuery = new HolidayQuery();
+            holidayQuery.setStartTimeStart(query.getSummaryTime());
+            holidayQuery.setStartTimeEnd(query.getSummaryTime());
+            HolidayEntity holidayEntity = holidayService.selectOne(holidayQuery);
+            if(holidayEntity!=null){
+                if(holidayEntity.getWorkorholiday()==0){
+                    //特定节假日
+                    isReturn = true;
+                }
+            }else {
+                //判断是否为周末
                 Calendar calendar = Calendar.getInstance();
                 calendar.setTime(DateUtils.StrToDate(query.getSummaryTime()));
                 int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
                 if (dayOfWeek == Calendar.SATURDAY || dayOfWeek == Calendar.SUNDAY) {
-                return;
+                    isReturn = true;
+                }
             }
+
             Date today = DateUtils.getCurrDate();
             if (DateUtils.StrToDate(query.getSummaryTime()).compareTo(today) >= 0) {
+                //当天不统计
+                isReturn = true;
+            }
+            if(isReturn){
                 return;
             }
-
             log.info("开始汇总[" + query.getSummaryTime() + "]考勤.....");
             //汇总当前日期假期余额
             List<VacationBalanceSummaryVo> vacationBalanceSummaryVoList = attendanceSummaryDao.getVacationBalanceSummary(query);