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 48ec3937
authored
Jul 12, 2023
by
王力
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_dispatch_filter0711' into 'develop'
新增派工台统计接口 See merge request !211
2 parents
b82a0120
c59814b5
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
0 deletions
project-order/src/main/java/com/dituhui/pea/order/controller/ScheduleController.java
project-order/src/main/java/com/dituhui/pea/order/service/ScheduleService.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/ScheduleServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/controller/ScheduleController.java
View file @
48ec393
...
...
@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.List
;
import
java.util.function.BooleanSupplier
;
@RestController
@RequestMapping
(
"/pea-order"
)
...
...
@@ -18,6 +19,17 @@ public class ScheduleController {
@Autowired
private
ScheduleService
scheduleService
;
@GetMapping
(
"/schedule/summary"
)
public
Result
<?>
getScheduleSummary
(
@RequestParam
String
date
,
@RequestParam
String
levelType
,
@RequestParam
(
"levelValue"
)
List
<
String
>
levelIds
){
Result
<?>
res
=
null
;
try
{
res
=
scheduleService
.
getScheduleSummary
(
date
,
levelType
,
levelIds
);
}
catch
(
BusinessException
e
)
{
return
Result
.
failed
(
e
.
getMessage
());
}
return
res
;
}
@GetMapping
(
"/schedule/overview"
)
public
Result
<?>
getScheduleOverview
(
@RequestParam
long
page
,
@RequestParam
long
size
,
@RequestParam
String
date
,
@RequestParam
String
levelType
,
@RequestParam
(
"levelValue"
)
List
<
String
>
levelIds
)
{
...
...
project-order/src/main/java/com/dituhui/pea/order/service/ScheduleService.java
View file @
48ec393
...
...
@@ -5,6 +5,9 @@ import com.dituhui.pea.common.Result;
import
java.util.List
;
public
interface
ScheduleService
{
Result
<?>
getScheduleSummary
(
String
date
,
String
levelType
,
List
<
String
>
levelIds
);
Result
<?>
getScheduleOverview
(
long
page
,
long
size
,
String
date
,
String
levelType
,
List
<
String
>
levelIds
);
Result
<?>
getScheduleEngineerOverview
(
String
date
,
String
engineerCode
);
...
...
project-order/src/main/java/com/dituhui/pea/order/service/impl/ScheduleServiceImpl.java
View file @
48ec393
...
...
@@ -45,6 +45,11 @@ public class ScheduleServiceImpl implements ScheduleService {
private
EngineerInfoMPDao
engineerInfoMPDao
;
@Override
public
Result
<?>
getScheduleSummary
(
String
date
,
String
levelType
,
List
<
String
>
levelIds
)
{
return
null
;
}
@Override
public
Result
<?>
getScheduleOverview
(
long
page
,
long
size
,
String
date
,
String
levelType
,
List
<
String
>
levelIds
)
{
// 获取team列表
...
...
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