Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vehicle-quality-review
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王飞
vehicle-quality-review
Commits
fb4d5855
Commit
fb4d5855
authored
Apr 07, 2024
by
wdy
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'wangdingyi' into 'dev'
取消任务名称验重 See merge request
!268
parents
5dcabe03
f63666b8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
16 deletions
+20
-16
TaskServiceImpl.java
...src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java
+20
-16
No files found.
quality-review/src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java
View file @
fb4d5855
...
...
@@ -151,9 +151,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
Long
sum
=
taskMapper
.
findTaskName
(
request
.
getTaskName
());
if
(
sum
>
0
)
{
throw
new
ServiceException
(
"任务名称重复,请检查"
,
HttpStatus
.
ERROR
);
}
else
{
// TODO 任务名称验重
// if (sum > 0) {
// throw new ServiceException("任务名称重复,请检查", HttpStatus.ERROR);
// } else {
SysUser
initiator
=
sysUserService
.
selectUserById
(
loginUser
.
getUserId
());
Standard
standard
=
standardService
.
findListById
(
request
.
getStandardId
());
...
...
@@ -217,7 +218,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
taskStateFacade
.
doCreate
(
task
,
request
.
getTaskList
());
}
//
}
}
@Override
...
...
@@ -280,7 +281,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
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
();
SysUser
initiator
=
sysUserService
.
selectUserById
(
loginUser
.
getUserId
());
...
...
@@ -324,9 +326,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
// 保存任务关联的文件信息
saveFileList
(
request
.
getFileList
(),
task
);
}
else
{
throw
new
ServiceException
(
"任务名称重复,请检查"
,
HttpStatus
.
ERROR
);
}
//
} else {
//
throw new ServiceException("任务名称重复,请检查", HttpStatus.ERROR);
//
}
}
...
...
@@ -478,9 +480,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
public
void
temporaryStorageTask
(
TaskCreateRequest
request
)
{
Long
sum
=
taskMapper
.
findTaskName
(
request
.
getTaskName
());
if
(
sum
>
0
)
{
throw
new
ServiceException
(
"任务名称重复,请检查"
,
HttpStatus
.
ERROR
);
}
else
{
// TODO 任务名称验重
// if (sum > 0) {
// throw new ServiceException("任务名称重复,请检查", HttpStatus.ERROR);
// } else {
// 构建任务创建者
LoginUser
loginUser
=
SecurityUtils
.
getLoginUser
();
SysUser
initiator
=
sysUserService
.
selectUserById
(
loginUser
.
getUserId
());
...
...
@@ -537,7 +540,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
// 保存任务关联的文件信息
saveFileList
(
request
.
getFileList
(),
task
);
}
//
}
}
...
...
@@ -546,7 +549,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
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
();
SysUser
initiator
=
sysUserService
.
selectUserById
(
loginUser
.
getUserId
());
...
...
@@ -597,9 +601,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
// 保存任务关联的文件信息
saveFileList
(
request
.
getFileList
(),
task
);
}
else
{
throw
new
ServiceException
(
"任务名称重复,请检查"
,
HttpStatus
.
ERROR
);
}
//
} else {
//
throw new ServiceException("任务名称重复,请检查", HttpStatus.ERROR);
//
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment