合并分支 'gwj' 到 'master'

notes-attendance/src/main/java/com/zjty/tynotes/attendance/service/impl/AttendanceDetailsServiceImpl.java

@@ -61,7 +61,15 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
             calendar.add(Calendar.MONTH,1);
             calendar.set(Calendar.DAY_OF_MONTH,0);
             Date endTime = calendar.getTime();
+            Day day = dayDao.findByStatusAndDateEquals("0", startTime);
+            Day day2 = dayDao.findByStatusAndDateEquals("0", endTime);
             List<Day> days = dayDao.findAllByStatusAndDateBetween("0", startTime, endTime);
+            if(day!=null){
+                days.add(day);
+            }
+            if(day2!=null){
+                days.add(day2);
+            }
             AttendanceDetails allByUserIdAndAttenDate1 = attendanceDetailsDao.findByUserIdAndAttenDate(request.getId(), startTime);
             AttendanceDetails allByUserIdAndAttenDate2 = attendanceDetailsDao.findByUserIdAndAttenDate(request.getId(), endTime);
             List<AttendanceDetails> attendanceDetailsList = attendanceDetailsDao.findAllByUserIdAndAttenDateBetween(request.getId(), startTime, endTime);