勤务模块

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

@@ -125,12 +125,12 @@ public class AttendancePostRecordController extends BaseController {
         Long currentUserId = SecurityUtils.getUserId();
         // 计算当前时间对应的班次日期
 //        Date queryDate = determineShiftDate();
-        Date queryDate = attendancePostRecordService.selectMaxDateByUserId(currentUserId);
+        Date queryDate = attendancePostRecordService.selectMaxDateByUserId(currentUserId, null);
         if (queryDate == null) {
             queryDate = DateUtils.getNowDate();
         }
         // 先获取当前用户今天的记录，取出班次信息
-        List<AttendancePostRecord> userRecords = attendancePostRecordService.selectTodayRecordsByUserId(currentUserId, queryDate);
+        List<AttendancePostRecord> userRecords = attendancePostRecordService.selectTodayRecordsByUserId(currentUserId, null, queryDate);
 
         if (userRecords.isEmpty()) {
             return AjaxResult.success(new ArrayList<>());
@@ -1095,11 +1095,11 @@ public class AttendancePostRecordController extends BaseController {
         try {
             // 获取当前班次日期
 //            Date shiftDate = determineShiftDate();
-            Date shiftDate = attendancePostRecordService.selectMaxDateByUserId(userId);
+            Date shiftDate = attendancePostRecordService.selectMaxDateByUserId(null, userId);
             if (shiftDate == null) {
                 shiftDate = DateUtils.getNowDate();
             }
-            List<AttendancePostRecord> userRecords = attendancePostRecordService.selectTodayRecordsByUserId(userId, shiftDate);
+            List<AttendancePostRecord> userRecords = attendancePostRecordService.selectTodayRecordsByUserId(null, userId, shiftDate);
 
             // 检查是否有已锁定且在当前班次周期内的记录
 //            return userRecords.stream()

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

@@ -64,11 +64,12 @@ public interface AttendancePostRecordMapper {
     /**
      * 查询指定用户当天的上岗记录
      *
-     * @param userId 用户ID
-     * @param today  当天日期
+     * @param createBy 创建人
+     * @param userId   用户ID
+     * @param today    当天日期
      * @return 上岗记录集合
      */
-    public List<AttendancePostRecord> selectTodayRecordsByUserId(@Param("userId") Long userId, @Param("today") Date today);
+    public List<AttendancePostRecord> selectTodayRecordsByUserId(@Param("createBy") Long createBy, @Param("userId") Long userId, @Param("today") Date today);
 
     /**
      * 查询指定班次代码当天的上岗记录
@@ -140,8 +141,9 @@ public interface AttendancePostRecordMapper {
     /**
      * 查询指定用户最近的上岗记录的考勤日期
      *
-     * @param userId 用户ID
+     * @param createBy 创建人
+     * @param userId   用户ID
      * @return 考勤日期
      */
-    public Date selectMaxDateByUserId(@Param("userId") Long userId);
+    public Date selectMaxDateByUserId(@Param("createBy") Long createBy, @Param("userId") Long userId);
 }

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

@@ -65,11 +65,12 @@ public interface IAttendancePostRecordService {
     /**
      * 查询指定用户当天的上岗记录
      *
-     * @param userId 用户ID
-     * @param today  当天日期
+     * @param createBy 创建人
+     * @param userId   用户ID
+     * @param today    当天日期
      * @return 上岗记录集合
      */
-    public List<AttendancePostRecord> selectTodayRecordsByUserId(Long userId, Date today);
+    public List<AttendancePostRecord> selectTodayRecordsByUserId(Long createBy, Long userId, Date today);
 
     /**
      * 查询指定班次代码当天的上岗记录
@@ -143,8 +144,9 @@ public interface IAttendancePostRecordService {
     /**
      * 查询指定用户最近的上岗记录的考勤日期
      *
-     * @param userId 用户ID
+     * @param createBy 创建人
+     * @param userId   用户ID
      * @return 考勤日期
      */
-    public Date selectMaxDateByUserId(Long userId);
+    public Date selectMaxDateByUserId(Long createBy, Long userId);
 }

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

@@ -112,13 +112,14 @@ public class AttendancePostRecordServiceImpl implements IAttendancePostRecordSer
     /**
      * 查询指定用户当天的上岗记录
      *
-     * @param userId 用户ID
-     * @param today  当天日期
+     * @param createBy 创建人
+     * @param userId   用户ID
+     * @param today    当天日期
      * @return 上岗记录集合
      */
     @Override
-    public List<AttendancePostRecord> selectTodayRecordsByUserId(Long userId, Date today) {
-        return attendancePostRecordMapper.selectTodayRecordsByUserId(userId, today);
+    public List<AttendancePostRecord> selectTodayRecordsByUserId(Long createBy, Long userId, Date today) {
+        return attendancePostRecordMapper.selectTodayRecordsByUserId(createBy, userId, today);
     }
 
     /**
@@ -270,11 +271,12 @@ public class AttendancePostRecordServiceImpl implements IAttendancePostRecordSer
     /**
      * 查询指定用户最近的上岗记录的考勤日期
      *
-     * @param userId 用户ID
+     * @param createBy 创建人
+     * @param userId   用户ID
      * @return 考勤日期
      */
     @Override
-    public Date selectMaxDateByUserId(Long userId) {
-        return attendancePostRecordMapper.selectMaxDateByUserId(userId);
+    public Date selectMaxDateByUserId(Long createBy, Long userId) {
+        return attendancePostRecordMapper.selectMaxDateByUserId(createBy, userId);
     }
 }

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

@@ -298,8 +298,15 @@
     <select id="selectTodayRecordsByUserId" resultMap="AttendancePostRecordResult">
         <include refid="selectAttendancePostRecordVo"/>
         <where>
-            user_id = #{userId}
-            AND DATE(attendance_date) = DATE(#{today})
+            <if test="createBy != null">
+                and create_by=#{createBy}
+            </if>
+            <if test="userId != null">
+                and user_id=#{userId}
+            </if>
+            <if test="today != null">
+                AND DATE(attendance_date) = DATE(#{today})
+            </if>
         </where>
         ORDER BY check_in_time
     </select>
@@ -412,6 +419,13 @@
     <select id="selectMaxDateByUserId" resultType="java.util.Date">
         select max(attendance_date) attendance_date
         from attendance_post_record
-        where user_id = #{userId}
+        <where>
+            <if test="createBy != null">
+                and create_by=#{createBy}
+            </if>
+            <if test="userId != null">
+                and user_id=#{userId}
+            </if>
+        </where>
     </select>
 </mapper>