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

feat(oa): 新增奖金池及与项目关联功能

Browse Source 
- 新增奖金池实体类、业务对象及视图对象
- 实现奖金池的增删改查及分页查询功能
- 新增奖金池与项目关联实体类及相关对象
- 实现奖金池与项目的关联管理及批量绑定功能
- 提供奖金池及关联关系的Excel导出支持- 配置MyBatis映射文件及Mapper接口
- 添加控制器以支持RESTful API访问
This commit is contained in:
Joshi
2025-10-23 14:53:49 +08:00
parent ab9d7e55fe
commit 82f35de34d
16 changed files with 1000 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaBonusPoolController.java Normal file
View File

@@ -0,0 +1,103 @@
package com.ruoyi.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 org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.core.validate.QueryGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.oa.domain.vo.OaBonusPoolVo;
import com.ruoyi.oa.domain.bo.OaBonusPoolBo;
import com.ruoyi.oa.service.IOaBonusPoolService;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 奖金池
*
* @author ruoyi
* @date 2025-10-23
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/oa/bonusPool")
public class OaBonusPoolController extends BaseController {
private final IOaBonusPoolService iOaBonusPoolService;
/**
* 查询奖金池列表
*/
@GetMapping("/list")
public TableDataInfo<OaBonusPoolVo> list(OaBonusPoolBo bo, PageQuery pageQuery) {
return iOaBonusPoolService.queryPageList(bo, pageQuery);
}
/**
* 导出奖金池列表
*/
@Log(title = "奖金池", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(OaBonusPoolBo bo, HttpServletResponse response) {
List<OaBonusPoolVo> list = iOaBonusPoolService.queryList(bo);
ExcelUtil.exportExcel(list, "奖金池", OaBonusPoolVo.class, response);
}
/**
* 获取奖金池详细信息
*
* @param poolId 主键
*/
@GetMapping("/{poolId}")
public R<OaBonusPoolVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long poolId) {
return R.ok(iOaBonusPoolService.queryById(poolId));
}
/**
* 新增奖金池
*/
@Log(title = "奖金池", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody OaBonusPoolBo bo) {
return toAjax(iOaBonusPoolService.insertByBo(bo));
}
/**
* 修改奖金池
*/
@Log(title = "奖金池", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody OaBonusPoolBo bo) {
return toAjax(iOaBonusPoolService.updateByBo(bo));
}
/**
* 删除奖金池
*
* @param poolIds 主键串
*/
@Log(title = "奖金池", businessType = BusinessType.DELETE)
@DeleteMapping("/{poolIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] poolIds) {
return toAjax(iOaBonusPoolService.deleteWithValidByIds(Arrays.asList(poolIds), true));
}
}

109
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaBonusProjectRelController.java Normal file
View File

