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

新增单个任务派送，缺少报功模式

Browse Source
This commit is contained in:
hdka
2025-03-26 17:34:13 +08:00
parent 6610dfefb9
commit 17a63b5e2a
24 changed files with 498 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaClaimService.java
View File

@@ -53,4 +53,7 @@ public interface ISysOaClaimService {
* @return vo对象
*/
SysOaClaimVo queryByProcInsId(String procInsId);
TableDataInfo<SysOaClaimVo> queryPageListByMoney(SysOaClaimBo bo, PageQuery pageQuery);
TableDataInfo<SysOaClaimVo> queryPageListByClaim(SysOaClaimBo bo, PageQuery pageQuery);
}

22
ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaTaskService.java
View File

@@ -61,4 +61,26 @@ public interface ISysOaTaskService {
* 校验并批量删除任务管理信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 推迟任务申请
* @param bo
* @return
*/
Boolean postponeTask(SysOaTaskBo bo);
/**
* 同意推迟
* @param bo
* @return
*/
Boolean postponeSuccess(SysOaTaskBo bo);
/**
* 我的任务查询
* @param bo
* @param pageQuery
* @return
*/
TableDataInfo<SysOaTaskVo> queryPageListOwn(SysOaTaskBo bo, PageQuery pageQuery);
}

48
ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaTaskUserService.java
View File

