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
00e13906
Commit
00e13906
authored
Mar 04, 2024
by
wdy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
根据子任务id查询总任务详情
parent
e5ccadd0
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
65 additions
and
0 deletions
+65
-0
TaskMapper.java
...ity-review/src/main/java/com/ruoyi/mapper/TaskMapper.java
+2
-0
TaskService.java
...y-review/src/main/java/com/ruoyi/service/TaskService.java
+2
-0
TaskServiceImpl.java
...src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java
+25
-0
TaskController.java
...ty-review/src/main/java/com/ruoyi/web/TaskController.java
+10
-0
TaskSubGetInfoRequest.java
...ain/java/com/ruoyi/web/request/TaskSubGetInfoRequest.java
+13
-0
TaskMapper.xml
quality-review/src/main/resources/mapper/TaskMapper.xml
+13
-0
No files found.
quality-review/src/main/java/com/ruoyi/mapper/TaskMapper.java
View file @
00e13906
...
@@ -33,4 +33,6 @@ public interface TaskMapper extends BaseMapper<Task> {
...
@@ -33,4 +33,6 @@ public interface TaskMapper extends BaseMapper<Task> {
Long
findBySystemReviewTaskId
(
@Param
(
"systemReviewId"
)
Long
systemReviewId
);
Long
findBySystemReviewTaskId
(
@Param
(
"systemReviewId"
)
Long
systemReviewId
);
Task
getByUserIdTemporary
(
@Param
(
"userId"
)
Long
userId
);
Task
getByUserIdTemporary
(
@Param
(
"userId"
)
Long
userId
);
Task
getBySubtaskId
(
@Param
(
"subId"
)
Long
subId
);
}
}
quality-review/src/main/java/com/ruoyi/service/TaskService.java
View file @
00e13906
...
@@ -58,4 +58,6 @@ public interface TaskService extends IService<Task> {
...
@@ -58,4 +58,6 @@ public interface TaskService extends IService<Task> {
void
temporaryStorageTask
(
TaskCreateRequest
request
);
void
temporaryStorageTask
(
TaskCreateRequest
request
);
TaskGetInfoResponse
getByUserId
(
Long
userId
);
TaskGetInfoResponse
getByUserId
(
Long
userId
);
TaskGetInfoResponse
getBySubtaskId
(
TaskSubGetInfoRequest
request
);
}
}
quality-review/src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java
View file @
00e13906
...
@@ -432,6 +432,31 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
...
@@ -432,6 +432,31 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
}
}
@Override
public
TaskGetInfoResponse
getBySubtaskId
(
TaskSubGetInfoRequest
request
)
{
TaskGetInfoResponse
response
=
new
TaskGetInfoResponse
();
Task
task
=
taskMapper
.
getBySubtaskId
(
request
.
getId
());
BeanUtils
.
copyBeanProp
(
response
,
task
);
// 小组成员
List
<
TaskUserRelation
>
relation
=
taskUserRelationService
.
selectQTeamMembers
(
task
.
getId
());
response
.
setAuditors
(
relation
);
// 整车样品信息
List
<
TaskSampleRelation
>
relationList
=
taskSampleRelationService
.
selectByTaskId
(
task
.
getId
(),
TaskSampleRelation
.
COMPLETE_VEHICLE_SAMPLE
);
if
(
relationList
.
size
()
!=
0
&&
relationList
!=
null
)
{
List
<
Sample
>
completeVehicleSampleList
=
sampleManagementMapper
.
findByIdList
(
relationList
);
response
.
setCompleteVehicleSample
(
completeVehicleSampleList
);
}
// 零部件样品信息
List
<
TaskSampleRelation
>
partRelationList
=
taskSampleRelationService
.
selectByTaskId
(
task
.
getId
(),
TaskSampleRelation
.
PART_VEHICLE_SAMPLE
);
if
(
partRelationList
.
size
()
!=
0
&&
partRelationList
!=
null
)
{
List
<
Sample
>
partVehicleSampleList
=
sampleManagementMapper
.
findByIdList
(
partRelationList
);
response
.
setPartVehicleSample
(
partVehicleSampleList
);
}
return
response
;
}
public
Long
saveSystemReview
(
TaskCreateRequest
request
,
SysUser
initiator
,
Standard
standard
,
TaskUserRelation
leader
)
{
public
Long
saveSystemReview
(
TaskCreateRequest
request
,
SysUser
initiator
,
Standard
standard
,
TaskUserRelation
leader
)
{
// 构建并保存任务信息
// 构建并保存任务信息
...
...
quality-review/src/main/java/com/ruoyi/web/TaskController.java
View file @
00e13906
...
@@ -91,6 +91,16 @@ public class TaskController extends BaseController {
...
@@ -91,6 +91,16 @@ public class TaskController extends BaseController {
return
R
.
ok
(
response
);
return
R
.
ok
(
response
);
}
}
@ApiOperation
(
"根据子任务id查看任务详情"
)
@Trace
@Tags
({
@Tag
(
key
=
"param"
,
value
=
"arg[0]"
),
@Tag
(
key
=
"result"
,
value
=
"returnedObj"
)})
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/getBySubtaskId"
)
public
R
<
TaskGetInfoResponse
>
getBySubtaskId
(
@Validated
@RequestBody
TaskSubGetInfoRequest
request
)
{
TaskGetInfoResponse
response
=
taskService
.
getBySubtaskId
(
request
);
return
R
.
ok
(
response
);
}
@ApiOperation
(
"用户发布的任务"
)
@ApiOperation
(
"用户发布的任务"
)
@Trace
@Trace
@Tags
({
@Tag
(
key
=
"param"
,
value
=
"arg[0]"
),
@Tag
(
key
=
"result"
,
value
=
"returnedObj"
)})
@Tags
({
@Tag
(
key
=
"param"
,
value
=
"arg[0]"
),
@Tag
(
key
=
"result"
,
value
=
"returnedObj"
)})
...
...
quality-review/src/main/java/com/ruoyi/web/request/TaskSubGetInfoRequest.java
0 → 100644
View file @
00e13906
package
com
.
ruoyi
.
web
.
request
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
@ApiModel
(
value
=
"TaskSubGetInfoRequest"
,
description
=
"根据子任务id查看任务详情"
)
@Data
public
class
TaskSubGetInfoRequest
{
@ApiModelProperty
(
"id"
)
private
Long
id
;
}
quality-review/src/main/resources/mapper/TaskMapper.xml
View file @
00e13906
...
@@ -252,6 +252,19 @@
...
@@ -252,6 +252,19 @@
FROM t_task
FROM t_task
WHERE task_initiator_id = #{userId} and task_status = 'TEMPORARILY'
WHERE task_initiator_id = #{userId} and task_status = 'TEMPORARILY'
</select>
</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,
product_name,product_model,
entrusted_unit,entrusted_unit_address,entrusted_unit_phone,
entrusted_unit_code,vehicle_sample_information,part_sample_information,
task_initiator_id,task_initiator,task_initiator_dept,
task_begin_time,task_end_time,create_time,
leader_id,leader,standard_id,name,
standard_no,file,task_list
FROM t_task
WHERE system_review_task_id = #{subId} OR car_review_task_id = #{subId}
</select>
</mapper>
</mapper>
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