@@ -0,0 +1,109 @@
package com.ruoyi.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 org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.core.validate.QueryGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.oa.domain.vo.OaBonusProjectRelVo;
import com.ruoyi.oa.domain.bo.OaBonusProjectRelBo;
import com.ruoyi.oa.service.IOaBonusProjectRelService;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 奖金池与项目关联
*
* @author ruoyi
* @date 2025-10-23
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/oa/bonusProjectRel")
public class OaBonusProjectRelController extends BaseController {
private final IOaBonusProjectRelService iOaBonusProjectRelService;
/**
* 查询奖金池与项目关联列表
*/
@GetMapping("/list")
public TableDataInfo<OaBonusProjectRelVo> list(OaBonusProjectRelBo bo, PageQuery pageQuery) {
return iOaBonusProjectRelService.queryPageList(bo, pageQuery);
}
/**
* 导出奖金池与项目关联列表
*/
@Log(title = "奖金池与项目关联", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(OaBonusProjectRelBo bo, HttpServletResponse response) {
List<OaBonusProjectRelVo> list = iOaBonusProjectRelService.queryList(bo);
ExcelUtil.exportExcel(list, "奖金池与项目关联", OaBonusProjectRelVo.class, response);
}
/**
* 获取奖金池与项目关联详细信息
*
* @param relId 主键
*/
@GetMapping("/{relId}")
public R<OaBonusProjectRelVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long relId) {
return R.ok(iOaBonusProjectRelService.queryById(relId));
}
/**
* 新增奖金池与项目关联
*/
@Log(title = "奖金池与项目关联", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody OaBonusProjectRelBo bo) {
return toAjax(iOaBonusProjectRelService.insertByBo(bo));
}
/**
* 修改奖金池与项目关联
*/
@Log(title = "奖金池与项目关联", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody OaBonusProjectRelBo bo) {
return toAjax(iOaBonusProjectRelService.updateByBo(bo));
}
/**
* 删除奖金池与项目关联
*
* @param relIds 主键串
*/
@Log(title = "奖金池与项目关联", businessType = BusinessType.DELETE)
@DeleteMapping("/{relIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] relIds) {
return toAjax(iOaBonusProjectRelService.deleteWithValidByIds(Arrays.asList(relIds), true));
}
//使用这个方法批量绑定奖金池id和项目id
@Log(title = "奖金池与项目关联", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping("/batchAdd")
public R<Void> batchAdd(@Validated(AddGroup.class) @RequestBody OaBonusProjectRelBo bo) {
return toAjax(iOaBonusProjectRelService.batchAdd(bo));
}
}

63
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaBonusPool.java Normal file
View File

@@ -0,0 +1,63 @@
package com.ruoyi.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.ruoyi.common.core.domain.BaseEntity;
/**
* 奖金池对象 oa_bonus_pool
*
* @author ruoyi
* @date 2025-10-23
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("oa_bonus_pool")
public class OaBonusPool extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 主键ID
*/
@TableId(value = "pool_id")
private Long poolId;
/**
* 奖金池名称
*/
private String poolName;
/**
* 开始日期
*/
private Date startDate;
/**
* 结束日期
*/
private Date endDate;
/**
* 奖金池总金额（单位：元）
*/
private BigDecimal totalAmount;
/**
* 剩余金额（单位：元）
*/
private BigDecimal remainingAmount;
/**
* 删除标识（0：未删除 1：已删除）
*/
@TableLogic
private String delFlag;
/**
* 备注
*/
private String remark;
}

53
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaBonusProjectRel.java Normal file
View File

@@ -0,0 +1,53 @@
package com.ruoyi.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 com.ruoyi.common.core.domain.BaseEntity;
/**
* 奖金池与项目关联对象 oa_bonus_project_rel
*
* @author ruoyi
* @date 2025-10-23
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("oa_bonus_project_rel")
public class OaBonusProjectRel extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 主键ID
*/
@TableId(value = "rel_id")
private Long relId;
/**
* 奖金池ID（关联bonus_pool表id）
*/
private Long poolId;
/**
* 项目ID（关联项目表id）
*/
private Long projectId;
/**
* 已分配给该项目的金额（单位：元）
*/
private BigDecimal allocatedAmount;
/**
* 删除标识（0：未删除 1：已删除）
*/
@TableLogic
private String delFlag;
/**
* 备注
*/
private String remark;
}

63
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaBonusPoolBo.java Normal file
View File

@@ -0,0 +1,63 @@
package com.ruoyi.oa.domain.bo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.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.ruoyi.common.core.domain.BaseEntity;
/**
* 奖金池业务对象 oa_bonus_pool
*
* @author ruoyi
* @date 2025-10-23
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class OaBonusPoolBo extends BaseEntity {
/**
* 主键ID
*/
private Long poolId;
/**
* 奖金池名称
*/
private String poolName;
/**
* 开始日期
*/
private Date startDate;
/**
* 结束日期
*/
private Date endDate;
/**
* 奖金池总金额（单位：元）
*/
private BigDecimal totalAmount;
/**
* 剩余金额（单位：元）
*/
private BigDecimal remainingAmount;
/**
* 备注
*/
private String remark;
}

55
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaBonusProjectRelBo.java Normal file
View File