@@ -1,48 +0,0 @@
package com.ruoyi.oa.service;
import com.ruoyi.oa.domain.vo.SysOaTaskUserVo;
import com.ruoyi.oa.domain.bo.SysOaTaskUserBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 任务工人Service接口
*
* @author hdka
* @date 2024-11-09
*/
public interface ISysOaTaskUserService {
/**
* 查询任务工人
*/
SysOaTaskUserVo queryById(Long taskId);
/**
* 查询任务工人列表
*/
TableDataInfo<SysOaTaskUserVo> queryPageList(SysOaTaskUserBo bo, PageQuery pageQuery);
/**
* 查询任务工人列表
*/
List<SysOaTaskUserVo> queryList(SysOaTaskUserBo bo);
/**
* 新增任务工人
*/
Boolean insertByBo(SysOaTaskUserBo bo);
/**
* 修改任务工人
*/
Boolean updateByBo(SysOaTaskUserBo bo);
/**
* 校验并批量删除任务工人信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

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

@@ -63,6 +63,25 @@ public class SysOaClaimServiceImpl implements ISysOaClaimService {
return baseMapper.selectSysOaClaimVoByProcInsId(procInsId);
}
@Override
public TableDataInfo<SysOaClaimVo> queryPageListByMoney(SysOaClaimBo bo, PageQuery pageQuery) {
bo.setUserId(LoginHelper.getUserId());
LambdaQueryWrapper<SysOaClaim> lqw = buildQueryWrapper(bo);
lqw.isNull(SysOaClaim::getEndTime);
Page<SysOaClaimVo> result = baseMapper.selectPageVo(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
@Override
public TableDataInfo<SysOaClaimVo> queryPageListByClaim(SysOaClaimBo bo, PageQuery pageQuery) {
bo.setUserId(LoginHelper.getUserId());
LambdaQueryWrapper<SysOaClaim> lqw = buildQueryWrapper(bo);
lqw.isNotNull(SysOaClaim::getEndTime);
Page<SysOaClaimVo> result = baseMapper.selectPageVo(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询差旅费报销列表
*/
@@ -89,7 +108,6 @@ public class SysOaClaimServiceImpl implements ISysOaClaimService {
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());
@@ -122,12 +140,12 @@ public class SysOaClaimServiceImpl implements ISysOaClaimService {
add.setFileIds(fileIdsString);
add.setUserId(LoginHelper.getUserId());
boolean flag = baseMapper.insert(add) > 0;
for (SysOaClaimDetailBo sysOaClaimDetail : bo.getClaimDetailList()) {
sysOaClaimDetail.setClaimId(add.getClaimId());
sysOaClaimDetailService.insertByBo(sysOaClaimDetail);
if(bo.getClaimDetailList() != null && !bo.getClaimDetailList().isEmpty()) {
for (SysOaClaimDetailBo sysOaClaimDetail : bo.getClaimDetailList()) {
sysOaClaimDetail.setClaimId(add.getClaimId());
sysOaClaimDetailService.insertByBo(sysOaClaimDetail);
}
}
if (flag) {
bo.setClaimId(add.getClaimId());
}

1
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaRemindServiceImpl.java
View File

@@ -88,7 +88,6 @@ public class SysOaRemindServiceImpl implements ISysOaRemindService {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SysOaRemind> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getTaskTitle()), SysOaRemind::getTaskTitle, bo.getTaskTitle());
// lqw.eq(bo.getTaskTime() != null, SysOaRemind::getTaskTime, bo.getTaskTime());
lqw.eq(StringUtils.isNotBlank(bo.getTaskStatus()), SysOaRemind::getTaskStatus, bo.getTaskStatus());
lqw.between(params.get("beginTime") != null && params.get("endTime") != null, SysOaRemind::getTaskTime, params.get("beginTime"), params.get("endTime"));
lqw.orderByDesc(SysOaRemind::getCreateTime);

158
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java
View File

@@ -2,6 +2,7 @@ package com.ruoyi.oa.service.impl;
import cn.dev33.satoken.fun.SaParamRetFunction;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysDictType;
@@ -17,13 +18,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.oa.domain.SysOaAttendance;
import com.ruoyi.oa.domain.SysOaTaskUser;
import com.ruoyi.oa.domain.bo.SysOaAttendanceBo;
import com.ruoyi.oa.domain.bo.SysOaTaskUserBo;
import com.ruoyi.oa.domain.vo.SysOaAttendanceVo;
import com.ruoyi.oa.domain.vo.SysOaTaskUserVo;
import com.ruoyi.oa.domain.vo.SysUserVo;
import com.ruoyi.oa.mapper.SysOaTaskUserMapper;
import com.ruoyi.oa.service.ISysOaAttendanceService;
import com.ruoyi.oa.service.ISysOaTaskUserService;
import com.ruoyi.system.service.ISysDictTypeService;
import com.ruoyi.system.service.ISysUserService;
import liquibase.pro.packaged.A;
@@ -53,11 +51,6 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService {
private final ISysDictTypeService dictTypeService;
@Autowired
private ISysOaTaskUserService taskUserService;
@Autowired
private SysOaTaskUserMapper taskUserMapper;
@Autowired
private ISysUserService userService;
@@ -78,10 +71,19 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService {
*/
@Override
public TableDataInfo<SysOaTaskVo> queryPageList(SysOaTaskBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<SysOaTask> lqw = buildQueryWrapper(bo);
//查询当前用户下的数据列表
lqw.eq(StringUtils.isNotBlank(LoginHelper.getLoginUser().getUsername()), SysOaTask::getCreateBy,LoginHelper.getLoginUser().getUsername());
Page<SysOaTaskVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
QueryWrapper<SysOaTask> lqw = buildQueryWrapper(bo);
lqw.orderByDesc("sot.task_rank");
lqw.orderByDesc("sot.create_time");
Page<SysOaTaskVo> result = baseMapper.selectListVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
@Override
public TableDataInfo<SysOaTaskVo> queryPageListOwn(SysOaTaskBo bo, PageQuery pageQuery) {
QueryWrapper<SysOaTask> lqw = buildQueryWrapper(bo);
lqw.orderByDesc("sot.own_rank");
lqw.orderByDesc("sot.create_time");
Page<SysOaTaskVo> result = baseMapper.selectListVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
@@ -132,46 +134,9 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService {
*/
@Override
public List<SysOaTaskVo> queryListByType(SysOaTaskBo bo){
LambdaQueryWrapper<SysOaTask> lqw = buildQueryWrapper(bo);
lqw.eq(StringUtils.isNotEmpty(bo.getProjectId().toString()), SysOaTask::getProjectId, bo.getProjectId());
lqw.eq(StringUtils.isNotBlank(bo.getTaskType()),SysOaTask::getTaskType, bo.getTaskType());
QueryWrapper<SysOaTask> lqw = buildQueryWrapper(bo);
lqw.eq(StringUtils.isNotBlank(bo.getTaskType()),"sot.task_type", bo.getTaskType());
List<SysOaTaskVo> sysOaTaskVos = baseMapper.selectVoList(lqw);
Long projectId = bo.getProjectId();
// 添加负责人列表
for (SysOaTaskVo sysOaTaskVo : sysOaTaskVos) {
LambdaQueryWrapper<SysOaTaskUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(SysOaTaskUser::getTaskId, sysOaTaskVo.getTaskId());
List<SysOaTaskUserVo> sysOaTaskUserVos = taskUserMapper.selectVoList(lambdaQueryWrapper);
List<SysUser> sysUserList = new ArrayList<>();
// 计算总成本
Double projectCostTotal = 0.0;
for (SysOaTaskUserVo sysOaTaskUserVo : sysOaTaskUserVos) {
SysUser sysUser = userService.selectUserById(sysOaTaskUserVo.getUserId());
// 查询当前用户对于此项目的工作时长
SysOaAttendanceBo attendance = new SysOaAttendanceBo();
attendance.setUserId(sysOaTaskUserVo.getUserId());
attendance.setProjectId(projectId);
List<SysOaAttendanceVo> sysOaAttendanceVos = attendanceService.queryList(attendance);
// 写入时间
Double workTime = 0.0;
for (SysOaAttendanceVo sysOaAttendanceVo : sysOaAttendanceVos) {
workTime+=sysOaAttendanceVo.getDayLength();
}
projectCostTotal+=workTime*sysUser.getLaborCost();
sysUser.setWorkTime(workTime);
sysUserList.add(sysUser);
}
sysOaTaskVo.setWorkerList(sysUserList);
sysOaTaskVo.setProjectCostTotal(projectCostTotal);
}
return sysOaTaskVos;
}
@@ -180,17 +145,23 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService {
*/
@Override
public List<SysOaTaskVo> queryList(SysOaTaskBo bo) {
LambdaQueryWrapper<SysOaTask> lqw = buildQueryWrapper(bo);
QueryWrapper<SysOaTask> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<SysOaTask> buildQueryWrapper(SysOaTaskBo bo) {
private QueryWrapper<SysOaTask> buildQueryWrapper(SysOaTaskBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SysOaTask> lqw = Wrappers.lambdaQuery();
lqw.eq(StringUtils.isNotBlank(bo.getProjectId().toString()), SysOaTask::getProjectId, bo.getProjectId());
lqw.eq(StringUtils.isNotBlank(bo.getTaskType()), SysOaTask::getTaskType, bo.getTaskType());
lqw.like(StringUtils.isNotBlank(bo.getTaskTitle()), SysOaTask::getTaskTitle, bo.getTaskTitle());
lqw.orderByDesc(SysOaTask::getCreateTime);
QueryWrapper<SysOaTask> lqw = Wrappers.query();
lqw.eq("sot.del_flag", 0);
lqw.eq(bo.getProjectId()!=null, "sot.project_id", bo.getProjectId());
lqw.eq(bo.getCreateUserId()!=null, "sot.create_user_id", bo.getCreateUserId());
lqw.eq(bo.getWorkerId()!=null, "sot.worker_id", bo.getWorkerId());
lqw.eq(bo.getProjectId()!=null, "sot.project_id", bo.getProjectId());
lqw.eq(bo.getProjectNum()!=null, "sop.project_num", bo.getProjectNum());
lqw.like(bo.getTaskTitle()!=null, "sot.task_title", bo.getTaskTitle());
lqw.like(bo.getCreateUserNickName()!=null, "su1.nick_name", bo.getCreateUserNickName());
lqw.like(bo.getWorkerNickName()!=null, "su2.nick_name", bo.getWorkerNickName());
return lqw;
}
@@ -199,19 +170,28 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService {
*/
@Override
public Boolean insertByBo(SysOaTaskBo bo) {
SysOaTask add = BeanUtil.toBean(bo, SysOaTask.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setTaskId(add.getTaskId());
List<Long> workerIdList = bo.getWorkerList();
for (Long userId : workerIdList) {
SysOaTaskUserBo sysOaTaskUserBo = new SysOaTaskUserBo();
sysOaTaskUserBo.setUserId(userId);
sysOaTaskUserBo.setTaskId(add.getTaskId());
taskUserService.insertByBo(sysOaTaskUserBo);
// 拿到所有的执行人id列表进行遍历添加
List<Long> workerIdList = Arrays.stream( bo.getWorkerIds().split(","))
.map(Long::valueOf)
.collect(Collectors.toList());
boolean flag = false;
for (Long workerId : workerIdList) {
SysOaTask add = BeanUtil.toBean(bo, SysOaTask.class);
add.setCreateUserId(LoginHelper.getUserId());
validEntityBeforeSave(add);
add.setOriginFinishTime(add.getFinishTime());
add.setWorkerId(workerId);
flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setTaskId(add.getTaskId());
}
// 判断是否为报工模式
if (bo.getStatus()==1L){
// TODO 这里新增item数据，为单个条目
}
}
return flag;
}
@@ -220,19 +200,9 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService {
*/
@Override
public Boolean updateByBo(SysOaTaskBo bo) {
// 先删除所有的bo然后再次进行新增操作
SysOaTask update = BeanUtil.toBean(bo, SysOaTask.class);
// 先将该任务底下所属的所有工人信息删除
taskUserMapper.deleteById(update.getTaskId());
// 再进行重新新增
List<Long> workerIdList = bo.getWorkerList();
for (Long userId : workerIdList) {
SysOaTaskUserBo sysOaTaskUserBo = new SysOaTaskUserBo();
sysOaTaskUserBo.setUserId(userId);
sysOaTaskUserBo.setTaskId(update.getTaskId());
taskUserService.insertByBo(sysOaTaskUserBo);
}
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
@@ -254,4 +224,32 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService {
}
return baseMapper.deleteBatchIds(ids) > 0;
}
/**
* 推迟任务state=15代表申请延期
* @param bo
* @return
*/
@Override
public Boolean postponeTask(SysOaTaskBo bo) {
// 将时间交换位置，减少查询数据库次数
bo.setFinishTime(bo.getTempTime());
bo.setState(15L);
return updateByBo(bo);
}
/**
* 20为同
* @param bo
* @return
*/
@Override
public Boolean postponeSuccess(SysOaTaskBo bo) {
SysOaTask sysOaTask = baseMapper.selectById(bo.getTaskId());
sysOaTask.setState(0L);
sysOaTask.setPostponements(sysOaTask.getPostponements() + 1);
return baseMapper.updateById(sysOaTask) > 0;
}
}

109
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskUserServiceImpl.java
View File

@@ -1,109 +0,0 @@
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.SysOaTaskUserBo;
import com.ruoyi.oa.domain.vo.SysOaTaskUserVo;
import com.ruoyi.oa.domain.SysOaTaskUser;
import com.ruoyi.oa.mapper.SysOaTaskUserMapper;
import com.ruoyi.oa.service.ISysOaTaskUserService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 任务工人Service业务层处理
*
* @author hdka
* @date 2024-11-09
*/
@RequiredArgsConstructor
@Service
public class SysOaTaskUserServiceImpl implements ISysOaTaskUserService {
private final SysOaTaskUserMapper baseMapper;
/**
* 查询任务工人
*/
@Override
public SysOaTaskUserVo queryById(Long taskId){
return baseMapper.selectVoById(taskId);
}
/**
* 查询任务工人列表
*/
@Override
public TableDataInfo<SysOaTaskUserVo> queryPageList(SysOaTaskUserBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<SysOaTaskUser> lqw = buildQueryWrapper(bo);
Page<SysOaTaskUserVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询任务工人列表
*/
@Override
public List<SysOaTaskUserVo> queryList(SysOaTaskUserBo bo) {
LambdaQueryWrapper<SysOaTaskUser> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<SysOaTaskUser> buildQueryWrapper(SysOaTaskUserBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SysOaTaskUser> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getUserId() != null, SysOaTaskUser::getUserId, bo.getUserId());
return lqw;
}
/**
* 新增任务工人
*/
@Override
public Boolean insertByBo(SysOaTaskUserBo bo) {
SysOaTaskUser add = BeanUtil.toBean(bo, SysOaTaskUser.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setTaskId(add.getTaskId());
}
return flag;
}
/**
* 修改任务工人
*/
@Override
public Boolean updateByBo(SysOaTaskUserBo bo) {
SysOaTaskUser update = BeanUtil.toBean(bo, SysOaTaskUser.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(SysOaTaskUser entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除任务工人
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}