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

feat(oa): 添加工资发放主和明细相关功能

Browse Source 
- 新增工资发放主和明细的实体类、BO类、VO类
- 实现工资发放主和明细的增删查改功能
- 添加工资发放主和明细的导出功能
This commit is contained in:
Joshi
2025-09-08 14:22:24 +08:00
parent b1bbbec067
commit fdd7489102
16 changed files with 1514 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaSalaryDetailService.java Normal file
View File

@@ -0,0 +1,49 @@
package com.ruoyi.oa.service;
import com.ruoyi.oa.domain.OaSalaryDetail;
import com.ruoyi.oa.domain.vo.OaSalaryDetailVo;
import com.ruoyi.oa.domain.bo.OaSalaryDetailBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 工资发放明细Service接口
*
* @author Joshi
* @date 2025-09-08
*/
public interface IOaSalaryDetailService {
/**
* 查询工资发放明细
*/
OaSalaryDetailVo queryById(Long detailId);
/**
* 查询工资发放明细列表
*/
TableDataInfo<OaSalaryDetailVo> queryPageList(OaSalaryDetailBo bo, PageQuery pageQuery);
/**
* 查询工资发放明细列表
*/
List<OaSalaryDetailVo> queryList(OaSalaryDetailBo bo);
/**
* 新增工资发放明细
*/
Boolean insertByBo(OaSalaryDetailBo bo);
/**
* 修改工资发放明细
*/
Boolean updateByBo(OaSalaryDetailBo bo);
/**
* 校验并批量删除工资发放明细信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

49
ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaSalaryMasterService.java Normal file
View File

@@ -0,0 +1,49 @@
package com.ruoyi.oa.service;
import com.ruoyi.oa.domain.OaSalaryMaster;
import com.ruoyi.oa.domain.vo.OaSalaryMasterVo;
import com.ruoyi.oa.domain.bo.OaSalaryMasterBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 工资发放主Service接口
*
* @author Joshi
* @date 2025-09-08
*/
public interface IOaSalaryMasterService {
/**
* 查询工资发放主
*/
OaSalaryMasterVo queryById(Long masterId);
/**
* 查询工资发放主列表
*/
TableDataInfo<OaSalaryMasterVo> queryPageList(OaSalaryMasterBo bo, PageQuery pageQuery);
/**
* 查询工资发放主列表
*/
List<OaSalaryMasterVo> queryList(OaSalaryMasterBo bo);
/**
* 新增工资发放主
*/
Boolean insertByBo(OaSalaryMasterBo bo);
/**
* 修改工资发放主
*/
Boolean updateByBo(OaSalaryMasterBo bo);
/**
* 校验并批量删除工资发放主信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

142
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaSalaryDetailServiceImpl.java Normal file
View File

@@ -0,0 +1,142 @@
package com.ruoyi.oa.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.ruoyi.oa.domain.bo.OaSalaryDetailBo;
import com.ruoyi.oa.domain.vo.OaSalaryDetailVo;
import com.ruoyi.oa.domain.OaSalaryDetail;
import com.ruoyi.oa.mapper.OaSalaryDetailMapper;
import com.ruoyi.oa.service.IOaSalaryDetailService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 工资发放明细Service业务层处理
*
* @author Joshi
* @date 2025-09-08
*/
@RequiredArgsConstructor
@Service
public class OaSalaryDetailServiceImpl implements IOaSalaryDetailService {
private final OaSalaryDetailMapper baseMapper;
/**
* 查询工资发放明细
*/
@Override
public OaSalaryDetailVo queryById(Long detailId){
return baseMapper.selectVoById(detailId);
}
/**
* 查询工资发放明细列表
*/
@Override
public TableDataInfo<OaSalaryDetailVo> queryPageList(OaSalaryDetailBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OaSalaryDetail> lqw = buildQueryWrapper(bo);
Page<OaSalaryDetailVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询工资发放明细列表
*/
@Override
public List<OaSalaryDetailVo> queryList(OaSalaryDetailBo bo) {
LambdaQueryWrapper<OaSalaryDetail> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<OaSalaryDetail> buildQueryWrapper(OaSalaryDetailBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<OaSalaryDetail> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getMainId() != null, OaSalaryDetail::getMainId, bo.getMainId());
lqw.eq(bo.getSerialNumber() != null, OaSalaryDetail::getSerialNumber, bo.getSerialNumber());
lqw.eq(StringUtils.isNotBlank(bo.getDept()), OaSalaryDetail::getDept, bo.getDept());
lqw.like(StringUtils.isNotBlank(bo.getName()), OaSalaryDetail::getName, bo.getName());
lqw.eq(bo.getBasicSalary() != null, OaSalaryDetail::getBasicSalary, bo.getBasicSalary());
lqw.eq(bo.getPostSalary() != null, OaSalaryDetail::getPostSalary, bo.getPostSalary());
lqw.eq(bo.getMealAllowance() != null, OaSalaryDetail::getMealAllowance, bo.getMealAllowance());
lqw.eq(bo.getHousingAllowance() != null, OaSalaryDetail::getHousingAllowance, bo.getHousingAllowance());
lqw.eq(bo.getBusAllowance() != null, OaSalaryDetail::getBusAllowance, bo.getBusAllowance());
lqw.eq(bo.getBusinessDaysOther() != null, OaSalaryDetail::getBusinessDaysOther, bo.getBusinessDaysOther());
lqw.eq(bo.getBusinessAllowance() != null, OaSalaryDetail::getBusinessAllowance, bo.getBusinessAllowance());
lqw.eq(bo.getSocialSecurityAllowance() != null, OaSalaryDetail::getSocialSecurityAllowance, bo.getSocialSecurityAllowance());
lqw.eq(bo.getOvertimeHours() != null, OaSalaryDetail::getOvertimeHours, bo.getOvertimeHours());
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.getLeaveDeduction() != null, OaSalaryDetail::getLeaveDeduction, bo.getLeaveDeduction());
lqw.eq(bo.getOtherDeduction() != null, OaSalaryDetail::getOtherDeduction, bo.getOtherDeduction());
lqw.eq(bo.getGrossSalary() != null, OaSalaryDetail::getGrossSalary, bo.getGrossSalary());
lqw.eq(bo.getPersonalPension() != null, OaSalaryDetail::getPersonalPension, bo.getPersonalPension());
lqw.eq(bo.getPersonalMedical() != null, OaSalaryDetail::getPersonalMedical, bo.getPersonalMedical());
lqw.eq(bo.getPersonalUnemployment() != null, OaSalaryDetail::getPersonalUnemployment, bo.getPersonalUnemployment());
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.getNetSalary() != null, OaSalaryDetail::getNetSalary, bo.getNetSalary());
lqw.eq(bo.getEnterprisePension() != null, OaSalaryDetail::getEnterprisePension, bo.getEnterprisePension());
lqw.eq(bo.getEnterpriseMedical() != null, OaSalaryDetail::getEnterpriseMedical, bo.getEnterpriseMedical());
lqw.eq(bo.getEnterpriseInjury() != null, OaSalaryDetail::getEnterpriseInjury, bo.getEnterpriseInjury());
lqw.eq(bo.getEnterpriseUnemployment() != null, OaSalaryDetail::getEnterpriseUnemployment, bo.getEnterpriseUnemployment());
lqw.eq(bo.getEnterpriseMaternity() != null, OaSalaryDetail::getEnterpriseMaternity, bo.getEnterpriseMaternity());
lqw.eq(bo.getEnterpriseHousingFund() != null, OaSalaryDetail::getEnterpriseHousingFund, bo.getEnterpriseHousingFund());
lqw.eq(bo.getEnterpriseBigMedical() != null, OaSalaryDetail::getEnterpriseBigMedical, bo.getEnterpriseBigMedical());
lqw.eq(bo.getUnitTotalExpense() != null, OaSalaryDetail::getUnitTotalExpense, bo.getUnitTotalExpense());
return lqw;
}
/**
* 新增工资发放明细
*/
@Override
public Boolean insertByBo(OaSalaryDetailBo bo) {
OaSalaryDetail add = BeanUtil.toBean(bo, OaSalaryDetail.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setDetailId(add.getDetailId());
}
return flag;
}
/**
* 修改工资发放明细
*/
@Override
public Boolean updateByBo(OaSalaryDetailBo bo) {
OaSalaryDetail update = BeanUtil.toBean(bo, OaSalaryDetail.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(OaSalaryDetail entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除工资发放明细
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

115
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaSalaryMasterServiceImpl.java Normal file
View File

@@ -0,0 +1,115 @@
package com.ruoyi.oa.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.ruoyi.oa.domain.bo.OaSalaryMasterBo;
import com.ruoyi.oa.domain.vo.OaSalaryMasterVo;
import com.ruoyi.oa.domain.OaSalaryMaster;
import com.ruoyi.oa.mapper.OaSalaryMasterMapper;
import com.ruoyi.oa.service.IOaSalaryMasterService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 工资发放主Service业务层处理
*
* @author Joshi
* @date 2025-09-08
*/
@RequiredArgsConstructor
@Service
public class OaSalaryMasterServiceImpl implements IOaSalaryMasterService {
private final OaSalaryMasterMapper baseMapper;
/**
* 查询工资发放主
*/
@Override
public OaSalaryMasterVo queryById(Long masterId){
return baseMapper.selectVoById(masterId);
}
/**
* 查询工资发放主列表
*/
@Override
public TableDataInfo<OaSalaryMasterVo> queryPageList(OaSalaryMasterBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OaSalaryMaster> lqw = buildQueryWrapper(bo);
Page<OaSalaryMasterVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询工资发放主列表
*/
@Override
public List<OaSalaryMasterVo> queryList(OaSalaryMasterBo bo) {
LambdaQueryWrapper<OaSalaryMaster> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<OaSalaryMaster> buildQueryWrapper(OaSalaryMasterBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<OaSalaryMaster> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getUnitName()), OaSalaryMaster::getUnitName, bo.getUnitName());
lqw.eq(StringUtils.isNotBlank(bo.getSalaryPeriod()), OaSalaryMaster::getSalaryPeriod, bo.getSalaryPeriod());
lqw.eq(StringUtils.isNotBlank(bo.getGmApproval()), OaSalaryMaster::getGmApproval, bo.getGmApproval());
lqw.eq(StringUtils.isNotBlank(bo.getFinanceAudit()), OaSalaryMaster::getFinanceAudit, bo.getFinanceAudit());
lqw.eq(StringUtils.isNotBlank(bo.getCashier()), OaSalaryMaster::getCashier, bo.getCashier());
lqw.eq(StringUtils.isNotBlank(bo.getDeptManager()), OaSalaryMaster::getDeptManager, bo.getDeptManager());
lqw.eq(StringUtils.isNotBlank(bo.getOperator()), OaSalaryMaster::getOperator, bo.getOperator());
return lqw;
}
/**
* 新增工资发放主
*/
@Override
public Boolean insertByBo(OaSalaryMasterBo bo) {
OaSalaryMaster add = BeanUtil.toBean(bo, OaSalaryMaster.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setMasterId(add.getMasterId());
}
return flag;
}
/**
* 修改工资发放主
*/
@Override
public Boolean updateByBo(OaSalaryMasterBo bo) {
OaSalaryMaster update = BeanUtil.toBean(bo, OaSalaryMaster.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(OaSalaryMaster entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除工资发放主
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}