Commit 9cd45d9f authored by wdy's avatar wdy

任务名称验重

parent bcf9ebc2
...@@ -8,8 +8,10 @@ import com.alibaba.fastjson2.JSONObject; ...@@ -8,8 +8,10 @@ import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.DataStatisticsUtils; import com.ruoyi.common.DataStatisticsUtils;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
...@@ -156,10 +158,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas ...@@ -156,10 +158,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
} }
// TODO 任务名称验重 // TODO 任务名称验重
// Long sum = taskMapper.findTaskName(request.getTaskName()); Long sum = taskMapper.findTaskName(request.getTaskName());
// if (sum > 0) { if (sum > 0) {
// throw new ServiceException("任务名称重复,请检查", HttpStatus.ERROR); throw new ServiceException("任务名称重复,请检查", HttpStatus.ERROR);
// } else { } else {
SysUser initiator = sysUserService.selectUserById(loginUser.getUserId()); SysUser initiator = sysUserService.selectUserById(loginUser.getUserId());
Standard standard = standardService.findListById(request.getStandardId()); Standard standard = standardService.findListById(request.getStandardId());
...@@ -220,7 +222,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas ...@@ -220,7 +222,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
taskStateFacade.doCreate(task, request.getTaskList()); taskStateFacade.doCreate(task, request.getTaskList());
// } }
} }
/** /**
...@@ -292,8 +294,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas ...@@ -292,8 +294,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
public void editTask(TaskEditRequest request) { public void editTask(TaskEditRequest request) {
// TODO 任务名称验重 // TODO 任务名称验重
// Task oldTask = taskMapper.findByName(request.getTaskName()); Task oldTask = taskMapper.findByName(request.getTaskName());
// if (oldTask == null || Objects.equals(oldTask.getId(), request.getId())) { if (oldTask == null || Objects.equals(oldTask.getId(), request.getId())) {
// 构建任务创建者 // 构建任务创建者
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
SysUser initiator = sysUserService.selectUserById(loginUser.getUserId()); SysUser initiator = sysUserService.selectUserById(loginUser.getUserId());
...@@ -341,9 +343,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas ...@@ -341,9 +343,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
// 保存任务关联的文件信息 // 保存任务关联的文件信息
saveFileList(request.getFileList(),task); saveFileList(request.getFileList(),task);
// } else { } else {
// throw new ServiceException("任务名称重复,请检查", HttpStatus.ERROR); throw new ServiceException("任务名称重复,请检查", HttpStatus.ERROR);
// } }
} }
...@@ -521,10 +523,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas ...@@ -521,10 +523,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
public void temporaryStorageTask(TaskCreateRequest request) { public void temporaryStorageTask(TaskCreateRequest request) {
// TODO 任务名称验重 // TODO 任务名称验重
// Long sum = taskMapper.findTaskName(request.getTaskName()); Long sum = taskMapper.findTaskName(request.getTaskName());
// if (sum > 0) { if (sum > 0) {
// throw new ServiceException("任务名称重复,请检查", HttpStatus.ERROR); throw new ServiceException("任务名称重复,请检查", HttpStatus.ERROR);
// } else { } else {
// 构建任务创建者 // 构建任务创建者
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
TaskGetInfoResponse temporaryStorageTask = taskService.getByUserId(loginUser.getUserId()); TaskGetInfoResponse temporaryStorageTask = taskService.getByUserId(loginUser.getUserId());
...@@ -589,7 +591,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas ...@@ -589,7 +591,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
saveFileList(request.getFileList(),task); saveFileList(request.getFileList(),task);
} }
// } }
} }
...@@ -601,8 +603,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas ...@@ -601,8 +603,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
public void editTemporaryStorageTask(TaskEditRequest request) { public void editTemporaryStorageTask(TaskEditRequest request) {
// TODO 任务名称验重 // TODO 任务名称验重
// Task oldTask = taskMapper.findByName(request.getTaskName()); Task oldTask = taskMapper.findByName(request.getTaskName());
// if (oldTask == null || Objects.equals(oldTask.getId(), request.getId())) { if (oldTask == null || Objects.equals(oldTask.getId(), request.getId())) {
// 构建任务创建者 // 构建任务创建者
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
SysUser initiator = sysUserService.selectUserById(loginUser.getUserId()); SysUser initiator = sysUserService.selectUserById(loginUser.getUserId());
...@@ -652,9 +654,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas ...@@ -652,9 +654,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
// 保存任务关联的文件信息 // 保存任务关联的文件信息
saveFileList(request.getFileList(),task); saveFileList(request.getFileList(),task);
// } else { } else {
// throw new ServiceException("任务名称重复,请检查", HttpStatus.ERROR); throw new ServiceException("任务名称重复,请检查", HttpStatus.ERROR);
// } }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment