Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
yangxiujun
/
paidan_demo
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 0121159a
authored
Jun 16, 2023
by
wangli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
1 parent
73370392
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
11 deletions
project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/ScheduleServiceImpl.java
project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/ScheduleServiceImpl.java
View file @
0121159
...
...
@@ -45,22 +45,23 @@ public class ScheduleServiceImpl implements ScheduleService {
IPage
<
OrgTeam
>
pg
=
this
.
queryOrgTeams
(
page
,
size
,
levelType
,
levelIds
);
List
<
OrgTeam
>
orgTeams
=
pg
.
getRecords
();
List
<
ScheduleOverviewResp
.
Team
>
ite
ms
=
new
ArrayList
<>();
List
<
ScheduleOverviewResp
.
Team
>
tea
ms
=
new
ArrayList
<>();
// 获取工单列表
for
(
OrgTeam
t
:
orgTeams
)
{
ScheduleOverviewResp
.
Team
ite
m
=
new
ScheduleOverviewResp
.
Team
();
ite
m
.
setName
(
t
.
getTeamName
());
ite
m
.
setValue
(
t
.
getTeamId
());
ite
m
.
setLevel
(
"team"
);
ScheduleOverviewResp
.
Team
tea
m
=
new
ScheduleOverviewResp
.
Team
();
tea
m
.
setName
(
t
.
getTeamName
());
tea
m
.
setValue
(
t
.
getTeamId
());
tea
m
.
setLevel
(
"team"
);
// 获取改team订单列表
List
<
OrderRequest
>
orders
=
this
.
queryOrderRequests
(
t
.
getTeamId
(),
date
);
ite
m
.
setOrder
(
this
.
getTeamOrderSum
(
orders
));
tea
m
.
setOrder
(
this
.
getTeamOrderSum
(
orders
));
List
<
ScheduleOverviewResp
.
Item
>
children
=
new
ArrayList
<>();
if
(
orders
==
null
||
orders
.
isEmpty
()){
item
.
setChildren
(
children
);
team
.
setChildren
(
children
);
teams
.
add
(
team
);
continue
;
}
...
...
@@ -92,10 +93,12 @@ public class ScheduleServiceImpl implements ScheduleService {
child
.
setDistanceDes
(
""
);
children
.
add
(
child
);
}
ite
m
.
setChildren
(
children
);
tea
m
.
setChildren
(
children
);
item
.
setOrderDesc
(
String
.
format
(
"人均:%d"
,
orders
.
size
()
/
teamEngineers
.
size
()));
item
.
setDistanceDes
(
""
);
team
.
setOrderDesc
(
String
.
format
(
"人均:%d"
,
orders
.
size
()
/
teamEngineers
.
size
()));
team
.
setDistanceDes
(
""
);
teams
.
add
(
team
);
}
ScheduleOverviewResp
res
=
new
ScheduleOverviewResp
();
...
...
@@ -103,7 +106,7 @@ public class ScheduleServiceImpl implements ScheduleService {
res
.
setPages
(
pg
.
getPages
());
res
.
setPageSize
(
pg
.
getSize
());
res
.
setPageCurrent
(
pg
.
getCurrent
());
res
.
setContent
(
ite
ms
);
res
.
setContent
(
tea
ms
);
return
Result
.
success
(
res
);
}
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment