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
354b5c59
Commit
354b5c59
authored
1 year ago
by
wdy
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'wangdingyi' into 'dev'
用户无部门创建任务 See merge request
!161
parents
c801ed95
01489bdc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
3 deletions
+16
-3
TaskServiceImpl.java
...src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java
+9
-3
TaskStateAdapter.java
...rc/main/java/com/ruoyi/service/impl/TaskStateAdapter.java
+5
-0
TaskStatePending.java
...rc/main/java/com/ruoyi/service/impl/TaskStatePending.java
+2
-0
No files found.
quality-review/src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java
View file @
354b5c59
...
@@ -116,7 +116,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
...
@@ -116,7 +116,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
Task
task
=
new
Task
();
Task
task
=
new
Task
();
task
.
setTaskInitiatorId
(
loginUser
.
getUserId
());
task
.
setTaskInitiatorId
(
loginUser
.
getUserId
());
task
.
setTaskInitiator
(
initiator
.
getNickName
());
task
.
setTaskInitiator
(
initiator
.
getNickName
());
if
(
initiator
.
getDept
()
.
getDeptName
()
!=
null
)
{
if
(
initiator
.
getDept
()
!=
null
)
{
task
.
setTaskInitiatorDept
(
initiator
.
getDept
().
getDeptName
());
task
.
setTaskInitiatorDept
(
initiator
.
getDept
().
getDeptName
());
}
}
task
.
setTaskStatus
(
Task
.
TASK_STATUS_NEW
);
task
.
setTaskStatus
(
Task
.
TASK_STATUS_NEW
);
...
@@ -690,7 +690,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
...
@@ -690,7 +690,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
SystemReviewTask
task
=
new
SystemReviewTask
()
SystemReviewTask
task
=
new
SystemReviewTask
()
.
setTaskNo
(
request
.
getTaskNo
())
.
setTaskNo
(
request
.
getTaskNo
())
.
setTaskInitiator
(
initiator
.
getNickName
())
.
setTaskInitiator
(
initiator
.
getNickName
())
.
setTaskInitiatorDept
(
initiator
.
getDept
().
getDeptName
())
.
setTaskStatus
(
SystemReviewTask
.
STATUS_NEW
)
.
setTaskStatus
(
SystemReviewTask
.
STATUS_NEW
)
.
setLeaderId
(
leader
.
getUserId
())
.
setLeaderId
(
leader
.
getUserId
())
.
setLeader
(
leader
.
getName
())
.
setLeader
(
leader
.
getName
())
...
@@ -700,6 +699,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
...
@@ -700,6 +699,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
.
setStandardNo
(
standard
.
getStandardNo
())
.
setStandardNo
(
standard
.
getStandardNo
())
.
setFile
(
standard
.
getFile
());
.
setFile
(
standard
.
getFile
());
if
(
initiator
.
getDept
()
!=
null
)
{
task
.
setTaskInitiatorDept
(
initiator
.
getDept
().
getDeptName
());
}
systemReviewTaskService
.
save
(
task
);
systemReviewTaskService
.
save
(
task
);
return
task
.
getId
();
return
task
.
getId
();
}
}
...
@@ -712,7 +715,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
...
@@ -712,7 +715,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
CarReviewTask
task
=
new
CarReviewTask
()
CarReviewTask
task
=
new
CarReviewTask
()
.
setTaskNo
(
request
.
getTaskNo
())
.
setTaskNo
(
request
.
getTaskNo
())
.
setTaskInitiator
(
initiator
.
getNickName
())
.
setTaskInitiator
(
initiator
.
getNickName
())
.
setTaskInitiatorDept
(
initiator
.
getDept
().
getDeptName
())
.
setTaskStatus
(
CarReviewTask
.
TASK_STATUS_NEW
)
.
setTaskStatus
(
CarReviewTask
.
TASK_STATUS_NEW
)
.
setLeaderId
(
leader
.
getUserId
())
.
setLeaderId
(
leader
.
getUserId
())
.
setLeader
(
leader
.
getName
())
.
setLeader
(
leader
.
getName
())
...
@@ -722,6 +724,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
...
@@ -722,6 +724,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
.
setStandardNo
(
standard
.
getStandardNo
())
.
setStandardNo
(
standard
.
getStandardNo
())
.
setFile
(
standard
.
getFile
());
.
setFile
(
standard
.
getFile
());
if
(
initiator
.
getDept
()
!=
null
)
{
task
.
setTaskInitiatorDept
(
initiator
.
getDept
().
getDeptName
());
}
carReviewTaskService
.
save
(
task
);
carReviewTaskService
.
save
(
task
);
return
task
.
getId
();
return
task
.
getId
();
}
}
...
...
This diff is collapsed.
Click to expand it.
quality-review/src/main/java/com/ruoyi/service/impl/TaskStateAdapter.java
View file @
354b5c59
...
@@ -10,6 +10,7 @@ import com.ruoyi.service.TaskState;
...
@@ -10,6 +10,7 @@ import com.ruoyi.service.TaskState;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
java.util.Date
;
import
java.util.Objects
;
import
java.util.Objects
;
@Component
@Component
...
@@ -42,6 +43,10 @@ public abstract class TaskStateAdapter implements TaskState {
...
@@ -42,6 +43,10 @@ public abstract class TaskStateAdapter implements TaskState {
if
(
task
.
getPointer
()
+
1
<=
task
.
getMaxPointer
()
)
{
if
(
task
.
getPointer
()
+
1
<=
task
.
getMaxPointer
()
)
{
task
.
setPointer
(
task
.
getPointer
()
+
1
);
task
.
setPointer
(
task
.
getPointer
()
+
1
);
}
}
if
(
task
.
getTaskBeginTime
()
==
null
)
{
task
.
setTaskBeginTime
(
new
Date
());
}
taskService
.
updateById
(
task
);
taskService
.
updateById
(
task
);
}
}
...
...
This diff is collapsed.
Click to expand it.
quality-review/src/main/java/com/ruoyi/service/impl/TaskStatePending.java
View file @
354b5c59
...
@@ -17,6 +17,7 @@ import org.springframework.context.ApplicationContext;
...
@@ -17,6 +17,7 @@ import org.springframework.context.ApplicationContext;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Objects
;
import
java.util.Objects
;
...
@@ -57,6 +58,7 @@ public class TaskStatePending extends TaskStateAdapter implements TaskState, Ini
...
@@ -57,6 +58,7 @@ public class TaskStatePending extends TaskStateAdapter implements TaskState, Ini
task
.
setRunStatus
(
Task
.
RUN_STATUS_RUNNABLE
);
task
.
setRunStatus
(
Task
.
RUN_STATUS_RUNNABLE
);
}
else
{
}
else
{
task
.
setTaskStatus
(
Task
.
TASK_STATUS_FINISH
);
task
.
setTaskStatus
(
Task
.
TASK_STATUS_FINISH
);
task
.
setTaskEndTime
(
new
Date
());
task
.
setRunStatus
(
Task
.
RUN_STATUS_STATUS_RUNNING
);
task
.
setRunStatus
(
Task
.
RUN_STATUS_STATUS_RUNNING
);
}
}
...
...
This diff is collapsed.
Click to expand it.
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