feat(oa): 新增项目进度步骤延期记录功能
- 新增延期记录实体类OaProjectScheduleDelay及其字段定义 - 新增延期记录业务对象OaProjectScheduleDelayBo用于接收请求参数 - 新增延期记录视图对象OaProjectScheduleDelayVo用于返回数据展示 - 新增延期记录服务接口IOaProjectScheduleDelayService及其实现类 - 新增延期记录控制器OaProjectScheduleDelayController提供RESTful API - 新增延期记录Mapper接口OaProjectScheduleDelayMapper及XML映射文件 - 实现延期记录的增删改查、分页查询及导出功能 - 添加审批状态和延期状态等相关字段支持完整的审批流程管理
This commit is contained in:
@@ -0,0 +1,49 @@
|
||||
package com.ruoyi.oa.service;
|
||||
|
||||
import com.ruoyi.oa.domain.OaProjectScheduleDelay;
|
||||
import com.ruoyi.oa.domain.vo.OaProjectScheduleDelayVo;
|
||||
import com.ruoyi.oa.domain.bo.OaProjectScheduleDelayBo;
|
||||
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-12-10
|
||||
*/
|
||||
public interface IOaProjectScheduleDelayService {
|
||||
|
||||
/**
|
||||
* 查询项目进度步骤延期记录
|
||||
*/
|
||||
OaProjectScheduleDelayVo queryById(Long delayId);
|
||||
|
||||
/**
|
||||
* 查询项目进度步骤延期记录列表
|
||||
*/
|
||||
TableDataInfo<OaProjectScheduleDelayVo> queryPageList(OaProjectScheduleDelayBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询项目进度步骤延期记录列表
|
||||
*/
|
||||
List<OaProjectScheduleDelayVo> queryList(OaProjectScheduleDelayBo bo);
|
||||
|
||||
/**
|
||||
* 新增项目进度步骤延期记录
|
||||
*/
|
||||
Boolean insertByBo(OaProjectScheduleDelayBo bo);
|
||||
|
||||
/**
|
||||
* 修改项目进度步骤延期记录
|
||||
*/
|
||||
Boolean updateByBo(OaProjectScheduleDelayBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除项目进度步骤延期记录信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@@ -0,0 +1,125 @@
|
||||
package com.ruoyi.oa.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
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.OaProjectScheduleDelayBo;
|
||||
import com.ruoyi.oa.domain.vo.OaProjectScheduleDelayVo;
|
||||
import com.ruoyi.oa.domain.OaProjectScheduleDelay;
|
||||
import com.ruoyi.oa.mapper.OaProjectScheduleDelayMapper;
|
||||
import com.ruoyi.oa.service.IOaProjectScheduleDelayService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 项目进度步骤延期记录Service业务层处理
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-12-10
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class OaProjectScheduleDelayServiceImpl implements IOaProjectScheduleDelayService {
|
||||
|
||||
private final OaProjectScheduleDelayMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询项目进度步骤延期记录
|
||||
*/
|
||||
@Override
|
||||
public OaProjectScheduleDelayVo queryById(Long delayId){
|
||||
return baseMapper.selectVoById(delayId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询项目进度步骤延期记录列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<OaProjectScheduleDelayVo> queryPageList(OaProjectScheduleDelayBo bo, PageQuery pageQuery) {
|
||||
QueryWrapper<OaProjectScheduleDelay> lqw = buildQueryWrapperPlus(bo);
|
||||
Page<OaProjectScheduleDelayVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
private QueryWrapper<OaProjectScheduleDelay> buildQueryWrapperPlus(OaProjectScheduleDelayBo bo) {
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询项目进度步骤延期记录列表
|
||||
*/
|
||||
@Override
|
||||
public List<OaProjectScheduleDelayVo> queryList(OaProjectScheduleDelayBo bo) {
|
||||
LambdaQueryWrapper<OaProjectScheduleDelay> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<OaProjectScheduleDelay> buildQueryWrapper(OaProjectScheduleDelayBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<OaProjectScheduleDelay> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(bo.getTrackId() != null, OaProjectScheduleDelay::getTrackId, bo.getTrackId());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getApplyUserName()), OaProjectScheduleDelay::getApplyUserName, bo.getApplyUserName());
|
||||
lqw.eq(bo.getApplyTime() != null, OaProjectScheduleDelay::getApplyTime, bo.getApplyTime());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getApplyReason()), OaProjectScheduleDelay::getApplyReason, bo.getApplyReason());
|
||||
lqw.eq(bo.getOriginalEndTime() != null, OaProjectScheduleDelay::getOriginalEndTime, bo.getOriginalEndTime());
|
||||
lqw.eq(bo.getExpectEndTime() != null, OaProjectScheduleDelay::getExpectEndTime, bo.getExpectEndTime());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getApproveUserName()), OaProjectScheduleDelay::getApproveUserName, bo.getApproveUserName());
|
||||
lqw.eq(bo.getApproveTime() != null, OaProjectScheduleDelay::getApproveTime, bo.getApproveTime());
|
||||
lqw.eq(bo.getApproveResult() != null, OaProjectScheduleDelay::getApproveResult, bo.getApproveResult());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getApproveRemark()), OaProjectScheduleDelay::getApproveRemark, bo.getApproveRemark());
|
||||
lqw.eq(bo.getDelayStatus() != null, OaProjectScheduleDelay::getDelayStatus, bo.getDelayStatus());
|
||||
lqw.orderByDesc(OaProjectScheduleDelay::getCreateTime);
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增项目进度步骤延期记录
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(OaProjectScheduleDelayBo bo) {
|
||||
OaProjectScheduleDelay add = BeanUtil.toBean(bo, OaProjectScheduleDelay.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setDelayId(add.getDelayId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改项目进度步骤延期记录
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(OaProjectScheduleDelayBo bo) {
|
||||
OaProjectScheduleDelay update = BeanUtil.toBean(bo, OaProjectScheduleDelay.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(OaProjectScheduleDelay 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