From 40e56ab0513769416bb12a782abc23a340ce9fc0 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 24 Oct 2025 10:30:24 +0800 Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E6=96=B0=E5=A2=9E=E5=A5=96?= =?UTF-8?q?=E9=87=91=E6=B1=A0=E5=88=86=E9=85=8D=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增奖金池分配实体类 OaBonusAllocation 及其相关业务对象 - 实现奖金池分配的增删改查接口和服务层逻辑- 添加奖金池分配的控制器和Mapper配置 - 移除奖金池中的总金额和剩余金额字段及相关逻辑 - 更新Excel导出和导入注解以支持新字段展示 --- .../OaBonusAllocationController.java | 101 ++++++++++++++++ .../ruoyi/oa/domain/OaBonusAllocation.java | 53 +++++++++ .../java/com/ruoyi/oa/domain/OaBonusPool.java | 8 -- .../oa/domain/bo/OaBonusAllocationBo.java | 51 ++++++++ .../com/ruoyi/oa/domain/bo/OaBonusPoolBo.java | 9 -- .../oa/domain/vo/OaBonusAllocationVo.java | 58 +++++++++ .../com/ruoyi/oa/domain/vo/OaBonusPoolVo.java | 13 -- .../oa/mapper/OaBonusAllocationMapper.java | 15 +++ .../oa/service/IOaBonusAllocationService.java | 49 ++++++++ .../impl/OaBonusAllocationServiceImpl.java | 112 ++++++++++++++++++ .../service/impl/OaBonusPoolServiceImpl.java | 2 - .../mapper/oa/OaBonusAllocationMapper.xml | 21 ++++ .../resources/mapper/oa/OaBonusPoolMapper.xml | 2 - 13 files changed, 460 insertions(+), 34 deletions(-) create mode 100644 ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaBonusAllocationController.java create mode 100644 ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaBonusAllocation.java create mode 100644 ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaBonusAllocationBo.java create mode 100644 ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaBonusAllocationVo.java create mode 100644 ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaBonusAllocationMapper.java create mode 100644 ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaBonusAllocationService.java create mode 100644 ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaBonusAllocationServiceImpl.java create mode 100644 ruoyi-oa/src/main/resources/mapper/oa/OaBonusAllocationMapper.xml diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaBonusAllocationController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaBonusAllocationController.java new file mode 100644 index 0000000..7d3ae18 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaBonusAllocationController.java @@ -0,0 +1,101 @@ +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.OaBonusAllocationVo; +import com.ruoyi.oa.domain.bo.OaBonusAllocationBo; +import com.ruoyi.oa.service.IOaBonusAllocationService; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 奖金池分配（记录奖金池向用户的分配比例及金额） + * + * @author ruoyi + * @date 2025-10-24 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/oa/bonusAllocation") +public class OaBonusAllocationController extends BaseController { + + private final IOaBonusAllocationService iOaBonusAllocationService; + + /** + * 查询奖金池分配（记录奖金池向用户的分配比例及金额）列表 + */ + @GetMapping("/list") + public TableDataInfo list(OaBonusAllocationBo bo, PageQuery pageQuery) { + return iOaBonusAllocationService.queryPageList(bo, pageQuery); + } + + /** + * 导出奖金池分配（记录奖金池向用户的分配比例及金额）列表 + */ + @Log(title = "奖金池分配（记录奖金池向用户的分配比例及金额）", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(OaBonusAllocationBo bo, HttpServletResponse response) { + List list = iOaBonusAllocationService.queryList(bo); + ExcelUtil.exportExcel(list, "奖金池分配（记录奖金池向用户的分配比例及金额）", OaBonusAllocationVo.class, response); + } + + /** + * 获取奖金池分配（记录奖金池向用户的分配比例及金额）详细信息 + * + * @param allocationId 主键 + */ + @GetMapping("/{allocationId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long allocationId) { + return R.ok(iOaBonusAllocationService.queryById(allocationId)); + } + + /** + * 新增奖金池分配（记录奖金池向用户的分配比例及金额） + */ + @Log(title = "奖金池分配（记录奖金池向用户的分配比例及金额）", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody OaBonusAllocationBo bo) { + return toAjax(iOaBonusAllocationService.insertByBo(bo)); + } + + /** + * 修改奖金池分配（记录奖金池向用户的分配比例及金额） + */ + @Log(title = "奖金池分配（记录奖金池向用户的分配比例及金额）", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody OaBonusAllocationBo bo) { + return toAjax(iOaBonusAllocationService.updateByBo(bo)); + } + + /** + * 删除奖金池分配（记录奖金池向用户的分配比例及金额） + * + * @param allocationIds 主键串 + */ + @Log(title = "奖金池分配（记录奖金池向用户的分配比例及金额）", businessType = BusinessType.DELETE) + @DeleteMapping("/{allocationIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] allocationIds) { + return toAjax(iOaBonusAllocationService.deleteWithValidByIds(Arrays.asList(allocationIds), true)); + } +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaBonusAllocation.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaBonusAllocation.java new file mode 100644 index 0000000..0808c33 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaBonusAllocation.java @@ -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_allocation + * + * @author ruoyi + * @date 2025-10-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("oa_bonus_allocation") +public class OaBonusAllocation extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 主键ID + */ + @TableId(value = "allocation_id") + private Long allocationId; + /** + * 奖金池ID（关联oa_bonus_pool表pool_id） + */ + private Long poolId; + /** + * 用户昵称 + */ + private String nickName; + /** + * 分配比例（单位：%，如20.00表示20%） + */ + private BigDecimal allocationRatio; + /** + * 删除标识（0：未删除 1：已删除） + */ + @TableLogic + private String delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaBonusPool.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaBonusPool.java index fda5635..9aa07cf 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaBonusPool.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaBonusPool.java @@ -42,14 +42,6 @@ public class OaBonusPool extends BaseEntity { * 结束日期 */ private Date endDate; - /** - * 奖金池总金额（单位：元） - */ - private BigDecimal totalAmount; - /** - * 剩余金额（单位：元） - */ - private BigDecimal remainingAmount; /** * 删除标识（0：未删除 1：已删除） */ diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaBonusAllocationBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaBonusAllocationBo.java new file mode 100644 index 0000000..119715c --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaBonusAllocationBo.java @@ -0,0 +1,51 @@ +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 com.ruoyi.common.core.domain.BaseEntity; + +/** + * 奖金池分配（记录奖金池向用户的分配比例及金额）业务对象 oa_bonus_allocation + * + * @author ruoyi + * @date 2025-10-24 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class OaBonusAllocationBo extends BaseEntity { + + /** + * 主键ID + */ + private Long allocationId; + + /** + * 奖金池ID（关联oa_bonus_pool表pool_id） + */ + private Long poolId; + + /** + * 用户昵称 + */ + private String nickName; + + /** + * 分配比例（单位：%，如20.00表示20%） + */ + private BigDecimal allocationRatio; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaBonusPoolBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaBonusPoolBo.java index 0f8f5db..4284457 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaBonusPoolBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaBonusPoolBo.java @@ -46,15 +46,6 @@ public class OaBonusPoolBo extends BaseEntity { */ private Date endDate; - /** - * 奖金池总金额（单位：元） - */ - private BigDecimal totalAmount; - - /** - * 剩余金额（单位：元） - */ - private BigDecimal remainingAmount; /** * 备注 diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaBonusAllocationVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaBonusAllocationVo.java new file mode 100644 index 0000000..43bd8eb --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaBonusAllocationVo.java @@ -0,0 +1,58 @@ +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_allocation + * + * @author ruoyi + * @date 2025-10-24 + */ +@Data +@ExcelIgnoreUnannotated +public class OaBonusAllocationVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long allocationId; + + /** + * 奖金池ID（关联oa_bonus_pool表pool_id） + */ + @ExcelProperty(value = "奖金池ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "关=联oa_bonus_pool表pool_id") + private Long poolId; + + /** + * 用户昵称 + */ + @ExcelProperty(value = "用户昵称") + private String nickName; + + /** + * 分配比例（单位：%，如20.00表示20%） + */ + @ExcelProperty(value = "分配比例", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "单=位：%，如20.00表示20%") + private BigDecimal allocationRatio; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaBonusPoolVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaBonusPoolVo.java index ef5fd45..f829cfc 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaBonusPoolVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaBonusPoolVo.java @@ -48,19 +48,6 @@ public class OaBonusPoolVo { @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; /** * 备注 diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaBonusAllocationMapper.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaBonusAllocationMapper.java new file mode 100644 index 0000000..4f03a96 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaBonusAllocationMapper.java @@ -0,0 +1,15 @@ +package com.ruoyi.oa.mapper; + +import com.ruoyi.oa.domain.OaBonusAllocation; +import com.ruoyi.oa.domain.vo.OaBonusAllocationVo; +import com.ruoyi.common.core.mapper.BaseMapperPlus; + +/** + * 奖金池分配（记录奖金池向用户的分配比例及金额）Mapper接口 + * + * @author ruoyi + * @date 2025-10-24 + */ +public interface OaBonusAllocationMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaBonusAllocationService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaBonusAllocationService.java new file mode 100644 index 0000000..90a813d --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaBonusAllocationService.java @@ -0,0 +1,49 @@ +package com.ruoyi.oa.service; + +import com.ruoyi.oa.domain.OaBonusAllocation; +import com.ruoyi.oa.domain.vo.OaBonusAllocationVo; +import com.ruoyi.oa.domain.bo.OaBonusAllocationBo; +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-24 + */ +public interface IOaBonusAllocationService { + + /** + * 查询奖金池分配（记录奖金池向用户的分配比例及金额） + */ + OaBonusAllocationVo queryById(Long allocationId); + + /** + * 查询奖金池分配（记录奖金池向用户的分配比例及金额）列表 + */ + TableDataInfo queryPageList(OaBonusAllocationBo bo, PageQuery pageQuery); + + /** + * 查询奖金池分配（记录奖金池向用户的分配比例及金额）列表 + */ + List queryList(OaBonusAllocationBo bo); + + /** + * 新增奖金池分配（记录奖金池向用户的分配比例及金额） + */ + Boolean insertByBo(OaBonusAllocationBo bo); + + /** + * 修改奖金池分配（记录奖金池向用户的分配比例及金额） + */ + Boolean updateByBo(OaBonusAllocationBo bo); + + /** + * 校验并批量删除奖金池分配（记录奖金池向用户的分配比例及金额）信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaBonusAllocationServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaBonusAllocationServiceImpl.java new file mode 100644 index 0000000..26523f5 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaBonusAllocationServiceImpl.java @@ -0,0 +1,112 @@ +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.OaBonusAllocationBo; +import com.ruoyi.oa.domain.vo.OaBonusAllocationVo; +import com.ruoyi.oa.domain.OaBonusAllocation; +import com.ruoyi.oa.mapper.OaBonusAllocationMapper; +import com.ruoyi.oa.service.IOaBonusAllocationService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 奖金池分配（记录奖金池向用户的分配比例及金额）Service业务层处理 + * + * @author ruoyi + * @date 2025-10-24 + */ +@RequiredArgsConstructor +@Service +public class OaBonusAllocationServiceImpl implements IOaBonusAllocationService { + + private final OaBonusAllocationMapper baseMapper; + + /** + * 查询奖金池分配（记录奖金池向用户的分配比例及金额） + */ + @Override + public OaBonusAllocationVo queryById(Long allocationId){ + return baseMapper.selectVoById(allocationId); + } + + /** + * 查询奖金池分配（记录奖金池向用户的分配比例及金额）列表 + */ + @Override + public TableDataInfo queryPageList(OaBonusAllocationBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询奖金池分配（记录奖金池向用户的分配比例及金额）列表 + */ + @Override + public List queryList(OaBonusAllocationBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(OaBonusAllocationBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getPoolId() != null, OaBonusAllocation::getPoolId, bo.getPoolId()); + lqw.like(StringUtils.isNotBlank(bo.getNickName()), OaBonusAllocation::getNickName, bo.getNickName()); + lqw.eq(bo.getAllocationRatio() != null, OaBonusAllocation::getAllocationRatio, bo.getAllocationRatio()); + lqw.orderByDesc(OaBonusAllocation::getCreateTime); + return lqw; + } + + /** + * 新增奖金池分配（记录奖金池向用户的分配比例及金额） + */ + @Override + public Boolean insertByBo(OaBonusAllocationBo bo) { + OaBonusAllocation add = BeanUtil.toBean(bo, OaBonusAllocation.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setAllocationId(add.getAllocationId()); + } + return flag; + } + + /** + * 修改奖金池分配（记录奖金池向用户的分配比例及金额） + */ + @Override + public Boolean updateByBo(OaBonusAllocationBo bo) { + OaBonusAllocation update = BeanUtil.toBean(bo, OaBonusAllocation.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(OaBonusAllocation entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除奖金池分配（记录奖金池向用户的分配比例及金额） + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaBonusPoolServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaBonusPoolServiceImpl.java index fc758a8..cb5244e 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaBonusPoolServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaBonusPoolServiceImpl.java @@ -73,8 +73,6 @@ public class OaBonusPoolServiceImpl implements IOaBonusPoolService { 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; } diff --git a/ruoyi-oa/src/main/resources/mapper/oa/OaBonusAllocationMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/OaBonusAllocationMapper.xml new file mode 100644 index 0000000..44061e2 --- /dev/null +++ b/ruoyi-oa/src/main/resources/mapper/oa/OaBonusAllocationMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-oa/src/main/resources/mapper/oa/OaBonusPoolMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/OaBonusPoolMapper.xml index 2d53385..6ccf39e 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/OaBonusPoolMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/OaBonusPoolMapper.xml @@ -9,8 +9,6 @@ - -