DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

薪资计算逻辑完善

Browse Source
This commit is contained in:
Joshi
2025-06-24 14:25:19 +08:00
parent 3d6fe57c50
commit 9995425f28
11 changed files with 70 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-oa/src/main/resources/mapper/oa/OaEmployeeTemplateBindingMapper.xml
View File

@@ -21,6 +21,11 @@
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
</resultMap>
<insert id="insertBinding">
INSERT INTO oa_employee_template_binding
(employee_id, insurance_template_id, salary_template_id, pay_year, pay_month, net_salary, total_company_cost, status)
VALUES (#{employeeId}, #{insuranceTemplateId}, #{salaryTemplateId}, #{payYear}, #{payMonth}, #{netSalary}, #{totalCompanyCost}, #{status})
</insert>
<select id="findByEmployeeAndMonth" resultType="com.ruoyi.oa.domain.OaEmployeeTemplateBinding">
SELECT * FROM oa_employee_template_binding
WHERE employee_id = #{employeeId}

2
ruoyi-oa/src/main/resources/mapper/oa/OaInsuranceTemplateDetailMapper.xml
View File

@@ -17,7 +17,7 @@
<result property="updateTime" column="update_time"/>
</resultMap>
<select id="findByTemplateId" resultType="com.ruoyi.oa.domain.OaInsuranceTemplateDetail">
SELECT * FROM oa_insurance_template_detail WHERE template_id = #{templateId}
SELECT * FROM oa_insurance_template_detail WHERE insurance_template_id = #{templateId}
</select>

2
ruoyi-oa/src/main/resources/mapper/oa/OaSalaryTemplateDetailMapper.xml
View File

@@ -18,7 +18,7 @@
<result property="updateTime" column="update_time"/>
</resultMap>
<select id="findByTemplateId" resultType="com.ruoyi.oa.domain.OaSalaryTemplateDetail">
SELECT * FROM oa_salary_template_detail WHERE template_id = #{templateId}
SELECT * FROM oa_salary_template_detail WHERE salary_template_id = #{templateId}
</select>