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
1421e575
Commit
1421e575
authored
Apr 11, 2024
by
wdy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
查看测试矩阵、删除确认车型审查问卷查询场景接口
parent
c775e161
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
55 additions
and
12 deletions
+55
-12
StrategyCarReviewTaskSigned.java
...a/com/ruoyi/service/impl/StrategyCarReviewTaskSigned.java
+0
-6
TaskServiceImpl.java
...src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java
+55
-6
No files found.
quality-review/src/main/java/com/ruoyi/service/impl/StrategyCarReviewTaskSigned.java
View file @
1421e575
...
...
@@ -85,12 +85,6 @@ public class StrategyCarReviewTaskSigned implements StrategyCarReviewTask, Initi
response
.
setCarReviewTask
(
carReviewTask
);
Task
task
=
taskMapper
.
getBySubtaskId
(
carReviewTask
.
getId
());
if
(
task
.
getModelTestTaskId
()
!=
null
)
{
response
.
setTestScenarioList
(
testScenarioMapper
.
selectAll
());
}
return
response
;
}
...
...
quality-review/src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java
View file @
1421e575
...
...
@@ -239,12 +239,14 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
setCarProgress
(
carReviewTaskList
,
responses
);
// 车型试验子任务列表
List
<
ModelTestTask
>
modelTestTaskList
=
modelTestTaskMapper
.
findByTaskList
(
responses
);
setModelProgress
(
modelTestTaskList
,
responses
);
// List<ModelTestTask> modelTestTaskList = modelTestTaskMapper.findByTaskList(responses);
// setModelProgress(modelTestTaskList,responses);
// 设置车型试验进度
setModelSchedule
(
responses
);
// 任务是否有选择场景
List
<
TaskScenarioResponse
>
scenarioResponseList
=
taskMapper
.
findByTaskList
(
responses
);
setTaskScenario
(
scenarioResponseList
,
responses
);
//
List<TaskScenarioResponse> scenarioResponseList = taskMapper.findByTaskList(responses);
//
setTaskScenario(scenarioResponseList,responses);
for
(
TaskFindResponse
response
:
responses
)
{
...
...
@@ -390,8 +392,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
setCarProgress
(
carReviewTaskList
,
responses
);
// 车型试验子任务列表
List
<
ModelTestTask
>
modelTestTaskList
=
modelTestTaskMapper
.
findByTaskList
(
responses
);
setModelProgress
(
modelTestTaskList
,
responses
);
// List<ModelTestTask> modelTestTaskList = modelTestTaskMapper.findByTaskList(responses);
// setModelProgress(modelTestTaskList,responses);
// 设置车型试验进度
setModelSchedule
(
responses
);
for
(
TaskFindResponse
response
:
responses
)
{
String
[]
taskList
=
response
.
getTaskList
().
split
(
","
);
...
...
@@ -762,6 +766,51 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
}
}
private
void
setModelSchedule
(
List
<
TaskFindResponse
>
responses
)
{
if
(
responses
!=
null
&&
responses
.
size
()
!=
0
)
{
for
(
TaskFindResponse
response
:
responses
)
{
if
(
response
.
getTestSchemeId
()
!=
null
)
{
// 获取任务的用例数量
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"id"
,
response
.
getTestSchemeId
());
map
.
put
(
"verbose"
,
"BASIC"
);
//以post形式请求接口
String
result
=
HttpUtil
.
post
(
"https://10.12.48.78:8090/DescribeProjectTestResult"
,
JSONObject
.
toJSONString
(
map
));
JSONObject
jsonObject
=
JSONObject
.
parseObject
(
result
);
// 获取项目id
Integer
useCaseNum
=
(
Integer
)
jsonObject
.
get
(
"case_count"
);
// 任务是否有选择用例
response
.
setTaskScenario
(
useCaseNum
>
0
);
// 任务用例结果数量
Long
resultNum
=
testRecordsMapper
.
countResult
(
response
.
getTestSchemeId
());
if
(
Objects
.
equals
(
response
.
getTestStatus
(),
ModelTestTask
.
TASK_STATUS_FINISH
))
{
response
.
setTest
(
100.0
);
}
else
if
(
Objects
.
equals
(
response
.
getTestStatus
(),
ModelTestTask
.
TASK_STATUS_SIGNED
))
{
response
.
setTest
(
90.0
);
}
else
if
(
resultNum
==
null
)
{
response
.
setTest
(
0.0
);
}
else
{
BigDecimal
num
=
new
BigDecimal
((
resultNum
/
useCaseNum
)
*
90
);
response
.
setTest
(
num
.
setScale
(
1
,
BigDecimal
.
ROUND_UP
).
doubleValue
());
}
}
else
{
// 任务是否有选择用例
response
.
setTaskScenario
(
false
);
}
}
}
}
private
void
setModelProgress
(
List
<
ModelTestTask
>
modelTestTaskList
,
List
<
TaskFindResponse
>
responses
)
{
if
(
modelTestTaskList
!=
null
&&
modelTestTaskList
.
size
()
!=
0
)
{
...
...
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