@@ -0,0 +1,55 @@
package com.ruoyi.oa.domain.bo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.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.List;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 奖金池与项目关联业务对象 oa_bonus_project_rel
*
* @author ruoyi
* @date 2025-10-23
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class OaBonusProjectRelBo extends BaseEntity {
/**
* 主键ID
*/
private Long relId;
/**
* 奖金池ID（关联bonus_pool表id）
*/
private Long poolId;
/**
* 项目ID（关联项目表id）
*/
private Long projectId;
/**
* 已分配给该项目的金额（单位：元）
*/
private BigDecimal allocatedAmount;
/**
* 备注
*/
private String remark;
private List<Long> projectIds;
}

72
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaBonusPoolVo.java Normal file
View File

@@ -0,0 +1,72 @@
package com.ruoyi.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.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import lombok.Data;
import java.util.Date;
/**
* 奖金池视图对象 oa_bonus_pool
*
* @author ruoyi
* @date 2025-10-23
*/
@Data
@ExcelIgnoreUnannotated
public class OaBonusPoolVo {
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ExcelProperty(value = "主键ID")
private Long poolId;
/**
* 奖金池名称
*/
@ExcelProperty(value = "奖金池名称")
private String poolName;
/**
* 开始日期
*/
@ExcelProperty(value = "开始日期")
private Date startDate;
/**
* 结束日期
*/
@ExcelProperty(value = "结束日期")
private Date endDate;
/**
* 奖金池总金额（单位：元）
*/
@ExcelProperty(value = "奖金池总金额", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "单=位：元")
private BigDecimal totalAmount;
/**
* 剩余金额（单位：元）
*/
@ExcelProperty(value = "剩余金额", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "单=位：元")
private BigDecimal remainingAmount;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

59
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaBonusProjectRelVo.java Normal file
View File

@@ -0,0 +1,59 @@
package com.ruoyi.oa.domain.vo;
import java.math.BigDecimal;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import lombok.Data;
import java.util.Date;
/**
* 奖金池与项目关联视图对象 oa_bonus_project_rel
*
* @author ruoyi
* @date 2025-10-23
*/
@Data
@ExcelIgnoreUnannotated
public class OaBonusProjectRelVo {
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ExcelProperty(value = "主键ID")
private Long relId;
/**
* 奖金池ID（关联bonus_pool表id）
*/
@ExcelProperty(value = "奖金池ID", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "关=联bonus_pool表id")
private Long poolId;
/**
* 项目ID（关联项目表id）
*/
@ExcelProperty(value = "项目ID", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "关=联项目表id")
private Long projectId;
/**
* 已分配给该项目的金额（单位：元）
*/
@ExcelProperty(value = "已分配给该项目的金额", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "单=位：元")
private BigDecimal allocatedAmount;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

15
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaBonusPoolMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package com.ruoyi.oa.mapper;
import com.ruoyi.oa.domain.OaBonusPool;
import com.ruoyi.oa.domain.vo.OaBonusPoolVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
/**
* 奖金池Mapper接口
*
* @author ruoyi
* @date 2025-10-23
*/
public interface OaBonusPoolMapper extends BaseMapperPlus<OaBonusPoolMapper, OaBonusPool, OaBonusPoolVo> {
}

15
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaBonusProjectRelMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package com.ruoyi.oa.mapper;
import com.ruoyi.oa.domain.OaBonusProjectRel;
import com.ruoyi.oa.domain.vo.OaBonusProjectRelVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
/**
* 奖金池与项目关联Mapper接口
*
* @author ruoyi
* @date 2025-10-23
*/
public interface OaBonusProjectRelMapper extends BaseMapperPlus<OaBonusProjectRelMapper, OaBonusProjectRel, OaBonusProjectRelVo> {
}

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

@@ -0,0 +1,49 @@
package com.ruoyi.oa.service;
import com.ruoyi.oa.domain.OaBonusPool;
import com.ruoyi.oa.domain.vo.OaBonusPoolVo;
import com.ruoyi.oa.domain.bo.OaBonusPoolBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 奖金池Service接口
*
* @author ruoyi
* @date 2025-10-23
*/
public interface IOaBonusPoolService {
/**
* 查询奖金池
*/
OaBonusPoolVo queryById(Long poolId);
/**
* 查询奖金池列表
*/
TableDataInfo<OaBonusPoolVo> queryPageList(OaBonusPoolBo bo, PageQuery pageQuery);
/**
* 查询奖金池列表
*/
List<OaBonusPoolVo> queryList(OaBonusPoolBo bo);
/**
* 新增奖金池
*/
Boolean insertByBo(OaBonusPoolBo bo);
/**
* 修改奖金池
*/
Boolean updateByBo(OaBonusPoolBo bo);
/**
* 校验并批量删除奖金池信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

51
ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaBonusProjectRelService.java Normal file
View File

@@ -0,0 +1,51 @@
package com.ruoyi.oa.service;
import com.ruoyi.oa.domain.OaBonusProjectRel;
import com.ruoyi.oa.domain.vo.OaBonusProjectRelVo;
import com.ruoyi.oa.domain.bo.OaBonusProjectRelBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 奖金池与项目关联Service接口
*
* @author ruoyi
* @date 2025-10-23
*/
public interface IOaBonusProjectRelService {
/**
* 查询奖金池与项目关联
*/
OaBonusProjectRelVo queryById(Long relId);
/**
* 查询奖金池与项目关联列表
*/
TableDataInfo<OaBonusProjectRelVo> queryPageList(OaBonusProjectRelBo bo, PageQuery pageQuery);
/**
* 查询奖金池与项目关联列表
*/
List<OaBonusProjectRelVo> queryList(OaBonusProjectRelBo bo);
/**
* 新增奖金池与项目关联
*/
Boolean insertByBo(OaBonusProjectRelBo bo);
/**
* 修改奖金池与项目关联
*/
Boolean updateByBo(OaBonusProjectRelBo bo);
/**
* 校验并批量删除奖金池与项目关联信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
boolean batchAdd(OaBonusProjectRelBo bo);
}

113
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaBonusPoolServiceImpl.java Normal file
View File

@@ -0,0 +1,113 @@
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.OaBonusPoolBo;
import com.ruoyi.oa.domain.vo.OaBonusPoolVo;
import com.ruoyi.oa.domain.OaBonusPool;
import com.ruoyi.oa.mapper.OaBonusPoolMapper;
import com.ruoyi.oa.service.IOaBonusPoolService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 奖金池Service业务层处理
*
* @author ruoyi
* @date 2025-10-23
*/
@RequiredArgsConstructor
@Service
public class OaBonusPoolServiceImpl implements IOaBonusPoolService {
private final OaBonusPoolMapper baseMapper;
/**
* 查询奖金池
*/
@Override
public OaBonusPoolVo queryById(Long poolId){
return baseMapper.selectVoById(poolId);
}
/**
* 查询奖金池列表
*/
@Override
public TableDataInfo<OaBonusPoolVo> queryPageList(OaBonusPoolBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OaBonusPool> lqw = buildQueryWrapper(bo);
Page<OaBonusPoolVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询奖金池列表
*/
@Override
public List<OaBonusPoolVo> queryList(OaBonusPoolBo bo) {
LambdaQueryWrapper<OaBonusPool> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<OaBonusPool> buildQueryWrapper(OaBonusPoolBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<OaBonusPool> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getPoolName()), OaBonusPool::getPoolName, bo.getPoolName());
lqw.eq(bo.getStartDate() != null, OaBonusPool::getStartDate, bo.getStartDate());
lqw.eq(bo.getEndDate() != null, OaBonusPool::getEndDate, bo.getEndDate());
lqw.eq(bo.getTotalAmount() != null, OaBonusPool::getTotalAmount, bo.getTotalAmount());
lqw.eq(bo.getRemainingAmount() != null, OaBonusPool::getRemainingAmount, bo.getRemainingAmount());
return lqw;
}
/**
* 新增奖金池
*/
@Override
public Boolean insertByBo(OaBonusPoolBo bo) {
OaBonusPool add = BeanUtil.toBean(bo, OaBonusPool.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setPoolId(add.getPoolId());
}
return flag;
}
/**
* 修改奖金池
*/
@Override
public Boolean updateByBo(OaBonusPoolBo bo) {
OaBonusPool update = BeanUtil.toBean(bo, OaBonusPool.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(OaBonusPool entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除奖金池
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

136
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaBonusProjectRelServiceImpl.java Normal file
View File

@@ -0,0 +1,136 @@
package com.ruoyi.oa.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
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.OaBonusProjectRelBo;
import com.ruoyi.oa.domain.vo.OaBonusProjectRelVo;
import com.ruoyi.oa.domain.OaBonusProjectRel;
import com.ruoyi.oa.mapper.OaBonusProjectRelMapper;
import com.ruoyi.oa.service.IOaBonusProjectRelService;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 奖金池与项目关联Service业务层处理
*
* @author ruoyi
* @date 2025-10-23
*/
@RequiredArgsConstructor
@Service
public class OaBonusProjectRelServiceImpl implements IOaBonusProjectRelService {
private final OaBonusProjectRelMapper baseMapper;
/**
* 查询奖金池与项目关联
*/
@Override
public OaBonusProjectRelVo queryById(Long relId){
return baseMapper.selectVoById(relId);
}
/**
* 查询奖金池与项目关联列表
*/
@Override
public TableDataInfo<OaBonusProjectRelVo> queryPageList(OaBonusProjectRelBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OaBonusProjectRel> lqw = buildQueryWrapper(bo);
Page<OaBonusProjectRelVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询奖金池与项目关联列表
*/
@Override
public List<OaBonusProjectRelVo> queryList(OaBonusProjectRelBo bo) {
LambdaQueryWrapper<OaBonusProjectRel> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<OaBonusProjectRel> buildQueryWrapper(OaBonusProjectRelBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<OaBonusProjectRel> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getPoolId() != null, OaBonusProjectRel::getPoolId, bo.getPoolId());
lqw.eq(bo.getProjectId() != null, OaBonusProjectRel::getProjectId, bo.getProjectId());
lqw.eq(bo.getAllocatedAmount() != null, OaBonusProjectRel::getAllocatedAmount, bo.getAllocatedAmount());
return lqw;
}
/**
* 新增奖金池与项目关联
*/
@Override
public Boolean insertByBo(OaBonusProjectRelBo bo) {
OaBonusProjectRel add = BeanUtil.toBean(bo, OaBonusProjectRel.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setRelId(add.getRelId());
}
return flag;
}
/**
* 修改奖金池与项目关联
*/
@Override
public Boolean updateByBo(OaBonusProjectRelBo bo) {
OaBonusProjectRel update = BeanUtil.toBean(bo, OaBonusProjectRel.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(OaBonusProjectRel entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除奖金池与项目关联
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean batchAdd(OaBonusProjectRelBo bo) {
//批量插入奖金池id和项目id属于一对多的关系
if (CollUtil.isEmpty(bo.getProjectIds())) {
return false;
}
boolean success = true;
for (Long projectId : bo.getProjectIds()) {
OaBonusProjectRel rel = new OaBonusProjectRel();
rel.setPoolId(bo.getPoolId());
rel.setProjectId(projectId);
rel.setAllocatedAmount(bo.getAllocatedAmount());
int result = baseMapper.insert(rel);
if (result <= 0) {
success = false;
break;
}
}
return success;
}
}

23
ruoyi-oa/src/main/resources/mapper/oa/OaBonusPoolMapper.xml Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.oa.mapper.OaBonusPoolMapper">
<resultMap type="com.ruoyi.oa.domain.OaBonusPool" id="OaBonusPoolResult">
<result property="poolId" column="pool_id"/>
<result property="poolName" column="pool_name"/>
<result property="startDate" column="start_date"/>
<result property="endDate" column="end_date"/>
<result property="totalAmount" column="total_amount"/>
<result property="remainingAmount" column="remaining_amount"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="delFlag" column="del_flag"/>
<result property="remark" column="remark"/>
</resultMap>
</mapper>

21
ruoyi-oa/src/main/resources/mapper/oa/OaBonusProjectRelMapper.xml Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.oa.mapper.OaBonusProjectRelMapper">
<resultMap type="com.ruoyi.oa.domain.OaBonusProjectRel" id="OaBonusProjectRelResult">
<result property="relId" column="rel_id"/>
<result property="poolId" column="pool_id"/>
<result property="projectId" column="project_id"/>
<result property="allocatedAmount" column="allocated_amount"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="delFlag" column="del_flag"/>
<result property="remark" column="remark"/>
</resultMap>
</mapper>