chenshudong месяцев назад: 4
Родитель
Сommit
741670e182

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

@@ -1023,8 +1023,8 @@ public class AttendancePostRecordController extends BaseController {
1023
             return;
1023
             return;
1024
         }
1024
         }
1025
 
1025
 
1026
-        List<String> terminalCodes = waitList.stream()
1027
-                .map(AttendanceRecordCountWaitDTO::getTerminlCode)
1026
+        List<Long> terminalCodes = waitList.stream()
1027
+                .map(AttendanceRecordCountWaitDTO::getWaitTeamCode)
1028
                 .distinct()
1028
                 .distinct()
1029
                 .collect(Collectors.toList());
1029
                 .collect(Collectors.toList());
1030
 
1030
 
@@ -1035,15 +1035,15 @@ public class AttendancePostRecordController extends BaseController {
1035
         List<AttendancePostRecord> checkoutRecords = attendancePostRecordService
1035
         List<AttendancePostRecord> checkoutRecords = attendancePostRecordService
1036
                 .selectCheckOutTimeByShiftCodes(DateUtil.beginOfDay(new Date()), terminalCodes);
1036
                 .selectCheckOutTimeByShiftCodes(DateUtil.beginOfDay(new Date()), terminalCodes);
1037
 
1037
 
1038
-        Map<String, List<AttendancePostRecord>> checkoutGroup = checkoutRecords.stream()
1039
-                .collect(Collectors.groupingBy(AttendancePostRecord::getTerminlCode));
1038
+        Map<Long, List<AttendancePostRecord>> checkoutGroup = checkoutRecords.stream()
1039
+                .collect(Collectors.groupingBy(AttendancePostRecord::getAttendanceTeamId));
1040
 
1040
 
1041
         if (checkoutGroup.isEmpty()) {
1041
         if (checkoutGroup.isEmpty()) {
1042
             return;
1042
             return;
1043
         }
1043
         }
1044
 
1044
 
1045
         waitList.forEach(waitDTO -> {
1045
         waitList.forEach(waitDTO -> {
1046
-            List<AttendancePostRecord> records = checkoutGroup.get(waitDTO.getTerminlCode());
1046
+            List<AttendancePostRecord> records = checkoutGroup.get(waitDTO.getWaitTeamCode());
1047
             if (records != null && !records.isEmpty()) {
1047
             if (records != null && !records.isEmpty()) {
1048
                 waitDTO.setCheckOutTime(records.get(0).getCheckOutTime());
1048
                 waitDTO.setCheckOutTime(records.get(0).getCheckOutTime());
1049
             }
1049
             }

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

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

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

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

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

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

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

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