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

108
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaTaskUserController.java Normal file
View File

@@ -0,0 +1,108 @@
package com.ruoyi.oa.controller;
import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.core.validate.QueryGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.oa.domain.vo.SysOaTaskUserVo;
import com.ruoyi.oa.domain.bo.SysOaTaskUserBo;
import com.ruoyi.oa.service.ISysOaTaskUserService;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 任务工人
*
* @author hdka
* @date 2024-11-09
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/oaTaskUser")
public class SysOaTaskUserController extends BaseController {
private final ISysOaTaskUserService iSysOaTaskUserService;
/**
* 查询任务工人列表
*/
@SaCheckPermission("system:oaTaskUser:list")
@GetMapping("/list")
public TableDataInfo<SysOaTaskUserVo> list(SysOaTaskUserBo bo, PageQuery pageQuery) {
return iSysOaTaskUserService.queryPageList(bo, pageQuery);
}
/**
* 导出任务工人列表
*/
@SaCheckPermission("system:oaTaskUser:export")
@Log(title = "任务工人", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysOaTaskUserBo bo, HttpServletResponse response) {
List<SysOaTaskUserVo> list = iSysOaTaskUserService.queryList(bo);
ExcelUtil.exportExcel(list, "任务工人", SysOaTaskUserVo.class, response);
}
/**
* 获取任务工人详细信息
*
* @param taskId 主键
*/
@SaCheckPermission("system:oaTaskUser:query")
@GetMapping("/{taskId}")
public R<SysOaTaskUserVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long taskId) {
return R.ok(iSysOaTaskUserService.queryById(taskId));
}
/**
* 新增任务工人
*/
@SaCheckPermission("system:oaTaskUser:add")
@Log(title = "任务工人", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOaTaskUserBo bo) {
return toAjax(iSysOaTaskUserService.insertByBo(bo));
}
/**
* 修改任务工人
*/
@SaCheckPermission("system:oaTaskUser:edit")
@Log(title = "任务工人", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOaTaskUserBo bo) {
return toAjax(iSysOaTaskUserService.updateByBo(bo));
}
/**
* 删除任务工人
*
* @param taskIds 主键串
*/
@SaCheckPermission("system:oaTaskUser:remove")
@Log(title = "任务工人", businessType = BusinessType.DELETE)
@DeleteMapping("/{taskIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] taskIds) {
return toAjax(iSysOaTaskUserService.deleteWithValidByIds(Arrays.asList(taskIds), true));
}
}

31
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaTaskUser.java Normal file
View File

@@ -0,0 +1,31 @@
package com.ruoyi.oa.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 任务工人对象 sys_oa_task_user
*
* @author hdka
* @date 2024-11-09
*/
@Data
@TableName("sys_oa_task_user")
public class SysOaTaskUser {
private static final long serialVersionUID=1L;
/**
* 主键
*/
private Long userId;
/**
* 任务键
*/
@TableId(value = "task_id")
private Long taskId;
}

8
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskBo.java
View File

