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 e4422c37
authored
Jul 06, 2023
by
王力
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_workbench_summary' into 'develop'
Dev workbench summary See merge request !153
2 parents
c560583f
16e9b95f
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
60 additions
and
0 deletions
project-order/src/main/java/com/dituhui/pea/order/controller/WorkbenchController.java
project-order/src/main/java/com/dituhui/pea/order/dto/WorkbenchSummaryResp.java
project-order/src/main/java/com/dituhui/pea/order/entity/OrderAppointment.java
project-order/src/main/java/com/dituhui/pea/order/entity/OrderRequest.java
project-order/src/main/java/com/dituhui/pea/order/service/WorkbenchService.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/WorkbenchServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/controller/WorkbenchController.java
View file @
e4422c3
...
...
@@ -9,8 +9,11 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.time.LocalDate
;
@Slf4j
@RestController
@RequestMapping
(
"/pea-order"
)
...
...
@@ -29,4 +32,15 @@ public class WorkbenchController {
}
return
res
;
}
@GetMapping
(
"/workbench/summary"
)
public
Result
<?>
workbenchSummary
(
@RequestParam
String
levelType
,
@RequestParam
String
levelValue
,
@RequestParam
LocalDate
date
)
{
Result
<?>
res
=
null
;
try
{
res
=
workbenchService
.
getWorkbenchSummary
(
levelType
,
levelValue
,
date
);
}
catch
(
BusinessException
e
)
{
return
Result
.
failed
(
e
.
getMessage
());
}
return
res
;
}
}
project-order/src/main/java/com/dituhui/pea/order/dto/WorkbenchSummaryResp.java
0 → 100644
View file @
e4422c3
package
com
.
dituhui
.
pea
.
order
.
dto
;
import
com.fasterxml.jackson.annotation.JsonInclude
;
import
lombok.Data
;
import
java.util.List
;
@Data
public
class
WorkbenchSummaryResp
{
private
List
<
ItemDTO
>
summary
;
@Data
public
static
class
ItemDTO
{
private
String
type
;
private
List
<
ValueDTO
>
rows
;
}
@Data
@JsonInclude
(
JsonInclude
.
Include
.
NON_NULL
)
public
static
class
ValueDTO
{
private
String
title
;
private
String
value
;
private
String
total
;
private
String
valueColor
;
private
String
url
;
public
ValueDTO
(
String
title
,
String
value
,
String
total
,
String
valueColor
,
String
url
){
this
.
title
=
title
;
this
.
value
=
value
;
this
.
total
=
total
;
this
.
valueColor
=
valueColor
;
this
.
url
=
url
;
}
}
}
\ No newline at end of file
project-order/src/main/java/com/dituhui/pea/order/entity/OrderAppointment.java
View file @
e4422c3
...
...
@@ -3,6 +3,7 @@ package com.dituhui.pea.order.entity;
import
lombok.Data
;
import
java.sql.Timestamp
;
import
java.time.LocalDate
;
@Data
public
class
OrderAppointment
{
...
...
@@ -15,6 +16,7 @@ public class OrderAppointment {
private
String
engineerPhone
;
private
Integer
engineerAge
;
private
Integer
isWorkshop
;
private
LocalDate
dt
;
private
Timestamp
expectStartTime
;
private
Timestamp
expectEndTime
;
private
Timestamp
actualTime
;
...
...
project-order/src/main/java/com/dituhui/pea/order/entity/OrderRequest.java
View file @
e4422c3
package
com
.
dituhui
.
pea
.
order
.
entity
;
import
lombok.Data
;
import
java.sql.Timestamp
;
import
java.time.LocalDate
;
@Data
public
class
OrderRequest
{
...
...
@@ -21,6 +23,7 @@ public class OrderRequest {
private
String
skill
;
private
String
applyNote
;
private
String
faultDescribe
;
private
LocalDate
dt
;
private
Timestamp
expectTimeBegin
;
private
Timestamp
expectTimeEnd
;
private
String
expectTimeDesc
;
...
...
project-order/src/main/java/com/dituhui/pea/order/service/WorkbenchService.java
View file @
e4422c3
...
...
@@ -4,6 +4,10 @@ import com.dituhui.pea.common.Result;
import
com.dituhui.pea.order.dto.EngineersGanttReqDTO
;
import
com.dituhui.pea.order.dto.OrderChangeListReqDTO
;
import
java.time.LocalDate
;
public
interface
WorkbenchService
{
Result
<?>
getOrderChangeList
(
OrderChangeListReqDTO
orderChangeListReqDTO
);
Result
<?>
getWorkbenchSummary
(
String
levelType
,
String
levelValue
,
LocalDate
dt
);
}
project-order/src/main/java/com/dituhui/pea/order/service/impl/WorkbenchServiceImpl.java
View file @
e4422c3
This diff is collapsed.
Click to expand it.
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