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

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;
}
}