feat(oa): 添加工资发放记录功能模块
- 新增 GearSalaryRecords 实体类 - 新增 GearSalaryRecordsBo 业务对象类 - 新增 GearSalaryRecordsController 控制器 - 新增 GearSalaryRecordsMapper Mapper 接口和 XML 文件 - 新增 GearSalaryRecordsServiceImpl 服务实现类 - 新增 GearSalaryRecordsVo 视图对象类 - 新增 IGearSalaryRecordsService 服务接口
This commit is contained in:
@@ -0,0 +1,102 @@
|
||||
package com.gear.oa.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.*;
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import com.gear.common.annotation.RepeatSubmit;
|
||||
import com.gear.common.annotation.Log;
|
||||
import com.gear.common.core.controller.BaseController;
|
||||
import com.gear.common.core.domain.PageQuery;
|
||||
import com.gear.common.core.domain.R;
|
||||
import com.gear.common.core.validate.AddGroup;
|
||||
import com.gear.common.core.validate.EditGroup;
|
||||
import com.gear.common.core.validate.QueryGroup;
|
||||
import com.gear.common.enums.BusinessType;
|
||||
import com.gear.common.utils.poi.ExcelUtil;
|
||||
import com.gear.oa.domain.vo.GearSalaryRecordsVo;
|
||||
import com.gear.oa.domain.bo.GearSalaryRecordsBo;
|
||||
import com.gear.oa.service.IGearSalaryRecordsService;
|
||||
import com.gear.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 工资发放记录
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-09
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/oa/salaryRecords")
|
||||
public class GearSalaryRecordsController extends BaseController {
|
||||
|
||||
private final IGearSalaryRecordsService iGearSalaryRecordsService;
|
||||
|
||||
/**
|
||||
* 查询工资发放记录列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<GearSalaryRecordsVo> list(GearSalaryRecordsBo bo, PageQuery pageQuery) {
|
||||
return iGearSalaryRecordsService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出工资发放记录列表
|
||||
*/
|
||||
@Log(title = "工资发放记录", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(GearSalaryRecordsBo bo, HttpServletResponse response) {
|
||||
List<GearSalaryRecordsVo> list = iGearSalaryRecordsService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "工资发放记录", GearSalaryRecordsVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取工资发放记录详细信息
|
||||
*
|
||||
* @param salaryId 主键
|
||||
*/
|
||||
@GetMapping("/{salaryId}")
|
||||
public R<GearSalaryRecordsVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long salaryId) {
|
||||
return R.ok(iGearSalaryRecordsService.queryById(salaryId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增工资发放记录
|
||||
*/
|
||||
@Log(title = "工资发放记录", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody GearSalaryRecordsBo bo) {
|
||||
return toAjax(iGearSalaryRecordsService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改工资发放记录
|
||||
*/
|
||||
@Log(title = "工资发放记录", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody GearSalaryRecordsBo bo) {
|
||||
return toAjax(iGearSalaryRecordsService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除工资发放记录
|
||||
*
|
||||
* @param salaryIds 主键串
|
||||
*/
|
||||
@Log(title = "工资发放记录", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{salaryIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] salaryIds) {
|
||||
return toAjax(iGearSalaryRecordsService.deleteWithValidByIds(Arrays.asList(salaryIds), true));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,91 @@
|
||||
package com.gear.oa.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.gear.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 工资发放记录对象 gear_salary_records
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-09
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("gear_salary_records")
|
||||
public class GearSalaryRecords extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
* 唯一记录ID
|
||||
*/
|
||||
@TableId(value = "salary_id")
|
||||
private Long salaryId;
|
||||
/**
|
||||
* 员工ID(加密存储)
|
||||
*/
|
||||
private Long employeeId;
|
||||
/**
|
||||
* 发薪月份(YYYY-MM-01)
|
||||
*/
|
||||
private Date payPeriod;
|
||||
/**
|
||||
* 基本工资
|
||||
*/
|
||||
private BigDecimal baseSalary;
|
||||
/**
|
||||
* 绩效奖金
|
||||
*/
|
||||
private BigDecimal performanceBonus;
|
||||
/**
|
||||
* 加班工资
|
||||
*/
|
||||
private BigDecimal overtimePay;
|
||||
/**
|
||||
* 各类补贴
|
||||
*/
|
||||
private BigDecimal allowance;
|
||||
/**
|
||||
* 社保个人部分
|
||||
*/
|
||||
private BigDecimal socialSecurity;
|
||||
/**
|
||||
* 公积金个人部分
|
||||
*/
|
||||
private BigDecimal housingFund;
|
||||
/**
|
||||
* 个人所得税
|
||||
*/
|
||||
private BigDecimal incomeTax;
|
||||
/**
|
||||
* 应发工资
|
||||
*/
|
||||
private BigDecimal grossSalary;
|
||||
/**
|
||||
* 实发工资
|
||||
*/
|
||||
private BigDecimal netSalary;
|
||||
/**
|
||||
* 删除标志(0 正常,1 删除)
|
||||
*/
|
||||
@TableLogic
|
||||
private Long delFlag;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 发放状态
|
||||
*/
|
||||
private String payStatus;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,98 @@
|
||||
package com.gear.oa.domain.bo;
|
||||
|
||||
import com.gear.common.core.validate.AddGroup;
|
||||
import com.gear.common.core.validate.EditGroup;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.gear.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 工资发放记录业务对象 gear_salary_records
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-09
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class GearSalaryRecordsBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 唯一记录ID
|
||||
*/
|
||||
private Long salaryId;
|
||||
|
||||
/**
|
||||
* 员工ID(加密存储)
|
||||
*/
|
||||
private Long employeeId;
|
||||
|
||||
/**
|
||||
* 发薪月份(YYYY-MM-01)
|
||||
*/
|
||||
private Date payPeriod;
|
||||
|
||||
/**
|
||||
* 基本工资
|
||||
*/
|
||||
private BigDecimal baseSalary;
|
||||
|
||||
/**
|
||||
* 绩效奖金
|
||||
*/
|
||||
private BigDecimal performanceBonus;
|
||||
|
||||
/**
|
||||
* 加班工资
|
||||
*/
|
||||
private BigDecimal overtimePay;
|
||||
|
||||
/**
|
||||
* 各类补贴
|
||||
*/
|
||||
private BigDecimal allowance;
|
||||
|
||||
/**
|
||||
* 社保个人部分
|
||||
*/
|
||||
private BigDecimal socialSecurity;
|
||||
|
||||
/**
|
||||
* 公积金个人部分
|
||||
*/
|
||||
private BigDecimal housingFund;
|
||||
|
||||
/**
|
||||
* 个人所得税
|
||||
*/
|
||||
private BigDecimal incomeTax;
|
||||
|
||||
/**
|
||||
* 应发工资
|
||||
*/
|
||||
private BigDecimal grossSalary;
|
||||
|
||||
/**
|
||||
* 实发工资
|
||||
*/
|
||||
private BigDecimal netSalary;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 发放状态
|
||||
*/
|
||||
private String payStatus;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,112 @@
|
||||
package com.gear.oa.domain.vo;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.gear.common.annotation.ExcelDictFormat;
|
||||
import com.gear.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 工资发放记录视图对象 gear_salary_records
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-09
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class GearSalaryRecordsVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 唯一记录ID
|
||||
*/
|
||||
@ExcelProperty(value = "唯一记录ID")
|
||||
private Long salaryId;
|
||||
|
||||
/**
|
||||
* 员工ID(加密存储)
|
||||
*/
|
||||
@ExcelProperty(value = "员工ID(加密存储)")
|
||||
private Long employeeId;
|
||||
|
||||
/**
|
||||
* 发薪月份(YYYY-MM-01)
|
||||
*/
|
||||
@ExcelProperty(value = "发薪月份(YYYY-MM-01)")
|
||||
private Date payPeriod;
|
||||
|
||||
/**
|
||||
* 基本工资
|
||||
*/
|
||||
@ExcelProperty(value = "基本工资")
|
||||
private BigDecimal baseSalary;
|
||||
|
||||
/**
|
||||
* 绩效奖金
|
||||
*/
|
||||
@ExcelProperty(value = "绩效奖金")
|
||||
private BigDecimal performanceBonus;
|
||||
|
||||
/**
|
||||
* 加班工资
|
||||
*/
|
||||
@ExcelProperty(value = "加班工资")
|
||||
private BigDecimal overtimePay;
|
||||
|
||||
/**
|
||||
* 各类补贴
|
||||
*/
|
||||
@ExcelProperty(value = "各类补贴")
|
||||
private BigDecimal allowance;
|
||||
|
||||
/**
|
||||
* 社保个人部分
|
||||
*/
|
||||
@ExcelProperty(value = "社保个人部分")
|
||||
private BigDecimal socialSecurity;
|
||||
|
||||
/**
|
||||
* 公积金个人部分
|
||||
*/
|
||||
@ExcelProperty(value = "公积金个人部分")
|
||||
private BigDecimal housingFund;
|
||||
|
||||
/**
|
||||
* 个人所得税
|
||||
*/
|
||||
@ExcelProperty(value = "个人所得税")
|
||||
private BigDecimal incomeTax;
|
||||
|
||||
/**
|
||||
* 应发工资
|
||||
*/
|
||||
@ExcelProperty(value = "应发工资")
|
||||
private BigDecimal grossSalary;
|
||||
|
||||
/**
|
||||
* 实发工资
|
||||
*/
|
||||
@ExcelProperty(value = "实发工资")
|
||||
private BigDecimal netSalary;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 发放状态
|
||||
*/
|
||||
@ExcelProperty(value = "发放状态")
|
||||
private String payStatus;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.gear.oa.mapper;
|
||||
|
||||
import com.gear.oa.domain.GearSalaryRecords;
|
||||
import com.gear.oa.domain.vo.GearSalaryRecordsVo;
|
||||
import com.gear.common.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 工资发放记录Mapper接口
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-09
|
||||
*/
|
||||
public interface GearSalaryRecordsMapper extends BaseMapperPlus<GearSalaryRecordsMapper, GearSalaryRecords, GearSalaryRecordsVo> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package com.gear.oa.service;
|
||||
|
||||
import com.gear.oa.domain.GearSalaryRecords;
|
||||
import com.gear.oa.domain.vo.GearSalaryRecordsVo;
|
||||
import com.gear.oa.domain.bo.GearSalaryRecordsBo;
|
||||
import com.gear.common.core.page.TableDataInfo;
|
||||
import com.gear.common.core.domain.PageQuery;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 工资发放记录Service接口
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-09
|
||||
*/
|
||||
public interface IGearSalaryRecordsService {
|
||||
|
||||
/**
|
||||
* 查询工资发放记录
|
||||
*/
|
||||
GearSalaryRecordsVo queryById(Long salaryId);
|
||||
|
||||
/**
|
||||
* 查询工资发放记录列表
|
||||
*/
|
||||
TableDataInfo<GearSalaryRecordsVo> queryPageList(GearSalaryRecordsBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询工资发放记录列表
|
||||
*/
|
||||
List<GearSalaryRecordsVo> queryList(GearSalaryRecordsBo bo);
|
||||
|
||||
/**
|
||||
* 新增工资发放记录
|
||||
*/
|
||||
Boolean insertByBo(GearSalaryRecordsBo bo);
|
||||
|
||||
/**
|
||||
* 修改工资发放记录
|
||||
*/
|
||||
Boolean updateByBo(GearSalaryRecordsBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除工资发放记录信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@@ -0,0 +1,120 @@
|
||||
package com.gear.oa.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import com.gear.common.utils.StringUtils;
|
||||
import com.gear.common.core.page.TableDataInfo;
|
||||
import com.gear.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.gear.oa.domain.bo.GearSalaryRecordsBo;
|
||||
import com.gear.oa.domain.vo.GearSalaryRecordsVo;
|
||||
import com.gear.oa.domain.GearSalaryRecords;
|
||||
import com.gear.oa.mapper.GearSalaryRecordsMapper;
|
||||
import com.gear.oa.service.IGearSalaryRecordsService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 工资发放记录Service业务层处理
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-09
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class GearSalaryRecordsServiceImpl implements IGearSalaryRecordsService {
|
||||
|
||||
private final GearSalaryRecordsMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询工资发放记录
|
||||
*/
|
||||
@Override
|
||||
public GearSalaryRecordsVo queryById(Long salaryId){
|
||||
return baseMapper.selectVoById(salaryId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询工资发放记录列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<GearSalaryRecordsVo> queryPageList(GearSalaryRecordsBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<GearSalaryRecords> lqw = buildQueryWrapper(bo);
|
||||
Page<GearSalaryRecordsVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询工资发放记录列表
|
||||
*/
|
||||
@Override
|
||||
public List<GearSalaryRecordsVo> queryList(GearSalaryRecordsBo bo) {
|
||||
LambdaQueryWrapper<GearSalaryRecords> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<GearSalaryRecords> buildQueryWrapper(GearSalaryRecordsBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<GearSalaryRecords> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(bo.getEmployeeId() != null, GearSalaryRecords::getEmployeeId, bo.getEmployeeId());
|
||||
lqw.eq(bo.getPayPeriod() != null, GearSalaryRecords::getPayPeriod, bo.getPayPeriod());
|
||||
lqw.eq(bo.getBaseSalary() != null, GearSalaryRecords::getBaseSalary, bo.getBaseSalary());
|
||||
lqw.eq(bo.getPerformanceBonus() != null, GearSalaryRecords::getPerformanceBonus, bo.getPerformanceBonus());
|
||||
lqw.eq(bo.getOvertimePay() != null, GearSalaryRecords::getOvertimePay, bo.getOvertimePay());
|
||||
lqw.eq(bo.getAllowance() != null, GearSalaryRecords::getAllowance, bo.getAllowance());
|
||||
lqw.eq(bo.getSocialSecurity() != null, GearSalaryRecords::getSocialSecurity, bo.getSocialSecurity());
|
||||
lqw.eq(bo.getHousingFund() != null, GearSalaryRecords::getHousingFund, bo.getHousingFund());
|
||||
lqw.eq(bo.getIncomeTax() != null, GearSalaryRecords::getIncomeTax, bo.getIncomeTax());
|
||||
lqw.eq(bo.getGrossSalary() != null, GearSalaryRecords::getGrossSalary, bo.getGrossSalary());
|
||||
lqw.eq(bo.getNetSalary() != null, GearSalaryRecords::getNetSalary, bo.getNetSalary());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getPayStatus()), GearSalaryRecords::getPayStatus, bo.getPayStatus());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增工资发放记录
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(GearSalaryRecordsBo bo) {
|
||||
GearSalaryRecords add = BeanUtil.toBean(bo, GearSalaryRecords.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setSalaryId(add.getSalaryId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改工资发放记录
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(GearSalaryRecordsBo bo) {
|
||||
GearSalaryRecords update = BeanUtil.toBean(bo, GearSalaryRecords.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(GearSalaryRecords entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除工资发放记录
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user