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

库存欠缺入库测试

Browse Source
This commit is contained in:
86156
2024-11-12 21:32:11 +08:00
parent 69150eaa18
commit ab0c334f05
12 changed files with 530 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,48 @@
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);
}

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

@@ -14,8 +14,17 @@ 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.SysOaTaskUser;
import com.ruoyi.oa.domain.bo.SysOaTaskUserBo;
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.ISysOaTaskUserService;
import com.ruoyi.system.service.ISysDictTypeService;
import com.ruoyi.system.service.ISysUserService;
import liquibase.pro.packaged.A;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.oa.domain.bo.SysOaTaskBo;
import com.ruoyi.oa.domain.vo.SysOaTaskVo;
@@ -40,6 +49,15 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService {
private final ISysDictTypeService dictTypeService;
@Autowired
private ISysOaTaskUserService taskUserService;
@Autowired
private SysOaTaskUserMapper taskUserMapper;
@Autowired
private ISysUserService userService;
/**
* 查询任务管理
*/
@@ -84,8 +102,6 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService {
ajax.put("color", "#cccccc");
objects.add(ajax);
});
System.out.println(objects);
//根据项目id获取任务列表类型属性最大的值
SysOaTaskBo task = new SysOaTaskBo();
task.setProjectId(pid);
@@ -112,7 +128,21 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService {
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());
return baseMapper.selectVoList(lqw);
List<SysOaTaskVo> sysOaTaskVos = baseMapper.selectVoList(lqw);
// 添加负责人列表
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<>();
for (SysOaTaskUserVo sysOaTaskUserVo : sysOaTaskUserVos) {
SysUser sysUser = userService.selectUserById(sysOaTaskUserVo.getUserId());
sysUserList.add(sysUser);
}
sysOaTaskVo.setWorkerList(sysUserList);
}
return sysOaTaskVos;
}
/**
@@ -144,6 +174,13 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService {
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);
}
}
return flag;
}
@@ -154,6 +191,18 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService {
@Override
public Boolean updateByBo(SysOaTaskBo 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;
}

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

@@ -0,0 +1,109 @@
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;
}
}