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
f6295953
Commit
f6295953
authored
Mar 05, 2024
by
wdy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
开始任务
parent
c61358c5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
16 deletions
+4
-16
Task.java
quality-review/src/main/java/com/ruoyi/domain/Task.java
+1
-3
TaskFindResponse.java
...rc/main/java/com/ruoyi/web/response/TaskFindResponse.java
+0
-3
TaskGetInfoResponse.java
...main/java/com/ruoyi/web/response/TaskGetInfoResponse.java
+0
-3
TaskMapper.xml
quality-review/src/main/resources/mapper/TaskMapper.xml
+3
-7
No files found.
quality-review/src/main/java/com/ruoyi/domain/Task.java
View file @
f6295953
...
...
@@ -74,9 +74,6 @@ public class Task {
@ApiModelProperty
(
"任务运行状态[RUNNABLE(可运行的)、RUNNING(运行中的)]"
)
private
String
runStatus
;
@ApiModelProperty
(
"下一个节点 SUB_TASK_SRAIF(体系审查子任务)、SUB_TASK_TRFIS(车辆实验子任务)、SUB_TASK_GRFIS(车辆问卷子任务)"
)
private
String
nextNode
;
@ApiModelProperty
(
"任务编号"
)
private
String
taskNo
;
...
...
@@ -165,6 +162,7 @@ public class Task {
private
int
maxPointer
;
// 返回当前节点的下一个节点
public
String
getNextNode
()
{
String
[]
split
=
taskList
.
split
(
","
);
if
(
pointer
+
1
>
maxPointer
)
{
...
...
quality-review/src/main/java/com/ruoyi/web/response/TaskFindResponse.java
View file @
f6295953
...
...
@@ -42,9 +42,6 @@ public class TaskFindResponse {
@ApiModelProperty
(
"任务运行状态[RUNNABLE(可运行的)、RUNNING(运行中的)]"
)
private
String
runStatus
;
@ApiModelProperty
(
"下一个节点 SUB_TASK_SRAIF(体系审查子任务)、SUB_TASK_TRFIS(车辆实验子任务)、SUB_TASK_GRFIS(车辆问卷子任务)"
)
private
String
nextNode
;
@ApiModelProperty
(
"总任务开始时间"
)
private
Date
taskBeginTime
;
...
...
quality-review/src/main/java/com/ruoyi/web/response/TaskGetInfoResponse.java
View file @
f6295953
...
...
@@ -35,9 +35,6 @@ public class TaskGetInfoResponse {
@ApiModelProperty
(
"任务运行状态[RUNNABLE(可运行的)、RUNNING(运行中的)]"
)
private
String
runStatus
;
@ApiModelProperty
(
"下一个节点 SUB_TASK_SRAIF(体系审查子任务)、SUB_TASK_TRFIS(车辆实验子任务)、SUB_TASK_GRFIS(车辆问卷子任务)"
)
private
String
nextNode
;
@ApiModelProperty
(
"任务编号"
)
private
String
taskNo
;
...
...
quality-review/src/main/resources/mapper/TaskMapper.xml
View file @
f6295953
...
...
@@ -10,7 +10,6 @@
<result
property=
"carReviewTaskId"
column=
"car_review_task_id"
jdbcType=
"BIGINT"
/>
<result
property=
"taskStatus"
column=
"task_status"
jdbcType=
"VARCHAR"
/>
<result
property=
"runStatus"
column=
"run_status"
jdbcType=
"VARCHAR"
/>
<result
property=
"nextNode"
column=
"next_node"
jdbcType=
"VARCHAR"
/>
<result
property=
"taskNo"
column=
"task_no"
jdbcType=
"VARCHAR"
/>
<result
property=
"taskName"
column=
"task_name"
jdbcType=
"VARCHAR"
/>
<result
property=
"confidentialityLevel"
column=
"confidentiality_level"
jdbcType=
"VARCHAR"
/>
...
...
@@ -49,7 +48,6 @@
<result
property=
"productModel"
column=
"product_model"
jdbcType=
"VARCHAR"
/>
<result
property=
"taskStatus"
column=
"task_status"
jdbcType=
"VARCHAR"
/>
<result
property=
"runStatus"
column=
"run_status"
jdbcType=
"VARCHAR"
/>
<result
property=
"nextNode"
column=
"next_node"
jdbcType=
"VARCHAR"
/>
<result
property=
"taskBeginTime"
column=
"task_begin_time"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"taskEndTime"
column=
"task_end_time"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"systemTaskBeginTime"
column=
"system_task_begin_time"
jdbcType=
"TIMESTAMP"
/>
...
...
@@ -64,7 +62,7 @@
<select
id=
"findList"
parameterType=
"com.ruoyi.web.request.TaskListRequest"
resultMap=
"BaseResultMap"
>
SELECT id, system_review_task_id, car_review_task_id,
task_status,
next_node,
task_no,task_name,confidentiality_level,
task_status,task_no,task_name,confidentiality_level,
product_name,product_model,
entrusted_unit,entrusted_unit_address,entrusted_unit_phone,
entrusted_unit_code,vehicle_sample_information,part_sample_information,
...
...
@@ -89,7 +87,6 @@
t.leader_id,t.leader,
t.task_begin_time,
t.product_model,
t.next_node,
srt.task_begin_time system_task_begin_time,
srt.task_end_time system_task_end_time,
srt.task_status review_status,
...
...
@@ -170,7 +167,6 @@
t.leader_id,t.leader,
t.task_begin_time,
t.task_end_time,
t.next_node,
srt.task_begin_time system_task_begin_time,
srt.task_end_time system_task_end_time,
srt.task_status review_status,
...
...
@@ -243,7 +239,7 @@
</select>
<select
id=
"getByUserIdTemporary"
resultType=
"com.ruoyi.domain.Task"
>
SELECT id, system_review_task_id, car_review_task_id,
task_status,run_status,
next_node,
task_no,task_name,confidentiality_level,
task_status,run_status,task_no,task_name,confidentiality_level,
product_name,product_model,
entrusted_unit,entrusted_unit_address,entrusted_unit_phone,
entrusted_unit_code,vehicle_sample_information,part_sample_information,
...
...
@@ -256,7 +252,7 @@
</select>
<select
id=
"getBySubtaskId"
resultType=
"com.ruoyi.domain.Task"
>
SELECT id, system_review_task_id, car_review_task_id,
task_status,run_status,
next_node,
task_no,task_name,confidentiality_level,
task_status,run_status,task_no,task_name,confidentiality_level,
product_name,product_model,
entrusted_unit,entrusted_unit_address,entrusted_unit_phone,
entrusted_unit_code,vehicle_sample_information,part_sample_information,
...
...
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