勤务模块

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

@@ -1023,8 +1023,8 @@ public class AttendancePostRecordController extends BaseController {
             return;
         }
 
-        List<String> terminalCodes = waitList.stream()
-                .map(AttendanceRecordCountWaitDTO::getTerminlCode)
+        List<Long> terminalCodes = waitList.stream()
+                .map(AttendanceRecordCountWaitDTO::getWaitTeamCode)
                 .distinct()
                 .collect(Collectors.toList());
 
@@ -1035,15 +1035,15 @@ public class AttendancePostRecordController extends BaseController {
         List<AttendancePostRecord> checkoutRecords = attendancePostRecordService
                 .selectCheckOutTimeByShiftCodes(DateUtil.beginOfDay(new Date()), terminalCodes);
 
-        Map<String, List<AttendancePostRecord>> checkoutGroup = checkoutRecords.stream()
-                .collect(Collectors.groupingBy(AttendancePostRecord::getTerminlCode));
+        Map<Long, List<AttendancePostRecord>> checkoutGroup = checkoutRecords.stream()
+                .collect(Collectors.groupingBy(AttendancePostRecord::getAttendanceTeamId));
 
         if (checkoutGroup.isEmpty()) {
             return;
         }
 
         waitList.forEach(waitDTO -> {
-            List<AttendancePostRecord> records = checkoutGroup.get(waitDTO.getTerminlCode());
+            List<AttendancePostRecord> records = checkoutGroup.get(waitDTO.getWaitTeamCode());
             if (records != null && !records.isEmpty()) {
                 waitDTO.setCheckOutTime(records.get(0).getCheckOutTime());
             }

airport-attendance/src/main/java/com/sundot/airport/attendance/mapper/AttendancePostRecordMapper.java

@@ -105,7 +105,7 @@ public interface AttendancePostRecordMapper {
      * @param shiftCodes
      * @return
      */
-    List<AttendancePostRecord> selectCheckOutTimeByShiftCodes(@Param("today") Date today, @Param("shiftCodes") List<String> shiftCodes);
+    List<AttendancePostRecord> selectCheckOutTimeByShiftCodes(@Param("today") Date today, @Param("shiftCodes") List<Long> shiftCodes);
 
     /**
      * @return

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

@@ -105,7 +105,7 @@ public interface IAttendancePostRecordService {
      * @param shiftCodes
      * @return
      */
-    public List<AttendancePostRecord> selectCheckOutTimeByShiftCodes(Date today, List<String> shiftCodes);
+    public List<AttendancePostRecord> selectCheckOutTimeByShiftCodes(Date today, List<Long> shiftCodes);
 
     /**
      * 获取当前时间下科长的在岗区域

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

@@ -166,7 +166,7 @@ public class AttendancePostRecordServiceImpl implements IAttendancePostRecordSer
      * @return
      */
     @Override
-    public List<AttendancePostRecord> selectCheckOutTimeByShiftCodes(Date today, List<String> shiftCodes) {
+    public List<AttendancePostRecord> selectCheckOutTimeByShiftCodes(Date today, List<Long> shiftCodes) {
         return attendancePostRecordMapper.selectCheckOutTimeByShiftCodes(today, shiftCodes);
     }
 

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

@@ -360,7 +360,7 @@
         <where>
             DATE(attendance_date) &lt;= DATE(#{today})
             <if test="shiftCodes != null and shiftCodes.size() > 0">
-                AND shift_code IN
+                AND attendance_team_id IN
                 <foreach collection="shiftCodes" item="shiftCode" open="(" separator="," close=")">
                     #{shiftCode}
                 </foreach>