DeXun/klp-oa
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

Browse Source
This commit is contained in:
wangyu
2026-05-12 17:15:41 +08:00
parent 38138a828c 139f0ebb3e
commit dce80a225b
22 changed files with 1268 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
klp-wms/src/main/resources/mapper/klp/WmsAttendanceCheckMapper.xml Normal file
View File

@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.mapper.WmsAttendanceCheckMapper">
<resultMap type="com.klp.domain.WmsAttendanceCheck" id="WmsAttendanceCheckResult">
<result property="checkId" column="check_id"/>
<result property="scheduleId" column="schedule_id"/>
<result property="userId" column="user_id"/>
<result property="employeeName" column="employee_name"/>
<result property="workDate" column="work_date"/>
<result property="shiftId" column="shift_id"/>
<result property="shiftName" column="shift_name"/>
<result property="shiftType" column="shift_type"/>
<result property="p1StartTime" column="p1_start_time"/>
<result property="p1EndTime" column="p1_end_time"/>
<result property="p1FirstCheck" column="p1_first_check"/>
<result property="p1LastCheck" column="p1_last_check"/>
<result property="p1LateMinutes" column="p1_late_minutes"/>
<result property="p1EarlyMinutes" column="p1_early_minutes"/>
<result property="p1Status" column="p1_status"/>
<result property="p1Deduct" column="p1_deduct"/>
<result property="p2StartTime" column="p2_start_time"/>
<result property="p2EndTime" column="p2_end_time"/>
<result property="p2FirstCheck" column="p2_first_check"/>
<result property="p2LastCheck" column="p2_last_check"/>
<result property="p2LateMinutes" column="p2_late_minutes"/>
<result property="p2EarlyMinutes" column="p2_early_minutes"/>
<result property="p2Status" column="p2_status"/>
<result property="p2Deduct" column="p2_deduct"/>
<result property="absentType" column="absent_type"/>
<result property="continuousAbsentDays" column="continuous_absent_days"/>
<result property="totalDeduct" column="total_deduct"/>
<result property="overallStatus" column="overall_status"/>
<result property="remark" column="remark"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
</resultMap>
</mapper>

25
klp-wms/src/main/resources/mapper/klp/WmsAttendanceRuleMapper.xml Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.mapper.WmsAttendanceRuleMapper">
<resultMap type="com.klp.domain.WmsAttendanceRule" id="WmsAttendanceRuleResult">
<result property="ruleId" column="rule_id"/>
<result property="lateWarn" column="late_warn"/>
<result property="lateOne" column="late_one"/>
<result property="lateTwo" column="late_two"/>
<result property="deductOne" column="deduct_one"/>
<result property="deductTwo" column="deduct_two"/>
<result property="absentHalfDay" column="absent_half_day"/>
<result property="continuousAbsentDays" column="continuous_absent_days"/>
<result property="remark" column="remark"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
</resultMap>
</mapper>

4
klp-wms/src/main/resources/mapper/klp/WmsAttendanceScheduleMapper.xml
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