diff --git a/gear-oa/src/main/java/com/gear/oa/domain/vo/GearSalaryRecordsVo.java b/gear-oa/src/main/java/com/gear/oa/domain/vo/GearSalaryRecordsVo.java index 2608b54..86804e1 100644 --- a/gear-oa/src/main/java/com/gear/oa/domain/vo/GearSalaryRecordsVo.java +++ b/gear-oa/src/main/java/com/gear/oa/domain/vo/GearSalaryRecordsVo.java @@ -108,5 +108,9 @@ public class GearSalaryRecordsVo { @ExcelProperty(value = "发放状态") private String payStatus; + //联查昵称 + @ExcelProperty(value = "员工姓名") + private String employeeName; + } diff --git a/gear-oa/src/main/java/com/gear/oa/mapper/GearSalaryRecordsMapper.java b/gear-oa/src/main/java/com/gear/oa/mapper/GearSalaryRecordsMapper.java index 2e913d5..3e002d2 100644 --- a/gear-oa/src/main/java/com/gear/oa/mapper/GearSalaryRecordsMapper.java +++ b/gear-oa/src/main/java/com/gear/oa/mapper/GearSalaryRecordsMapper.java @@ -1,8 +1,11 @@ package com.gear.oa.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gear.oa.domain.GearSalaryRecords; import com.gear.oa.domain.vo.GearSalaryRecordsVo; import com.gear.common.core.mapper.BaseMapperPlus; +import org.apache.ibatis.annotations.Param; /** * 工资发放记录Mapper接口 @@ -12,4 +15,5 @@ import com.gear.common.core.mapper.BaseMapperPlus; */ public interface GearSalaryRecordsMapper extends BaseMapperPlus { + Page selectVoPagePlus(Page build,@Param("ew") QueryWrapper lqw); } diff --git a/gear-oa/src/main/java/com/gear/oa/service/impl/GearSalaryRecordsServiceImpl.java b/gear-oa/src/main/java/com/gear/oa/service/impl/GearSalaryRecordsServiceImpl.java index 9c863f2..9910e64 100644 --- a/gear-oa/src/main/java/com/gear/oa/service/impl/GearSalaryRecordsServiceImpl.java +++ b/gear-oa/src/main/java/com/gear/oa/service/impl/GearSalaryRecordsServiceImpl.java @@ -1,6 +1,7 @@ package com.gear.oa.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.gear.common.utils.StringUtils; import com.gear.common.core.page.TableDataInfo; import com.gear.common.core.domain.PageQuery; @@ -44,11 +45,33 @@ public class GearSalaryRecordsServiceImpl implements IGearSalaryRecordsService { */ @Override public TableDataInfo queryPageList(GearSalaryRecordsBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + QueryWrapper lqw = buildQueryWrapperPlus(bo); + Page result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw); return TableDataInfo.build(result); } + private QueryWrapper buildQueryWrapperPlus(GearSalaryRecordsBo bo) { + Map params = bo.getParams(); + QueryWrapper lqw = Wrappers.query(); + // 使用表别名 sr 来构建查询条件 + lqw.eq(bo.getEmployeeId() != null, "sr.employee_id", bo.getEmployeeId()); + lqw.eq(bo.getPayPeriod() != null, "sr.pay_period", bo.getPayPeriod()); + lqw.eq(bo.getBaseSalary() != null, "sr.base_salary", bo.getBaseSalary()); + lqw.eq(bo.getPerformanceBonus() != null, "sr.performance_bonus", bo.getPerformanceBonus()); + lqw.eq(bo.getOvertimePay() != null, "sr.overtime_pay", bo.getOvertimePay()); + lqw.eq(bo.getAllowance() != null, "sr.allowance", bo.getAllowance()); + lqw.eq(bo.getSocialSecurity() != null, "sr.social_security", bo.getSocialSecurity()); + lqw.eq(bo.getHousingFund() != null, "sr.housing_fund", bo.getHousingFund()); + lqw.eq(bo.getIncomeTax() != null, "sr.income_tax", bo.getIncomeTax()); + lqw.eq(bo.getGrossSalary() != null, "sr.gross_salary", bo.getGrossSalary()); + lqw.eq(bo.getNetSalary() != null, "sr.net_salary", bo.getNetSalary()); + lqw.eq(StringUtils.isNotBlank(bo.getPayStatus()), "sr.pay_status", bo.getPayStatus()); + // 逻辑删除 + lqw.eq("sr.del_flag", "0"); + return lqw; + } + + /** * 查询工资发放记录列表 */ diff --git a/gear-oa/src/main/resources/mapper/oa/GearSalaryRecordsMapper.xml b/gear-oa/src/main/resources/mapper/oa/GearSalaryRecordsMapper.xml index 3c11d0c..3d8f02c 100644 --- a/gear-oa/src/main/resources/mapper/oa/GearSalaryRecordsMapper.xml +++ b/gear-oa/src/main/resources/mapper/oa/GearSalaryRecordsMapper.xml @@ -25,6 +25,34 @@ + +