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
ab40fb10
Commit
ab40fb10
authored
Apr 07, 2024
by
wdy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
查看暂存任务
parent
f036d9eb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
14 deletions
+22
-14
TaskServiceImpl.java
...src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java
+22
-14
No files found.
quality-review/src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java
View file @
ab40fb10
...
...
@@ -2,6 +2,8 @@ package com.ruoyi.service.impl;
import
cn.hutool.core.collection.CollUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
cn.hutool.http.HttpUtil
;
import
com.alibaba.fastjson2.JSONObject
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.ruoyi.common.DataStatisticsUtils
;
...
...
@@ -104,6 +106,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
@Autowired
private
TaskUserRelationMapper
taskUserRelationMapper
;
@Autowired
private
TestRecordsMapper
testRecordsMapper
;
@Override
public
List
<
Task
>
findList
(
TaskListRequest
request
)
{
return
taskMapper
.
findList
(
request
);
...
...
@@ -1078,25 +1083,28 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
// 小组成员
List
<
TaskUserRelation
>
relation
=
taskUserRelationService
.
selectQTeamMembers
(
id
);
// 小组成员姓名、部门
List
<
UserNameResponse
>
userList
=
taskMapper
.
findByRelation
(
relation
);
if
(
relation
!=
null
&&
relation
.
size
()
!=
0
)
{
for
(
UserNameResponse
response
:
userList
)
{
for
(
TaskUserRelation
taskUserRelation
:
relation
)
{
if
(
Objects
.
equals
(
response
.
getUserId
(),
taskUserRelation
.
getUserId
()))
{
taskUserRelation
.
setName
(
response
.
getName
());
taskUserRelation
.
setDeptName
(
response
.
getDeptName
());
// 小组成员姓名、部门
List
<
UserNameResponse
>
userList
=
taskMapper
.
findByRelation
(
relation
);
for
(
UserNameResponse
response
:
userList
)
{
for
(
TaskUserRelation
taskUserRelation
:
relation
)
{
if
(
Objects
.
equals
(
response
.
getUserId
(),
taskUserRelation
.
getUserId
()))
{
taskUserRelation
.
setName
(
response
.
getName
());
taskUserRelation
.
setDeptName
(
response
.
getDeptName
());
}
}
}
}
// 小组成员状态
List
<
TaskUserRelation
>
relationList
=
taskUserRelationMapper
.
findByIdList
(
relation
);
// 小组成员状态
List
<
TaskUserRelation
>
relationList
=
taskUserRelationMapper
.
findByIdList
(
relation
);
for
(
TaskUserRelation
userRelation
:
relationList
)
{
for
(
TaskUserRelation
taskUserRelation
:
relation
)
{
if
(
Objects
.
equals
(
userRelation
.
getUserId
(),
taskUserRelation
.
getUserId
()))
{
taskUserRelation
.
setStatus
(
userRelation
.
getStatus
());
for
(
TaskUserRelation
userRelation
:
relationList
)
{
for
(
TaskUserRelation
taskUserRelation
:
relation
)
{
if
(
Objects
.
equals
(
userRelation
.
getUserId
(),
taskUserRelation
.
getUserId
()))
{
taskUserRelation
.
setStatus
(
userRelation
.
getStatus
());
}
}
}
}
...
...
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