@@ -9,6 +9,8 @@ import javax.validation.constraints.*;
import java.util.Date;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseEntity;
@@ -79,6 +81,12 @@ public class SysOaTaskBo extends BaseEntity {
*/
private String accessory;
/**
* 工人id列表
* */
private List<Long> workerList;
/**
* 备注
*/

37
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskUserBo.java Normal file
View File

@@ -0,0 +1,37 @@
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_task_user
*
* @author hdka
* @date 2024-11-09
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class SysOaTaskUserBo extends BaseEntity {
/**
* 主键
*/
@NotNull(message = "主键不能为空", groups = { AddGroup.class, EditGroup.class })
private Long userId;
/**
* 任务键
*/
@NotNull(message = "任务键不能为空", groups = { EditGroup.class })
private Long taskId;
}

37
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaTaskUserVo.java Normal file
View File

@@ -0,0 +1,37 @@
package com.ruoyi.oa.domain.vo;
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;
import java.util.Date;
/**
* 任务工人视图对象 sys_oa_task_user
*
* @author hdka
* @date 2024-11-09
*/
@Data
@ExcelIgnoreUnannotated
public class SysOaTaskUserVo {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@ExcelProperty(value = "主键")
private Long userId;
/**
* 任务键
*/
@ExcelProperty(value = "任务键")
private Long taskId;
}

8
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaTaskVo.java
View File

@@ -6,9 +6,10 @@ 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 com.ruoyi.common.core.domain.entity.SysUser;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
@@ -102,5 +103,10 @@ public class SysOaTaskVo {
@ExcelProperty(value = "创建时间")
private Date createTime;
/**
* 涉及工人列表
* */
private List<SysUser> workerList;
}

15
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaTaskUserMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package com.ruoyi.oa.mapper;
import com.ruoyi.oa.domain.SysOaTaskUser;
import com.ruoyi.oa.domain.vo.SysOaTaskUserVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
/**
* 任务工人Mapper接口
*
* @author hdka
* @date 2024-11-09
*/
public interface SysOaTaskUserMapper extends BaseMapperPlus<SysOaTaskUserMapper, SysOaTaskUser, SysOaTaskUserVo> {
}

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

13
ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskUserMapper.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.oa.mapper.SysOaTaskUserMapper">
<resultMap type="com.ruoyi.oa.domain.SysOaTaskUser" id="SysOaTaskUserResult">
<result property="userId" column="user_id"/>
<result property="taskId" column="task_id"/>
</resultMap>
</mapper>

67
ruoyi-ui/src/views/oa/project/index.vue
View File

@@ -528,7 +528,7 @@
</el-row>
</el-form>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm">保存1</el-button>
<el-button type="primary" @click="submitForm">保存</el-button>
<!-- <el-button @click="cancel">取 消</el-button>-->
</div>
</el-tab-pane>
@@ -587,6 +587,7 @@
{{ item.beginTime }} 至 {{ item.finishTime }}
</el-descriptions-item>
<el-descriptions-item label-style="width:120px;text-align: center;" span="2">
<template slot="label">
<i class="el-icon-tickets"></i>
@@ -597,6 +598,17 @@
</el-tag>
</el-descriptions-item>
<el-descriptions-item span="4">
<template slot="label">
<i class="el-icon-office-building"></i>
涉及工人
</template>
<el-tag type="info" v-for="item in item.workerList" style="margin: 0 5px">
{{item.nickName}}
</el-tag>
</el-descriptions-item>
<el-descriptions-item span="4">
<template slot="label">
<i class="el-icon-office-building"></i>
@@ -699,6 +711,26 @@
</el-col>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="涉及工人" prop="workerList">
<el-select
v-model="taskForm.workerList"
multiple
filterable
remote
reserve-keyword
placeholder="请输入关键词"
:remote-method="remoteMethod"
:loading="queryLoading">
<el-option
v-for="item in workerList"
:key="item.id"
:label="item.nickName"
:value="item.userId">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="优先级" prop="taskGrade">
@@ -1145,6 +1177,7 @@ import {addTask, getTaskByDictType, listTaskByType} from "@/api/oa/task";
import {getDicts} from "@/api/system/dict/data";
import {findContractByProjectId, getOaContract, selectContractByProjectId} from "@/api/oa/oaContract";
import {listByIds} from "@/api/system/oss";
import {listWorker} from "@/api/system/user";
export default {
name: "Project",
@@ -1155,6 +1188,8 @@ export default {
buttonLoading: false,
// 遮罩层
loading: true,
// 工人列表检索loading
queryLoading:false,
reverse: true,
// 选中数组
ids: [],
@@ -1195,6 +1230,8 @@ export default {
desTitle: '8888',
projectNum: '',
contractForm: {},
// 工人列表
workerList:[],
//附件
fileList: [],
//详情lable背景
@@ -1316,10 +1353,19 @@ export default {
},
created() {
this.getList();
this.getDicts()
this.getDicts();
this.getWorkerList();
},
methods: {
/** 获取工人初始列表 */
getWorkerList(){
listWorker().then(res=>{
this.workerList = res.rows
})
},
/**new-工作类型进度**/
getTaskByDictType(pid) {
getTaskByDictType(pid).then(res => {
@@ -1716,6 +1762,23 @@ export default {
this.download('oa/project/export', {
...this.queryParams
}, `project_${new Date().getTime()}.xlsx`)
},
/** 搜索方法 */
remoteMethod(query) {
if (query !== '') {
this.queryLoading = true;
listWorker().then(res=>{
console.log(res.rows)
this.workerList = res.rows.filter(item => {
return item.nickName.toLowerCase()
.indexOf(query.toLowerCase()) > -1;
});
this.queryLoading = false;
})
} else {
this.workerList = [];
}
}
}
};