DeXun/GEAR-OA
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(oa): 新增考勤计件明细功能并优化相关领域模型

Browse Source 
- 新增考勤计件明细领域模型、BO、VO及相应CRUD接口和实现- 在考勤记录中添加薪酬类型、件数和工资金额字段
- 优化考勤记录查询逻辑，支持按薪酬类型筛选- 在产品领域模型中添加图像字段
This commit is contained in:
Joshi
2025-09-17 13:41:32 +08:00
parent abe3c57300
commit fd78a14637
18 changed files with 562 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gear-oa/src/main/resources/mapper/oa/GearAttendancePieceDetailMapper.xml Normal file
View File

@@ -0,0 +1,24 @@
<?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.gear.oa.mapper.GearAttendancePieceDetailMapper">
<resultMap type="com.gear.oa.domain.GearAttendancePieceDetail" id="GearAttendancePieceDetailResult">
<result property="detailId" column="detail_id"/>
<result property="recordId" column="record_id"/>
<result property="workpieceCode" column="workpiece_code"/>
<result property="workpieceName" column="workpiece_name"/>
<result property="pieceQuantity" column="piece_quantity"/>
<result property="unitPrice" column="unit_price"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
<result property="delFlag" column="del_flag"/>
<result property="remark" column="remark"/>
</resultMap>
<select id="selectVoPagePlus" resultType="com.gear.oa.domain.vo.GearAttendancePieceDetailVo"></select>
</mapper>

5
gear-oa/src/main/resources/mapper/oa/GearAttendanceRecordMapper.xml
View File

@@ -12,6 +12,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="startTime" column="start_time"/>
<result property="endTime" column="end_time"/>
<result property="durationHour" column="duration_hour"/>
<result property="paymentType" column="payment_type"/>
<result property="pieceCount" column="piece_count"/>
<result property="wage" column="wage"/>
<result property="status" column="status"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
@@ -22,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<select id="selectVoPagePlus" resultType="com.gear.oa.domain.vo.GearAttendanceRecordVo">
select ar.record_id, ar.user_id, ar.record_date, ar.record_type, ar.start_time,
ar.end_time, ar.duration_hour, ar.status, ar.create_time, ar.create_by,
ar.end_time, ar.duration_hour, ar.status, ar.payment_type, ar.piece_count, ar.wage, ar.create_time, ar.create_by,
ar.update_time, ar.update_by, ar.del_flag, ar.remark,
s.nick_name AS nickName
from gear_attendance_record ar

1
gear-oa/src/main/resources/mapper/oa/GearProductMapper.xml
View File

@@ -14,6 +14,7 @@
<result property="bomId" column="bom_id"/>
<result property="type" column="type"/>
<result property="accessory" column="accessory"/>
<result property="image" column="image"/>
<result property="isEnabled" column="is_enabled"/>
<result property="delFlag" column="del_flag"/>
<result property="createTime" column="create_time"/>