feat(attendance): 倒班逻辑重构

- 在WmsAttendanceScheduleMapper.xml中新增shiftStartTime2和shiftEndTime2字段映射
- 修改SQL查询语句以包含新的时间段字段
- 更新WmsAttendanceScheduleVo类添加shiftStartTime2和shiftEndTime2属性
- 修复倒班逻辑计算方式,调整周期天数判断条件
- 注释掉连续两天排班的相关业务逻辑
This commit is contained in:
2026-05-12 15:04:00 +08:00
parent b44d9d9daf
commit 8eac708bac
3 changed files with 35 additions and 19 deletions

View File

@@ -33,13 +33,15 @@
<result property="shiftType" column="shift_type"/>
<result property="shiftStartTime" column="shift_start_time"/>
<result property="shiftEndTime" column="shift_end_time"/>
<result property="shiftStartTime2" column="shift_start_time2"/>
<result property="shiftEndTime2" column="shift_end_time2"/>
<result property="workHours" column="work_hours"/>
</resultMap>
<sql id="selectScheduleWithDetailsVo">
SELECT s.schedule_id, s.user_id, s.work_date, s.shift_id, s.shift_name, s.shift_group, s.remark,
e.name as employee_name, e.dept as employee_dept, e.job_type as employee_job_type,
sh.shift_type, sh.start_time as shift_start_time, sh.end_time as shift_end_time, sh.work_hours
sh.shift_type, sh.start_time as shift_start_time, sh.end_time as shift_end_time, sh.start_time2 as shift_start_time2, sh.end_time2 as shift_end_time2, sh.work_hours
FROM wms_attendance_schedule s
LEFT JOIN wms_employee_info e ON s.user_id = e.info_id AND e.del_flag = 0
LEFT JOIN wms_attendance_shift sh ON s.shift_id = sh.shift_id AND sh.del_flag = 0