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 d96a04a1
authored
Oct 31, 2023
by
刘鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor(容量对外接口): 参数返回
1 parent
df5ab310
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
project-order/src/main/java/com/dituhui/pea/order/controller/PeaApiController.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/controller/PeaApiController.java
View file @
d96a04a
...
...
@@ -134,7 +134,7 @@ public class PeaApiController {
return
service
;
}).
collect
(
Collectors
.
toList
());
return
capacityQueryService
.
matchCapacityData
(
convertService
,
reqDTO
.
getLocation
(),
startDate
,
endDate
);
return
capacityQueryService
.
matchCapacityData
(
reqDTO
,
convertService
,
reqDTO
.
getLocation
(),
startDate
,
endDate
);
}
private
String
fixBrand
(
String
brand
)
{
...
...
project-order/src/main/java/com/dituhui/pea/order/service/CapacityQueryService.java
View file @
d96a04a
...
...
@@ -21,7 +21,8 @@ public interface CapacityQueryService {
* @param endDate 结束日期
* @return 满足对应技能工作队的容量(三种类型与分站绑定)
*/
Result
<
CapacityQueryDTO
.
Result
>
matchCapacityData
(
List
<
CapacityQueryDTO
.
Service
>
services
,
Location
location
,
LocalDate
beginDate
,
LocalDate
endDate
);
Result
<
CapacityQueryDTO
.
Result
>
matchCapacityData
(
CapacityQueryDTO
.
Request
request
,
List
<
CapacityQueryDTO
.
Service
>
services
,
Location
location
,
LocalDate
beginDate
,
LocalDate
endDate
);
/**
...
...
project-order/src/main/java/com/dituhui/pea/order/service/impl/CapacityQueryServiceImpl.java
View file @
d96a04a
...
...
@@ -92,7 +92,8 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
private
EngineerSliceUsedCapacityDao
engineerSliceUsedCapacityDao
;
@Override
public
Result
<
CapacityQueryDTO
.
Result
>
matchCapacityData
(
List
<
CapacityQueryDTO
.
Service
>
services
,
Location
location
,
public
Result
<
CapacityQueryDTO
.
Result
>
matchCapacityData
(
CapacityQueryDTO
.
Request
request
,
List
<
CapacityQueryDTO
.
Service
>
services
,
Location
location
,
LocalDate
beginDate
,
LocalDate
endDate
)
{
//1:根据经纬度分单获取面
...
...
@@ -174,6 +175,7 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
}
result
.
setDatas
(
datas
);
result
.
setParams
(
request
);
return
Result
.
success
(
result
);
}
...
...
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