Merge remote-tracking branch 'origin/main'

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaClaim.java

@@ -0,0 +1,79 @@
+package com.ruoyi.oa.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 差旅费报销对象 sys_oa_claim
+ *
+ * @author ruoyi
+ * @date 2025-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_oa_claim")
+public class SysOaClaim extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "claim_id")
+    private Long claimId;
+    /**
+     * 报销人
+     */
+    private Long userId;
+    /**
+     * 票据文件id列表
+     */
+    private String fileIds;
+    /**
+     * 报销缘由/备注
+     */
+    private String remark;
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+    /**
+     * 出差天数
+     */
+    private Long tripDays;
+    /**
+     * 报销金额
+     */
+    private Double cost;
+    /**
+     * 票据总数
+     */
+    private Long detailNumber;
+    /**
+     * 关联项目
+     */
+    private Long projectId;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private Long delFlag;
+    /**
+     * 关联流程id
+     */
+    private String procInsId;
+    /**
+     * 报销时间
+     */
+    private Date completedTime;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaClaimDetail.java

@@ -0,0 +1,71 @@
+package com.ruoyi.oa.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 报销明细对象 sys_oa_claim_detail
+ *
+ * @author hdka
+ * @date 2025-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_oa_claim_detail")
+public class SysOaClaimDetail extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "claim_detail_id")
+    private Long claimDetailId;
+    /**
+     * 外键id
+     */
+    private Long claimId;
+    /**
+     * 报销类型
+     */
+    private Long claimType;
+    /**
+     * 开始时间
+     */
+    private Date beginTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+    /**
+     * 入住地点
+     */
+    private String lodgingAddress;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private Long delFlag;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 文件id列表
+     */
+    private String fileIds;
+    /**
+     * 报销金额
+     */
+    private Double cost;
+    /**
+     * 报销金额大写
+     */
+    private String bigCost;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaClaimBo.java

@@ -0,0 +1,92 @@
+package com.ruoyi.oa.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.oa.domain.SysOaClaimDetail;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+import java.util.List;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 差旅费报销业务对象 sys_oa_claim
+ *
+ * @author ruoyi
+ * @date 2025-02-21
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SysOaClaimBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    private Long claimId;
+
+    /**
+     * 报销人
+     */
+    private Long userId;
+
+    /**
+     * 票据文件id列表
+     */
+    private String fileIds;
+
+    /**
+     * 报销缘由/备注
+     */
+    private String remark;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 出差天数
+     */
+    private Long tripDays;
+
+    /**
+     * 报销金额
+     */
+    private Double cost;
+
+    /**
+     * 票据总数
+     */
+    private Long detailNumber;
+
+    /**
+     * 关联项目
+     */
+    private Long projectId;
+
+    /**
+     * 关联流程id
+     */
+    private String procInsId;
+
+    /**
+     * 报销时间
+     */
+    private Date completedTime;
+
+    /**
+     * 细节列表
+     */
+    private List<SysOaClaimDetailBo> claimDetailList;
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaClaimDetailBo.java

