Skip to content

V
vehicle-quality-review
Commit 8f29603a authored by wdy's avatar wdy
Browse files
Options

取消任务名称验重

parent f995b534
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 16 deletions
quality-review/src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java
View file @ 8f29603a
...@@ -151,9 +151,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas ...@@ -151,9 +151,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
Long sum = taskMapper.findTaskName(request.getTaskName()); Long sum = taskMapper.findTaskName(request.getTaskName());
if (sum > 0) { // TODO 任务名称验重
throw new ServiceException("任务名称重复，请检查", HttpStatus.ERROR); // if (sum > 0) {
} else { // throw new ServiceException("任务名称重复，请检查", HttpStatus.ERROR);
// } 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());
...@@ -217,7 +218,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas ...@@ -217,7 +218,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
taskStateFacade.doCreate(task, request.getTaskList()); taskStateFacade.doCreate(task, request.getTaskList());
} // }
} }
@Override @Override
...@@ -280,7 +281,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas ...@@ -280,7 +281,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
Task oldTask = taskMapper.findByName(request.getTaskName()); Task oldTask = taskMapper.findByName(request.getTaskName());
if (oldTask == null || Objects.equals(oldTask.getId(), request.getId())) { // TODO 任务名称验重
// 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());
...@@ -324,9 +326,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas ...@@ -324,9 +326,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);
} // }
} }
...@@ -478,9 +480,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas ...@@ -478,9 +480,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
public void temporaryStorageTask(TaskCreateRequest request) { public void temporaryStorageTask(TaskCreateRequest request) {
Long sum = taskMapper.findTaskName(request.getTaskName()); Long sum = taskMapper.findTaskName(request.getTaskName());
if (sum > 0) { // TODO 任务名称验重
throw new ServiceException("任务名称重复，请检查", HttpStatus.ERROR); // if (sum > 0) {
} else { // throw new ServiceException("任务名称重复，请检查", HttpStatus.ERROR);
// } else {
// 构建任务创建者 // 构建任务创建者
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
SysUser initiator = sysUserService.selectUserById(loginUser.getUserId()); SysUser initiator = sysUserService.selectUserById(loginUser.getUserId());
...@@ -537,7 +540,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas ...@@ -537,7 +540,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
// 保存任务关联的文件信息 // 保存任务关联的文件信息
saveFileList(request.getFileList(),task); saveFileList(request.getFileList(),task);
} // }
} }
...@@ -546,7 +549,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas ...@@ -546,7 +549,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
Task oldTask = taskMapper.findByName(request.getTaskName()); Task oldTask = taskMapper.findByName(request.getTaskName());
if (oldTask == null || Objects.equals(oldTask.getId(), request.getId())) { // TODO 任务名称验重
// 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());
...@@ -597,9 +601,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas ...@@ -597,9 +601,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