考勤统计

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

@@ -414,7 +414,7 @@ public class AttendancePostRecordController extends BaseController {
             queryAttendanceTeamUserRecord.setCreateBy(SecurityUtils.getUsername());
             queryAttendanceTeamUserRecord.setUserId(postRecord.getUserId());
             queryAttendanceTeamUserRecord.setCheckInType("1");
-            List<AttendanceTeamUserRecord> attendanceTeamUserRecordList = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(queryAttendanceTeamUserRecord);
+            List<AttendanceTeamUserRecord> attendanceTeamUserRecordList = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(queryAttendanceTeamUserRecord, true);
             attendanceTeamUserRecordList.forEach(attendanceTeamUserRecord -> {
                 attendanceTeamUserRecord.setUpdateBy(SecurityUtils.getUsername());
                 attendanceTeamUserRecord.setCheckInType("2");
@@ -747,7 +747,7 @@ public class AttendancePostRecordController extends BaseController {
                 .map(SysRole::getRoleKey)
                 .collect(Collectors.toList());
         if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-            Map<String, Date> shiftTime = attendancePostRecordService.getShiftTime();
+            Map<String, Date> shiftTime = attendancePostRecordService.getShiftTimeNew();
             Date shiftStartTime = shiftTime.get("start");
             Date shiftEndTime = shiftTime.get("end");
             List<AttendancePostRecord> regionalList = attendancePostRecordService
@@ -768,7 +768,7 @@ public class AttendancePostRecordController extends BaseController {
         List<String> channelCodeList = channels.stream()
                 .map(PositionInfoVO::getChannelCode)
                 .collect(Collectors.toList());
-        Map<String, Date> shiftTime = attendancePostRecordService.getShiftTime();
+        Map<String, Date> shiftTime = attendancePostRecordService.getShiftTimeNew();
         Date shiftStartTime = shiftTime.get("start");
         Date shiftEndTime = shiftTime.get("end");
         return attendancePostRecordService
@@ -786,9 +786,9 @@ public class AttendancePostRecordController extends BaseController {
             // 处理日期解析异常，使用当前日期作为默认值
             queryRecord.setAttendanceDate(new Date());
         }
-
+        queryRecord.setCheckInType("1");
         return attendanceTeamUserRecordService
-                .selectAttendanceTeamUserRecordList(queryRecord);
+                .selectAttendanceTeamUserRecordList(queryRecord, false);
     }
 
 
@@ -946,7 +946,8 @@ public class AttendancePostRecordController extends BaseController {
                 .filter(record -> StringUtils.equals(record.getTerminlCode(), terminalCode))
                 .collect(Collectors.groupingBy(AttendanceTeamUserRecord::getAttendanceTeamName));
 
-        Date date = determineShiftDate();
+//        Date date = determineShiftDate();
+        Date date = DateUtils.getNowDate();
 
         List<AttendanceRecordCountWaitDTO> waitList = new ArrayList<>();
 

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

@@ -57,7 +57,7 @@ public class AttendanceTeamUserRecordController extends BaseController {
     public AjaxResult list(AttendanceTeamUserRecord attendanceTeamUserRecord) {
         attendanceTeamUserRecord.setCreateBy(getUsername());
         attendanceTeamUserRecord.setCheckInType("1");
-        List<AttendanceTeamUserRecord> list = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(attendanceTeamUserRecord);
+        List<AttendanceTeamUserRecord> list = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(attendanceTeamUserRecord, true);
         return success(list);
     }
 
@@ -73,7 +73,7 @@ public class AttendanceTeamUserRecordController extends BaseController {
         }
         attendanceTeamUserRecord.setCreateBy(getUsername());
         attendanceTeamUserRecord.setCheckInType("1");
-        List<AttendanceTeamUserRecord> list = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(attendanceTeamUserRecord);
+        List<AttendanceTeamUserRecord> list = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(attendanceTeamUserRecord, true);
         ExcelUtil<AttendanceTeamUserRecord> util = new ExcelUtil<AttendanceTeamUserRecord>(AttendanceTeamUserRecord.class);
         util.exportExcel(response, list, "考勤班组成员数据");
     }

airport-attendance/src/main/java/com/sundot/airport/attendance/service/IAttendancePostRecordService.java

@@ -142,6 +142,13 @@ public interface IAttendancePostRecordService {
     Map<String, Date> getShiftTime();
 
     /**
+     * 获取当前班次时间
+     *
+     * @return 时间
+     */
+    Map<String, Date> getShiftTimeNew();
+
+    /**
      * 查询指定用户最近的上岗记录的考勤日期
      *
      * @param createBy 创建人

airport-attendance/src/main/java/com/sundot/airport/attendance/service/IAttendanceTeamUserRecordService.java

@@ -35,7 +35,7 @@ public interface IAttendanceTeamUserRecordService {
      * @param attendanceTeamUserRecord 考勤班组成员
      * @return 考勤班组成员集合
      */
-    public List<AttendanceTeamUserRecord> selectAttendanceTeamUserRecordList(AttendanceTeamUserRecord attendanceTeamUserRecord);
+    public List<AttendanceTeamUserRecord> selectAttendanceTeamUserRecordList(AttendanceTeamUserRecord attendanceTeamUserRecord, boolean changeDate);
 
     /**
      * 新增考勤班组成员

airport-attendance/src/main/java/com/sundot/airport/attendance/service/impl/AttendancePostRecordServiceImpl.java

@@ -269,6 +269,22 @@ public class AttendancePostRecordServiceImpl implements IAttendancePostRecordSer
     }
 
     /**
+     * 获取当前班次周期的开始和结束时间
+     *
+     * @return map  startTime:开始时间  endTime:结束时间
+     */
+    @Override
+    public Map<String, Date> getShiftTimeNew() {
+        String todayStr = DateUtils.getDate();
+        Date shiftStartTime = DateUtils.parseDate(todayStr + " " + "00:00:00");
+        Date shiftEndTime = DateUtils.parseDate(todayStr + " " + "23:59:59");
+        Map<String, Date> map = new HashMap<>();
+        map.put("start", shiftStartTime);
+        map.put("end", shiftEndTime);
+        return map;
+    }
+
+    /**
      * 查询指定用户最近的上岗记录的考勤日期
      *
      * @param createBy 创建人

airport-attendance/src/main/java/com/sundot/airport/attendance/service/impl/AttendanceRecordServiceImpl.java

@@ -251,7 +251,7 @@ public class AttendanceRecordServiceImpl implements IAttendanceRecordService {
                     AttendanceTeamUserRecord queryAttendanceTeamUserRecord = new AttendanceTeamUserRecord();
                     queryAttendanceTeamUserRecord.setCreateBy(SecurityUtils.getUsername());
                     queryAttendanceTeamUserRecord.setCheckInType("1");
-                    List<AttendanceTeamUserRecord> attendanceTeamUserRecordList = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(queryAttendanceTeamUserRecord);
+                    List<AttendanceTeamUserRecord> attendanceTeamUserRecordList = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(queryAttendanceTeamUserRecord, true);
                     attendanceTeamUserRecordList.forEach(attendanceTeamUserRecord -> {
                         attendanceTeamUserRecord.setUpdateBy(SecurityUtils.getUsername());
                         attendanceTeamUserRecord.setCheckInType("2");

airport-attendance/src/main/java/com/sundot/airport/attendance/service/impl/AttendanceTeamUserRecordServiceImpl.java

@@ -63,7 +63,7 @@ public class AttendanceTeamUserRecordServiceImpl implements IAttendanceTeamUserR
      * @return 考勤班组成员
      */
     @Override
-    public List<AttendanceTeamUserRecord> selectAttendanceTeamUserRecordList(AttendanceTeamUserRecord attendanceTeamUserRecord) {
+    public List<AttendanceTeamUserRecord> selectAttendanceTeamUserRecordList(AttendanceTeamUserRecord attendanceTeamUserRecord, boolean changeDate) {
         // 如果指定了考勤日期，则调整查询时间范围
 //        if (attendanceTeamUserRecord.getAttendanceDate() != null) {
 //            try {
@@ -86,9 +86,11 @@ public class AttendanceTeamUserRecordServiceImpl implements IAttendanceTeamUserR
 //                throw new ServiceException("日期格式化错误");
 //            }
 //        }
-        Date maxDate = attendanceTeamUserRecordMapper.selectMaxDateBy(attendanceTeamUserRecord);
-        if (maxDate != null) {
-            attendanceTeamUserRecord.setAttendanceDate(maxDate);
+        if (changeDate) {
+            Date maxDate = attendanceTeamUserRecordMapper.selectMaxDateBy(attendanceTeamUserRecord);
+            if (maxDate != null) {
+                attendanceTeamUserRecord.setAttendanceDate(maxDate);
+            }
         }
         return attendanceTeamUserRecordMapper.selectAttendanceTeamUserRecordList(attendanceTeamUserRecord);
     }
@@ -213,7 +215,7 @@ public class AttendanceTeamUserRecordServiceImpl implements IAttendanceTeamUserR
         AttendanceTeamUserRecord attendanceTeamUserRecord = new AttendanceTeamUserRecord();
         attendanceTeamUserRecord.setAttendanceDate(DateUtils.getNowDate());
         attendanceTeamUserRecord.setCheckInType("1");
-        List<AttendanceTeamUserRecord> attendanceTeamUserRecords = selectAttendanceTeamUserRecordList(attendanceTeamUserRecord);
+        List<AttendanceTeamUserRecord> attendanceTeamUserRecords = selectAttendanceTeamUserRecordList(attendanceTeamUserRecord, true);
         List<Long> collect = attendanceTeamUserRecords.stream().map(AttendanceTeamUserRecord::getAttendanceTeamId).collect(Collectors.toList());
         if (CollectionUtil.isEmpty(collect)) {
             return new ArrayList<>();

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

@@ -341,8 +341,7 @@
     <select id="selectLocationsByTimeAndChannelName" resultMap="AttendancePostRecordResult">
         <include refid="selectAttendancePostRecordVo"/>
         <where>
-            check_in_time >= #{startTime}
-            and check_in_time &lt;= #{endTime}
+            check_in_time &lt;= #{endTime}
             AND (check_out_time IS NULL
             OR check_out_time = '2000-01-01 00:00:00'
             OR check_out_time = '')
@@ -377,7 +376,6 @@
         <include refid="selectAttendancePostRecordVo"/>
         <where>
             user_id = #{userId}
-            and check_in_time >= #{startTime}
             and check_in_time &lt;= #{endTime}
             AND (check_out_time IS NULL
             OR check_out_time = '2000-01-01 00:00:00'