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

feat(oa): 添加封账批次和日记账功能模块

Browse Source 
- 新增封账批次管理相关接口和服务实现
- 新增日记账管理相关接口和服务实现
- 添加对应的实体类、VO类和BO类
- 实现基本的CRUD操作和批量删除功能
This commit is contained in:
Joshi
2025-09-09 15:36:00 +08:00
parent a244a68a96
commit 7b74ae82a7
16 changed files with 1072 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/IOaAccountingBatchService.java Normal file
View File

@@ -0,0 +1,49 @@
package com.ruoyi.oa.service;
import com.ruoyi.oa.domain.OaAccountingBatch;
import com.ruoyi.oa.domain.vo.OaAccountingBatchVo;
import com.ruoyi.oa.domain.bo.OaAccountingBatchBo;
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-09
*/
public interface IOaAccountingBatchService {
/**
* 查询封账批次（管理每次封账的批次信息，一组封账数据对应一个批次）
*/
OaAccountingBatchVo queryById(Long batchId);
/**
* 查询封账批次（管理每次封账的批次信息，一组封账数据对应一个批次）列表
*/
TableDataInfo<OaAccountingBatchVo> queryPageList(OaAccountingBatchBo bo, PageQuery pageQuery);
/**
* 查询封账批次（管理每次封账的批次信息，一组封账数据对应一个批次）列表
*/
List<OaAccountingBatchVo> queryList(OaAccountingBatchBo bo);
/**
* 新增封账批次（管理每次封账的批次信息，一组封账数据对应一个批次）
*/
Boolean insertByBo(OaAccountingBatchBo bo);
/**
* 修改封账批次（管理每次封账的批次信息，一组封账数据对应一个批次）
*/
Boolean updateByBo(OaAccountingBatchBo bo);
/**
* 校验并批量删除封账批次（管理每次封账的批次信息，一组封账数据对应一个批次）信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

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

@@ -0,0 +1,49 @@
package com.ruoyi.oa.service;
import com.ruoyi.oa.domain.OaJournalAccount;
import com.ruoyi.oa.domain.vo.OaJournalAccountVo;
import com.ruoyi.oa.domain.bo.OaJournalAccountBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 日记账（绑定封账批次，未封账数据batch_id为NULL）Service接口
*
* @author Joshi
* @date 2025-09-09
*/
public interface IOaJournalAccountService {
/**
* 查询日记账（绑定封账批次，未封账数据batch_id为NULL）
*/
OaJournalAccountVo queryById(Long journalId);
/**
* 查询日记账（绑定封账批次，未封账数据batch_id为NULL）列表
*/
TableDataInfo<OaJournalAccountVo> queryPageList(OaJournalAccountBo bo, PageQuery pageQuery);
/**
* 查询日记账（绑定封账批次，未封账数据batch_id为NULL）列表
*/
List<OaJournalAccountVo> queryList(OaJournalAccountBo bo);
/**
* 新增日记账（绑定封账批次，未封账数据batch_id为NULL）
*/
Boolean insertByBo(OaJournalAccountBo bo);
/**
* 修改日记账（绑定封账批次，未封账数据batch_id为NULL）
*/
Boolean updateByBo(OaJournalAccountBo bo);
/**
* 校验并批量删除日记账（绑定封账批次，未封账数据batch_id为NULL）信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

113
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaAccountingBatchServiceImpl.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.OaAccountingBatchBo;
import com.ruoyi.oa.domain.vo.OaAccountingBatchVo;
import com.ruoyi.oa.domain.OaAccountingBatch;
import com.ruoyi.oa.mapper.OaAccountingBatchMapper;
import com.ruoyi.oa.service.IOaAccountingBatchService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 封账批次（管理每次封账的批次信息，一组封账数据对应一个批次）Service业务层处理
*
* @author Joshi
* @date 2025-09-09
*/
@RequiredArgsConstructor
@Service
public class OaAccountingBatchServiceImpl implements IOaAccountingBatchService {
private final OaAccountingBatchMapper baseMapper;
/**
* 查询封账批次（管理每次封账的批次信息，一组封账数据对应一个批次）
*/
@Override
public OaAccountingBatchVo queryById(Long batchId){
return baseMapper.selectVoById(batchId);
}
/**
* 查询封账批次（管理每次封账的批次信息，一组封账数据对应一个批次）列表
*/
@Override
public TableDataInfo<OaAccountingBatchVo> queryPageList(OaAccountingBatchBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OaAccountingBatch> lqw = buildQueryWrapper(bo);
Page<OaAccountingBatchVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询封账批次（管理每次封账的批次信息，一组封账数据对应一个批次）列表
*/
@Override
public List<OaAccountingBatchVo> queryList(OaAccountingBatchBo bo) {
LambdaQueryWrapper<OaAccountingBatch> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<OaAccountingBatch> buildQueryWrapper(OaAccountingBatchBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<OaAccountingBatch> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getBatchName()), OaAccountingBatch::getBatchName, bo.getBatchName());
lqw.eq(bo.getStartDate() != null, OaAccountingBatch::getStartDate, bo.getStartDate());
lqw.eq(bo.getEndDate() != null, OaAccountingBatch::getEndDate, bo.getEndDate());
lqw.eq(StringUtils.isNotBlank(bo.getAccountIds()), OaAccountingBatch::getAccountIds, bo.getAccountIds());
lqw.eq(bo.getStatus() != null, OaAccountingBatch::getStatus, bo.getStatus());
return lqw;
}
/**
* 新增封账批次（管理每次封账的批次信息，一组封账数据对应一个批次）
*/
@Override
public Boolean insertByBo(OaAccountingBatchBo bo) {
OaAccountingBatch add = BeanUtil.toBean(bo, OaAccountingBatch.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setBatchId(add.getBatchId());
}
return flag;
}
/**
* 修改封账批次（管理每次封账的批次信息，一组封账数据对应一个批次）
*/
@Override
public Boolean updateByBo(OaAccountingBatchBo bo) {
OaAccountingBatch update = BeanUtil.toBean(bo, OaAccountingBatch.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(OaAccountingBatch entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除封账批次（管理每次封账的批次信息，一组封账数据对应一个批次）
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

134
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaJournalAccountServiceImpl.java Normal file
View File

@@ -0,0 +1,134 @@
package com.ruoyi.oa.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.exception.ServiceException;
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.OaJournalAccountBo;
import com.ruoyi.oa.domain.vo.OaJournalAccountVo;
import com.ruoyi.oa.domain.OaJournalAccount;
import com.ruoyi.oa.mapper.OaJournalAccountMapper;
import com.ruoyi.oa.service.IOaJournalAccountService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 日记账（绑定封账批次，未封账数据batch_id为NULL）Service业务层处理
*
* @author Joshi
* @date 2025-09-09
*/
@RequiredArgsConstructor
@Service
public class OaJournalAccountServiceImpl implements IOaJournalAccountService {
private final OaJournalAccountMapper baseMapper;
/**
* 查询日记账（绑定封账批次，未封账数据batch_id为NULL）
*/
@Override
public OaJournalAccountVo queryById(Long journalId){
return baseMapper.selectVoById(journalId);
}
/**
* 查询日记账（绑定封账批次，未封账数据batch_id为NULL）列表
*/
@Override
public TableDataInfo<OaJournalAccountVo> queryPageList(OaJournalAccountBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OaJournalAccount> lqw = buildQueryWrapper(bo);
Page<OaJournalAccountVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询日记账（绑定封账批次，未封账数据batch_id为NULL）列表
*/
@Override
public List<OaJournalAccountVo> queryList(OaJournalAccountBo bo) {
LambdaQueryWrapper<OaJournalAccount> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<OaJournalAccount> buildQueryWrapper(OaJournalAccountBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<OaJournalAccount> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getAccountId() != null, OaJournalAccount::getAccountId, bo.getAccountId());
lqw.eq(bo.getRecordDate() != null, OaJournalAccount::getRecordDate, bo.getRecordDate());
lqw.eq(StringUtils.isNotBlank(bo.getOppositeSubject()), OaJournalAccount::getOppositeSubject, bo.getOppositeSubject());
lqw.eq(StringUtils.isNotBlank(bo.getSummary()), OaJournalAccount::getSummary, bo.getSummary());
lqw.eq(bo.getIncomeAmount() != null, OaJournalAccount::getIncomeAmount, bo.getIncomeAmount());
lqw.eq(bo.getExpendAmount() != null, OaJournalAccount::getExpendAmount, bo.getExpendAmount());
lqw.eq(bo.getBalance() != null, OaJournalAccount::getBalance, bo.getBalance());
lqw.eq(bo.getBatchId() != null, OaJournalAccount::getBatchId, bo.getBatchId());
return lqw;
}
/**
* 新增日记账（绑定封账批次，未封账数据batch_id为NULL）
*/
@Override
public Boolean insertByBo(OaJournalAccountBo bo) {
OaJournalAccount add = BeanUtil.toBean(bo, OaJournalAccount.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setJournalId(add.getJournalId());
}
return flag;
}
/**
* 修改日记账（绑定封账批次，未封账数据batch_id为NULL）
*/
@Override
public Boolean updateByBo(OaJournalAccountBo bo) {
OaJournalAccount update = BeanUtil.toBean(bo, OaJournalAccount.class);
validEntityBeforeSave(update);
// 如果BatchId不为空，说明该批次数据已被封账，不能修改
OaJournalAccount oaJournalAccount = baseMapper.selectById(update.getJournalId());
if (oaJournalAccount.getBatchId()!=null) {
throw new ServiceException("该批次数据已被封账，不能进行修改操作");
}
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(OaJournalAccount entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除日记账（绑定封账批次，未封账数据batch_id为NULL）
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
//如果journalId不为空，说明该批次数据已被封账，不能删除
// 查询要删除的记录中是否有已封账的数据（batch_id不为null的记录）
List<OaJournalAccount> journalAccounts = baseMapper.selectList(
new LambdaQueryWrapper<OaJournalAccount>()
.in(OaJournalAccount::getJournalId, ids)
.isNotNull(OaJournalAccount::getBatchId)
);
// 如果存在已封账的数据，则不能删除
if (!journalAccounts.isEmpty()) {
throw new ServiceException("选中的数据中包含已封账记录，不能进行删除操作");
}
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}