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 32b63dab
authored
Nov 14, 2023
by
刘鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 容量返回类型支持根据分部配置返回
1 parent
085f1aea
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/CapacityQueryServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/CapacityQueryServiceImpl.java
View file @
32b63da
...
...
@@ -161,10 +161,10 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
.
sum
();
//查询单个工程师日期范围内的技能容量信息 后加和汇总
OrgBranchEntity
branchInfo
=
orgBranchDao
.
getByBranchId
(
branchId
);
CopyOnWriteArrayList
<
TimeSliceEntity
>
halfDayTypeTimeSlice
=
new
CopyOnWriteArrayList
<>(
timeSliceDao
.
findByType
(
"HALF
_DAY"
));
CopyOnWriteArrayList
<
TimeSliceEntity
>
all
DayTypeTimeSlice
=
new
CopyOnWriteArrayList
<>();
CopyOnWriteArrayList
<
TimeSliceEntity
>
allDayTypeTimeSlice
=
new
CopyOnWriteArrayList
<>(
timeSliceDao
.
findByType
(
"ALL
_DAY"
));
CopyOnWriteArrayList
<
TimeSliceEntity
>
half
DayTypeTimeSlice
=
new
CopyOnWriteArrayList
<>();
if
(
branchInfo
.
getCapacityType
()
==
0
||
branchInfo
.
getCapacityType
()
==
2
)
{
allDayTypeTimeSlice
.
addAll
(
timeSliceDao
.
findByType
(
"ALL
_DAY"
));
halfDayTypeTimeSlice
.
addAll
(
timeSliceDao
.
findByType
(
"HALF
_DAY"
));
}
CopyOnWriteArrayList
<
TimeSliceEntity
>
timeSliceEntities
=
new
CopyOnWriteArrayList
<>();
if
(
branchInfo
.
getCapacityType
()
==
0
)
{
...
...
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