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 1ed5c451
authored
Jun 20, 2023
by
丁伟峰
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-dingwf-0715' into develop
2 parents
61aacb4f
43cccd29
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
6 deletions
project-order/src/main/java/com/dituhui/pea/order/config/OrderConfig.java
project-order/src/main/java/com/dituhui/pea/order/dto/CapacityStatQueryReqDTO.java
project-order/src/main/java/com/dituhui/pea/order/dto/EngineersGanttReqDTO.java
project-order/src/main/java/com/dituhui/pea/order/dto/OrderChangeListReqDTO.java
project-order/src/main/java/com/dituhui/pea/order/dto/OrderCreateReqDTO.java
project-order/src/main/java/com/dituhui/pea/order/config/OrderConfig.java
0 → 100644
View file @
1ed5c45
package
com
.
dituhui
.
pea
.
order
.
config
;
import
org.springframework.context.annotation.Configuration
;
@Configuration
public
class
OrderConfig
{
public
static
final
int
DEFAULT_PAGE_SIZE
=
10
;
public
static
final
int
DEFAULT_PAGE_INDEX
=
1
;
}
project-order/src/main/java/com/dituhui/pea/order/dto/CapacityStatQueryReqDTO.java
View file @
1ed5c45
package
com
.
dituhui
.
pea
.
order
.
dto
;
package
com
.
dituhui
.
pea
.
order
.
dto
;
import
com.dituhui.pea.order.config.OrderConfig
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotEmpty
;
import
javax.validation.constraints.NotEmpty
;
...
@@ -21,6 +23,6 @@ public class CapacityStatQueryReqDTO {
...
@@ -21,6 +23,6 @@ public class CapacityStatQueryReqDTO {
*/
*/
@NotBlank
@NotBlank
private
String
levelValue
;
private
String
levelValue
;
private
Integer
page
;
private
Integer
page
=
OrderConfig
.
DEFAULT_PAGE_INDEX
;
private
Integer
size
;
private
Integer
size
=
OrderConfig
.
DEFAULT_PAGE_SIZE
;
}
}
project-order/src/main/java/com/dituhui/pea/order/dto/EngineersGanttReqDTO.java
View file @
1ed5c45
package
com
.
dituhui
.
pea
.
order
.
dto
;
package
com
.
dituhui
.
pea
.
order
.
dto
;
import
com.dituhui.pea.order.config.OrderConfig
;
import
java.util.List
;
import
java.util.List
;
@lombok
.
Data
@lombok
.
Data
...
@@ -8,8 +10,8 @@ public class EngineersGanttReqDTO {
...
@@ -8,8 +10,8 @@ public class EngineersGanttReqDTO {
private
String
levelType
;
private
String
levelType
;
private
String
levelValue
;
private
String
levelValue
;
private
Integer
page
;
private
Integer
page
=
OrderConfig
.
DEFAULT_PAGE_INDEX
;
private
Integer
size
;
private
Integer
size
=
OrderConfig
.
DEFAULT_PAGE_SIZE
;
private
String
date
;
private
String
date
;
private
List
<
String
>
engineerCodes
;
private
List
<
String
>
engineerCodes
;
}
}
project-order/src/main/java/com/dituhui/pea/order/dto/OrderChangeListReqDTO.java
View file @
1ed5c45
package
com
.
dituhui
.
pea
.
order
.
dto
;
package
com
.
dituhui
.
pea
.
order
.
dto
;
import
com.dituhui.pea.order.config.OrderConfig
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
java.util.Date
;
import
java.util.Date
;
...
@@ -14,8 +15,8 @@ public class OrderChangeListReqDTO {
...
@@ -14,8 +15,8 @@ public class OrderChangeListReqDTO {
* levelType对应的id值
* levelType对应的id值
*/
*/
private
String
levelValue
;
private
String
levelValue
;
private
int
page
;
private
int
page
=
OrderConfig
.
DEFAULT_PAGE_INDEX
;
private
int
size
;
private
int
size
=
OrderConfig
.
DEFAULT_PAGE_SIZE
;
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
private
Date
date
=
new
Date
();
private
Date
date
=
new
Date
();
/**
/**
...
...
project-order/src/main/java/com/dituhui/pea/order/dto/OrderCreateReqDTO.java
View file @
1ed5c45
...
@@ -2,6 +2,8 @@ package com.dituhui.pea.order.dto;
...
@@ -2,6 +2,8 @@ package com.dituhui.pea.order.dto;
import
lombok.Data
;
import
lombok.Data
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotNull
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
...
@@ -13,7 +15,9 @@ public class OrderCreateReqDTO {
...
@@ -13,7 +15,9 @@ public class OrderCreateReqDTO {
private
String
phone
;
private
String
phone
;
private
String
address
;
private
String
address
;
private
LocationDTO
location
;
private
LocationDTO
location
;
@NotBlank
private
String
brand
;
private
String
brand
;
@NotBlank
()
private
String
type
;
private
String
type
;
private
String
skill
;
private
String
skill
;
private
String
faultDescribe
;
private
String
faultDescribe
;
...
...
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