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 e9d01980
authored
Oct 30, 2023
by
刘鑫
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop-16542' into 'develop'
根据工程师,品牌,技能,服务类型,时间段查询的接口 See merge request !350
2 parents
03f784de
9bd7c8d6
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
1 deletions
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/service/CapacityQueryService.java
View file @
e9d0198
...
...
@@ -41,7 +41,7 @@ public interface CapacityQueryService {
* 根据工作队,日期,技能、品牌,服务类型查容量
*
* @param teamId 工作队
* @param service
s
服务技能信息, 包含品牌, 产品类型, 服务技能--汉字
* @param service
服务技能信息, 包含品牌, 产品类型, 服务技能--汉字
* @param targetDate 查询容量的日期
* @return 工作队指定日期的容量
*/
...
...
@@ -55,4 +55,17 @@ public interface CapacityQueryService {
* @return 返回单个工程师容量结果
*/
CapacityQueryDTO
.
Segment
queryEngineerCapacity
(
String
engineerCode
,
LocalDate
date
);
/**
* 查询单个工程师指定日期时间段内的的容量状态
*
* @param engineerCode 工程师编码
* @param date 需要查询的日期
* @param startTime 开始时间
* @param endTime 结束时间
* @return 返回单个工程师容量结果
*/
CapacityQueryDTO
.
Segment
queryEngineerCapacity
(
String
engineerCode
,
CapacityQueryDTO
.
Service
service
,
LocalDate
date
,
LocalTime
startTime
,
LocalTime
endTime
);
}
project-order/src/main/java/com/dituhui/pea/order/service/impl/CapacityQueryServiceImpl.java
View file @
e9d0198
...
...
@@ -250,6 +250,19 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
return
null
;
}
@Override
public
CapacityQueryDTO
.
Segment
queryEngineerCapacity
(
String
engineerCode
,
CapacityQueryDTO
.
Service
service
,
LocalDate
date
,
LocalTime
startTime
,
LocalTime
endTime
)
{
List
<
CapacityEngineerSliceUsedEntity
>
engineerTimeSlice
=
engineerSliceUsedCapacityDao
.
findByWorkdayAndEngineerCode
(
DateTimeUtil
.
formatDate
(
date
),
engineerCode
);
//查询对应的技能信息
SkillInfoEntity
skillInfo
=
skillInfoDao
.
getByBrandAndTypeAndSkill
(
service
.
getBrand
(),
service
.
getProductType
(),
service
.
getServiceType
());
return
caculateTargetTimeSlice
(
skillInfo
.
getTakeTime
(),
"时间段"
,
engineerTimeSlice
,
startTime
,
endTime
,
date
);
}
@Override
public
Result
<?>
queryMatchCapacityData
(
CapacityOrderQueryDTO
.
Request
reqDTO
)
{
// 单条容量查询
...
...
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