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 3e8b46a1
authored
Oct 31, 2023
by
刘鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(工作队): 工作队策略更新失败-----字段定义错误
1 parent
a010e3ad
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
9 deletions
project-order/src/main/java/com/dituhui/pea/order/dto/BusinessTeamConfigSubmitDTO.java
project-order/src/main/java/com/dituhui/pea/order/service/CapacityQueryService.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/CapacityQueryServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/dto/BusinessTeamConfigSubmitDTO.java
View file @
3e8b46a
...
...
@@ -7,7 +7,7 @@ public class BusinessTeamConfigSubmitDTO {
/**
* 网点指派策略
*/
private
String
assig
i
nStrategy
;
private
String
assignStrategy
;
/**
* cutoff时间
*/
...
...
project-order/src/main/java/com/dituhui/pea/order/service/CapacityQueryService.java
View file @
3e8b46a
...
...
@@ -57,6 +57,16 @@ public interface CapacityQueryService {
*/
CapacityQueryDTO
.
Segment
queryEngineerCapacity
(
String
engineerCode
,
LocalDate
date
);
/**
* 查询指定日期内的容量
*
* @param engineerCode 工程师编码
* @param startDate 开始日期
* @param endDate 结束日期
* @return 日期内工程师的容量信息
*/
CapacityQueryDTO
.
PersonalResult
queryEngineerCapacity
(
String
engineerCode
,
LocalDate
startDate
,
LocalDate
endDate
);
/**
* 查询单个工程师指定日期时间段内的的容量状态
...
...
project-order/src/main/java/com/dituhui/pea/order/service/impl/CapacityQueryServiceImpl.java
View file @
3e8b46a
...
...
@@ -218,6 +218,11 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
return
null
;
}
@Override
public
CapacityQueryDTO
.
PersonalResult
queryEngineerCapacity
(
String
engineerCode
,
LocalDate
startDate
,
LocalDate
endDate
)
{
//
return
null
;
}
@Override
public
CapacityQueryDTO
.
Segment
queryEngineerCapacity
(
String
engineerCode
,
CapacityQueryDTO
.
Service
service
,
...
...
@@ -345,20 +350,24 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
allEngineerTimeSlice
.
addAll
(
engineerTimeSlice
);
}
//计算所有工程师半天类型容量
List
<
CapacityQueryDTO
.
Segment
>
engineerHalfDay
=
CapacityUtils
.
getEngineerTypeDay
(
halfDayTypeTimeSlice
,
allEngineerTimeSlice
,
currentDate
,
totalTakeTime
);
List
<
CapacityQueryDTO
.
Segment
>
objects
=
new
ArrayList
<>();
if
(
CollectionUtils
.
isNotEmpty
(
halfDayTypeTimeSlice
))
{
List
<
CapacityQueryDTO
.
Segment
>
engineerHalfDay
=
CapacityUtils
.
getEngineerTypeDay
(
halfDayTypeTimeSlice
,
allEngineerTimeSlice
,
currentDate
,
totalTakeTime
);
objects
.
addAll
(
engineerHalfDay
);
}
//计算所有工程师全天天类型容量
List
<
CapacityQueryDTO
.
Segment
>
engineerAllDay
=
CapacityUtils
.
getEngineerTypeDay
(
allDayTypeTimeSlice
,
allEngineerTimeSlice
,
currentDate
,
totalTakeTime
);
if
(
CollectionUtils
.
isNotEmpty
(
allDayTypeTimeSlice
))
{
List
<
CapacityQueryDTO
.
Segment
>
engineerAllDay
=
CapacityUtils
.
getEngineerTypeDay
(
allDayTypeTimeSlice
,
allEngineerTimeSlice
,
currentDate
,
totalTakeTime
);
objects
.
addAll
(
engineerAllDay
);
}
//计算所有工程师时间段类型容量
/*List<CapacityQueryDTO.Segment> timeSliceTwoHour = CapacityUtils.getEngineerTypeDay(timeSliceEntities,
allEngineerTimeSlice, currentDate, totalTakeTime);*/
/*objects.addAll(timeSliceTwoHour);*/
CapacityQueryDTO
.
Data
data
=
new
CapacityQueryDTO
.
Data
();
data
.
setDate
(
DateUtil
.
toDate
(
currentDate
));
List
<
CapacityQueryDTO
.
Segment
>
objects
=
new
ArrayList
<>();
objects
.
addAll
(
engineerHalfDay
);
objects
.
addAll
(
engineerAllDay
);
/*objects.addAll(timeSliceTwoHour);*/
data
.
setSegments
(
objects
);
return
data
;
}
...
...
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