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 6ae9ca93
authored
Jun 13, 2023
by
丁伟峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
日志
1 parent
2f5b7069
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/CapacityQueryServiceImpl.java
project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/CapacityQueryServiceImpl.java
View file @
6ae9ca9
...
...
@@ -82,7 +82,7 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
log
.
info
(
"teamId[{}]layer[{}]"
,
teamId
,
layer
);
CapacityQueryOrderRespDTO
capacityQueryRespDTO
=
new
CapacityQueryOrderRespDTO
();
capacityQueryRespDTO
.
setBeginDate
(
reqDTO
.
getBeginDate
()).
setEndDate
(
reqDTO
.
getEndDate
());
capacityQueryRespDTO
.
setCalendar
(
getT
imeRangeByTeamSkill
(
teamId
,
layer
,
reqDTO
.
getBeginDate
(),
reqDTO
.
getEndDate
()));
capacityQueryRespDTO
.
setCalendar
(
getT
eamCaparityByLayerAndDays
(
teamId
,
layer
,
reqDTO
.
getBeginDate
(),
reqDTO
.
getEndDate
()));
capacityQueryRespDTO
.
setRemark
(
String
.
format
(
"%s-%s"
,
teamId
,
layer
));
return
Result
.
success
(
capacityQueryRespDTO
);
}
...
...
@@ -219,11 +219,12 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
* @param endDate
* @return
*/
private
List
<
CapacityQueryOrderRespDTO
.
CalendarDTO
>
getT
imeRangeByTeamSkill
(
String
teamId
,
String
layer
,
String
beginDate
,
String
endDate
)
{
private
List
<
CapacityQueryOrderRespDTO
.
CalendarDTO
>
getT
eamCaparityByLayerAndDays
(
String
teamId
,
String
layer
,
String
beginDate
,
String
endDate
)
{
log
.
info
(
"==> getTimeRangeByTeamSkill({}, {}, {}, {})"
,
teamId
,
layer
,
beginDate
,
endDate
);
Map
<
String
,
CapacityQueryOrderRespDTO
.
CalendarDTO
>
dayMaps
=
new
HashMap
<>();
List
<
CapacityTeamStatEntity
>
capacityTeamStatEntityList
=
capacityTeamStatDao
.
findAllByTeamIdAndLayerAndWorkdayBetween
(
teamId
,
layer
,
beginDate
,
endDate
);
for
(
CapacityTeamStatEntity
e
:
capacityTeamStatEntityList
)
{
log
.
info
(
"CapacityTeamStatEntity ==> {}"
,
e
);
CapacityQueryOrderRespDTO
.
TimeDTO
timeDTO
=
new
CapacityQueryOrderRespDTO
.
TimeDTO
();
timeDTO
.
setType
(
getSpanType
(
e
.
getCapLeft
(),
e
.
getCapTotal
()));
Object
[]
timeSpans
=
getTimeSpanInfo
(
e
.
getWorkday
(),
e
.
getTimeSpan
(),
e
.
getTimeSpanDetail
());
...
...
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