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

feat(oa): 添加奖金和福利相关字段支持

Browse Source 
- 在 OaSalaryDetail 实体类中新增 bonuses 和 bonusesDeducted 字段
- 在 OaSalaryDetailBo 业务对象中同步新增奖金相关字段
- 更新 MyBatis XML 映射文件，增加奖金字段的数据库列映射- 在服务实现类中为奖金字段添加查询条件支持
- 在 OaSalaryDetailVo 视图对象中配置 Excel 导出注解以支持奖金数据展示
This commit is contained in:
Joshi
2025-10-13 16:33:39 +08:00
parent f9efefa003
commit 83886a412e
5 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaSalaryDetailServiceImpl.java
View File

@@ -78,6 +78,7 @@ public class OaSalaryDetailServiceImpl implements IOaSalaryDetailService {
lqw.eq(bo.getOvertimeRate() != null, OaSalaryDetail::getOvertimeRate, bo.getOvertimeRate());
lqw.eq(bo.getOvertimeTotal() != null, OaSalaryDetail::getOvertimeTotal, bo.getOvertimeTotal());
lqw.eq(bo.getBusinessDays() != null, OaSalaryDetail::getBusinessDays, bo.getBusinessDays());
lqw.eq(bo.getBonuses() != null, OaSalaryDetail::getBonuses, bo.getBonuses());
lqw.eq(bo.getLeaveDeduction() != null, OaSalaryDetail::getLeaveDeduction, bo.getLeaveDeduction());
lqw.eq(bo.getOtherDeduction() != null, OaSalaryDetail::getOtherDeduction, bo.getOtherDeduction());
lqw.eq(bo.getGrossSalary() != null, OaSalaryDetail::getGrossSalary, bo.getGrossSalary());
@@ -87,6 +88,7 @@ public class OaSalaryDetailServiceImpl implements IOaSalaryDetailService {
lqw.eq(bo.getPersonalBigMedical() != null, OaSalaryDetail::getPersonalBigMedical, bo.getPersonalBigMedical());
lqw.eq(bo.getPersonalHousingFund() != null, OaSalaryDetail::getPersonalHousingFund, bo.getPersonalHousingFund());
lqw.eq(bo.getPersonalTax() != null, OaSalaryDetail::getPersonalTax, bo.getPersonalTax());
lqw.eq(bo.getBonusesDeducted() != null, OaSalaryDetail::getBonusesDeducted, bo.getBonusesDeducted());
lqw.eq(bo.getNetSalary() != null, OaSalaryDetail::getNetSalary, bo.getNetSalary());
lqw.eq(bo.getEnterprisePension() != null, OaSalaryDetail::getEnterprisePension, bo.getEnterprisePension());
lqw.eq(bo.getEnterpriseMedical() != null, OaSalaryDetail::getEnterpriseMedical, bo.getEnterpriseMedical());