考勤统计

airport-admin/src/main/java/com/sundot/airport/web/controller/attendance/AttendancePostRecordController.java

@@ -780,12 +780,12 @@ public class AttendancePostRecordController extends BaseController {
      */
     private List<AttendanceTeamUserRecord> getMaintainRecords() {
         AttendanceTeamUserRecord queryRecord = new AttendanceTeamUserRecord();
-        try {
-            queryRecord.setAttendanceDate(DateUtils.parseDate(DateUtils.getDate()));
-        } catch (Exception e) {
-            // 处理日期解析异常，使用当前日期作为默认值
-            queryRecord.setAttendanceDate(new Date());
-        }
+//        try {
+//            queryRecord.setAttendanceDate(DateUtils.parseDate(DateUtils.getDate()));
+//        } catch (Exception e) {
+//            // 处理日期解析异常，使用当前日期作为默认值
+//            queryRecord.setAttendanceDate(new Date());
+//        }
         queryRecord.setCheckInType("1");
         return attendanceTeamUserRecordService
                 .selectAttendanceTeamUserRecordList(queryRecord, false);

airport-attendance/src/main/resources/mapper/attendance/AttendancePostRecordMapper.xml

@@ -358,7 +358,7 @@
     <select id="selectCheckOutTimeByShiftCodes" resultMap="AttendancePostRecordResult">
         <include refid="selectAttendancePostRecordVo"/>
         <where>
-            DATE(attendance_date) = DATE(#{today})
+            DATE(attendance_date) &lt;= DATE(#{today})
             <if test="shiftCodes != null and shiftCodes.size() > 0">
                 AND shift_code IN
                 <foreach collection="shiftCodes" item="shiftCode" open="(" separator="," close=")">
@@ -406,7 +406,7 @@
         <include refid="selectAttendancePostRecordVo"/>
         <where>
             attendance_team_id = #{attendanceTeamId}
-            AND attendance_date = DATE(#{date})
+            AND attendance_date &lt;= DATE(#{date})
             AND (
             check_out_time >= #{date}
             OR check_out_time = '2000-01-01 00:00:00'