@@ -0,0 +1,85 @@
+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 com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 报销明细业务对象 sys_oa_claim_detail
+ *
+ * @author hdka
+ * @date 2025-02-21
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SysOaClaimDetailBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    private Long claimDetailId;
+
+    /**
+     * 外键id
+     */
+    @NotNull(message = "外键id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long claimId;
+
+    /**
+     * 报销类型
+     */
+    @NotNull(message = "报销类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long claimType;
+
+    /**
+     * 开始时间
+     */
+    @NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date beginTime;
+
+    /**
+     * 结束时间
+     */
+    @NotNull(message = "结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date endTime;
+
+    /**
+     * 入住地点
+     */
+    @NotBlank(message = "入住地点不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String lodgingAddress;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+    /**
+     * 文件id列表
+     */
+    @NotBlank(message = "文件id列表不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String fileIds;
+
+    /**
+     * 报销金额
+     */
+    @NotNull(message = "报销金额不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Double cost;
+
+    /**
+     * 报销金额大写
+     */
+    @NotBlank(message = "报销金额大写不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String bigCost;
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaClaimDetailVo.java

@@ -0,0 +1,86 @@
+package com.ruoyi.oa.domain.vo;
+
+import java.util.Date;
+
+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;
+
+
+/**
+ * 报销明细视图对象 sys_oa_claim_detail
+ *
+ * @author hdka
+ * @date 2025-02-21
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class SysOaClaimDetailVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long claimDetailId;
+
+    /**
+     * 外键id
+     */
+    @ExcelProperty(value = "外键id")
+    private Long claimId;
+
+    /**
+     * 报销类型
+     */
+    @ExcelProperty(value = "报销类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "claim_detail_type")
+    private Long claimType;
+
+    /**
+     * 开始时间
+     */
+    @ExcelProperty(value = "开始时间")
+    private Date beginTime;
+
+    /**
+     * 结束时间
+     */
+    @ExcelProperty(value = "结束时间")
+    private Date endTime;
+
+    /**
+     * 入住地点
+     */
+    @ExcelProperty(value = "入住地点")
+    private String lodgingAddress;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 文件id列表
+     */
+    @ExcelProperty(value = "文件id列表")
+    private String fileIds;
+
+    /**
+     * 报销金额
+     */
+    @ExcelProperty(value = "报销金额")
+    private Double cost;
+
+    /**
+     * 报销金额大写
+     */
+    @ExcelProperty(value = "报销金额大写")
+    private String bigCost;
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaClaimVo.java

@@ -0,0 +1,112 @@
+package com.ruoyi.oa.domain.vo;
+
+import java.util.Date;
+import java.util.List;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.oa.domain.SysOaClaim;
+import com.ruoyi.oa.domain.SysOaFile;
+import lombok.Data;
+
+
+/**
+ * 差旅费报销视图对象 sys_oa_claim
+ *
+ * @author ruoyi
+ * @date 2025-02-21
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class SysOaClaimVo extends SysOaClaim {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long claimId;
+
+    /**
+     * 报销人
+     */
+    @ExcelProperty(value = "报销人")
+    private Long userId;
+
+    /**
+     * 票据文件id列表
+     */
+    @ExcelProperty(value = "票据文件id列表")
+    private String fileIds;
+
+    /**
+     * 报销缘由/备注
+     */
+    @ExcelProperty(value = "报销缘由/备注")
+    private String remark;
+
+    /**
+     * 开始时间
+     */
+    @ExcelProperty(value = "开始时间")
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    @ExcelProperty(value = "结束时间")
+    private Date endTime;
+
+    /**
+     * 出差天数
+     */
+    @ExcelProperty(value = "出差天数")
+    private Long tripDays;
+
+    /**
+     * 报销金额
+     */
+    @ExcelProperty(value = "报销金额")
+    private Double cost;
+
+    /**
+     * 票据总数
+     */
+    @ExcelProperty(value = "票据总数")
+    private Long detailNumber;
+
+    /**
+     * 关联项目
+     */
+    @ExcelProperty(value = "关联项目")
+    private Long projectId;
+
+    /**
+     * 关联流程id
+     */
+    @ExcelProperty(value = "关联流程id")
+    private String procInsId;
+
+    /**
+     * 报销时间
+     */
+    @ExcelProperty(value = "报销时间")
+    private Date completedTime;
+
+    /**
+     * 报销细节
+     */
+    private List<SysOaClaimDetailVo> detailList;
+
+    /**
+     * 文件列表
+     */
+    private List<SysOaFile> fileList;
+
+    /**
+     * 任务状态
+     */
+    private Long status;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaClaimDetailMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.oa.mapper;
+
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import com.ruoyi.oa.domain.SysOaClaimDetail;
+import com.ruoyi.oa.domain.vo.SysOaClaimDetailVo;
+
+/**
+ * 报销明细Mapper接口
+ *
+ * @author hdka
+ * @date 2025-02-21
+ */
+public interface SysOaClaimDetailMapper extends BaseMapperPlus<SysOaClaimDetailMapper, SysOaClaimDetail, SysOaClaimDetailVo> {
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaClaimMapper.java

@@ -0,0 +1,20 @@
+package com.ruoyi.oa.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.oa.domain.SysOaClaim;
+import com.ruoyi.oa.domain.vo.SysOaClaimVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 差旅费报销Mapper接口
+ *
+ * @author ruoyi
+ * @date 2025-02-21
+ */
+public interface SysOaClaimMapper extends BaseMapperPlus<SysOaClaimMapper, SysOaClaim, SysOaClaimVo> {
+
+    SysOaClaimVo selectSysOaClaimVoById(Long claimId);
+
+    Page<SysOaClaimVo> selectPageVo(Page<Object> build, LambdaQueryWrapper<SysOaClaim> lqw);
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaClaimDetailService.java

@@ -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);
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaClaimService.java

@@ -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);
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaClaimDetailServiceImpl.java

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

ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaClaimServiceImpl.java

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