Merge remote-tracking branch 'origin/main'
This commit is contained in:
liuzongkun999
@@ -0,0 +1,49 @@
|
||||
package com.ruoyi.oa.service;
|
||||
|
||||
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.common.core.domain.PageQuery;
|
||||
import com.ruoyi.oa.domain.bo.SysOaClaimDetailBo;
|
||||
import com.ruoyi.oa.domain.vo.SysOaClaimDetailVo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 报销明细Service接口
|
||||
*
|
||||
* @author hdka
|
||||
* @date 2025-02-21
|
||||
*/
|
||||
public interface ISysOaClaimDetailService {
|
||||
|
||||
/**
|
||||
* 查询报销明细
|
||||
*/
|
||||
SysOaClaimDetailVo queryById(Long claimDetailId);
|
||||
|
||||
/**
|
||||
* 查询报销明细列表
|
||||
*/
|
||||
TableDataInfo<SysOaClaimDetailVo> queryPageList(SysOaClaimDetailBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询报销明细列表
|
||||
*/
|
||||
List<SysOaClaimDetailVo> queryList(SysOaClaimDetailBo bo);
|
||||
|
||||
/**
|
||||
* 新增报销明细
|
||||
*/
|
||||
Boolean insertByBo(SysOaClaimDetailBo bo);
|
||||
|
||||
/**
|
||||
* 修改报销明细
|
||||
*/
|
||||
Boolean updateByBo(SysOaClaimDetailBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除报销明细信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
package com.ruoyi.oa.service;
|
||||
|
||||
import com.ruoyi.oa.domain.vo.SysOaClaimVo;
|
||||
import com.ruoyi.oa.domain.bo.SysOaClaimBo;
|
||||
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-02-21
|
||||
*/
|
||||
public interface ISysOaClaimService {
|
||||
|
||||
/**
|
||||
* 查询差旅费报销
|
||||
*/
|
||||
SysOaClaimVo queryById(Long claimId);
|
||||
|
||||
/**
|
||||
* 查询差旅费报销列表
|
||||
*/
|
||||
TableDataInfo<SysOaClaimVo> queryPageList(SysOaClaimBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询差旅费报销列表
|
||||
*/
|
||||
List<SysOaClaimVo> queryList(SysOaClaimBo bo);
|
||||
|
||||
/**
|
||||
* 新增差旅费报销
|
||||
*/
|
||||
Boolean insertByBo(SysOaClaimBo bo);
|
||||
|
||||
/**
|
||||
* 修改差旅费报销
|
||||
*/
|
||||
Boolean updateByBo(SysOaClaimBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除差旅费报销信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@@ -0,0 +1,117 @@
|
||||
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 com.ruoyi.oa.domain.SysOaClaimDetail;
|
||||
import com.ruoyi.oa.domain.bo.SysOaClaimDetailBo;
|
||||
import com.ruoyi.oa.domain.vo.SysOaClaimDetailVo;
|
||||
import com.ruoyi.oa.mapper.SysOaClaimDetailMapper;
|
||||
import com.ruoyi.oa.service.ISysOaClaimDetailService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 报销明细Service业务层处理
|
||||
*
|
||||
* @author hdka
|
||||
* @date 2025-02-21
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class SysOaClaimDetailServiceImpl implements ISysOaClaimDetailService {
|
||||
|
||||
private final SysOaClaimDetailMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询报销明细
|
||||
*/
|
||||
@Override
|
||||
public SysOaClaimDetailVo queryById(Long claimDetailId){
|
||||
return baseMapper.selectVoById(claimDetailId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询报销明细列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<SysOaClaimDetailVo> queryPageList(SysOaClaimDetailBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<SysOaClaimDetail> lqw = buildQueryWrapper(bo);
|
||||
Page<SysOaClaimDetailVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询报销明细列表
|
||||
*/
|
||||
@Override
|
||||
public List<SysOaClaimDetailVo> queryList(SysOaClaimDetailBo bo) {
|
||||
LambdaQueryWrapper<SysOaClaimDetail> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<SysOaClaimDetail> buildQueryWrapper(SysOaClaimDetailBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<SysOaClaimDetail> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(bo.getClaimId() != null, SysOaClaimDetail::getClaimId, bo.getClaimId());
|
||||
lqw.eq(bo.getClaimType() != null, SysOaClaimDetail::getClaimType, bo.getClaimType());
|
||||
lqw.eq(bo.getBeginTime() != null, SysOaClaimDetail::getBeginTime, bo.getBeginTime());
|
||||
lqw.eq(bo.getEndTime() != null, SysOaClaimDetail::getEndTime, bo.getEndTime());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getLodgingAddress()), SysOaClaimDetail::getLodgingAddress, bo.getLodgingAddress());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getFileIds()), SysOaClaimDetail::getFileIds, bo.getFileIds());
|
||||
lqw.eq(bo.getCost() != null, SysOaClaimDetail::getCost, bo.getCost());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getBigCost()), SysOaClaimDetail::getBigCost, bo.getBigCost());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增报销明细
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(SysOaClaimDetailBo bo) {
|
||||
SysOaClaimDetail add = BeanUtil.toBean(bo, SysOaClaimDetail.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setClaimDetailId(add.getClaimDetailId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改报销明细
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(SysOaClaimDetailBo bo) {
|
||||
SysOaClaimDetail update = BeanUtil.toBean(bo, SysOaClaimDetail.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(SysOaClaimDetail entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除报销明细
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,130 @@
|
||||
package com.ruoyi.oa.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import com.ruoyi.common.helper.LoginHelper;
|
||||
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 com.ruoyi.oa.domain.SysOaClaimDetail;
|
||||
import com.ruoyi.oa.domain.bo.SysOaClaimDetailBo;
|
||||
import com.ruoyi.oa.service.ISysOaClaimDetailService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.oa.domain.bo.SysOaClaimBo;
|
||||
import com.ruoyi.oa.domain.vo.SysOaClaimVo;
|
||||
import com.ruoyi.oa.domain.SysOaClaim;
|
||||
import com.ruoyi.oa.mapper.SysOaClaimMapper;
|
||||
import com.ruoyi.oa.service.ISysOaClaimService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 差旅费报销Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-02-21
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class SysOaClaimServiceImpl implements ISysOaClaimService {
|
||||
|
||||
private final SysOaClaimMapper baseMapper;
|
||||
|
||||
@Autowired
|
||||
private ISysOaClaimDetailService sysOaClaimDetailService;
|
||||
|
||||
/**
|
||||
* 查询差旅费报销
|
||||
*/
|
||||
@Override
|
||||
public SysOaClaimVo queryById(Long claimId){
|
||||
return baseMapper.selectSysOaClaimVoById(claimId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询差旅费报销列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<SysOaClaimVo> queryPageList(SysOaClaimBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<SysOaClaim> lqw = buildQueryWrapper(bo);
|
||||
Page<SysOaClaimVo> result = baseMapper.selectPageVo(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询差旅费报销列表
|
||||
*/
|
||||
@Override
|
||||
public List<SysOaClaimVo> queryList(SysOaClaimBo bo) {
|
||||
LambdaQueryWrapper<SysOaClaim> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<SysOaClaim> buildQueryWrapper(SysOaClaimBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<SysOaClaim> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(bo.getUserId() != null, SysOaClaim::getUserId, bo.getUserId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getFileIds()), SysOaClaim::getFileIds, bo.getFileIds());
|
||||
lqw.eq(bo.getStartTime() != null, SysOaClaim::getStartTime, bo.getStartTime());
|
||||
lqw.eq(bo.getEndTime() != null, SysOaClaim::getEndTime, bo.getEndTime());
|
||||
lqw.eq(bo.getTripDays() != null, SysOaClaim::getTripDays, bo.getTripDays());
|
||||
lqw.eq(bo.getCost() != null, SysOaClaim::getCost, bo.getCost());
|
||||
lqw.eq(bo.getDetailNumber() != null, SysOaClaim::getDetailNumber, bo.getDetailNumber());
|
||||
lqw.eq(bo.getProjectId() != null, SysOaClaim::getProjectId, bo.getProjectId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getProcInsId()), SysOaClaim::getProcInsId, bo.getProcInsId());
|
||||
lqw.eq(bo.getCompletedTime() != null, SysOaClaim::getCompletedTime, bo.getCompletedTime());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增差旅费报销
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(SysOaClaimBo bo) {
|
||||
bo.setUserId(LoginHelper.getUserId());
|
||||
SysOaClaim add = BeanUtil.toBean(bo, SysOaClaim.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
for (SysOaClaimDetailBo sysOaClaimDetail : bo.getClaimDetailList()) {
|
||||
sysOaClaimDetailService.insertByBo(sysOaClaimDetail);
|
||||
}
|
||||
if (flag) {
|
||||
bo.setClaimId(add.getClaimId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改差旅费报销
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(SysOaClaimBo bo) {
|
||||
SysOaClaim update = BeanUtil.toBean(bo, SysOaClaim.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(SysOaClaim 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