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 d8883979
authored
Oct 11, 2023
by
huangjinxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:添加工单多人上门,排除/指定工程师
1 parent
0613a556
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
59 additions
and
2 deletions
project-order/src/main/java/com/dituhui/pea/order/dto/OrderServiceList.java
project-order/src/main/java/com/dituhui/pea/order/entity/OrderInfo.java
project-order/src/main/java/com/dituhui/pea/order/entity/OrderInfoEntity.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderServiceListServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/dto/OrderServiceList.java
View file @
d888397
...
...
@@ -37,5 +37,21 @@ public class OrderServiceList {
*/
private
String
beanPriority
;
/**
* 是否重物搬运(双人上门) 0:否 1:是 默认0
*/
private
Integer
isMultiple
;
/**
* 是否指定某个工程师/是否排除某个工程师 0:否 1:指定 2:排除 默认0
*/
private
Integer
isAppointEngineer
;
/**
* 指定某个工程师/排除某个工程师 codes 多个,分割
*/
private
String
appointEngineerCodes
;
}
project-order/src/main/java/com/dituhui/pea/order/entity/OrderInfo.java
View file @
d888397
...
...
@@ -59,4 +59,20 @@ public class OrderInfo {
private
String
description
;
private
Timestamp
createTime
;
private
Timestamp
updateTime
;
/**
* 是否重物搬运(双人上门) 0:否 1:是 默认0
*/
private
Integer
isMultiple
;
/**
* 是否指定某个工程师/是否排除某个工程师 0:否 1:指定 2:排除 默认0
*/
private
Integer
isAppointEngineer
;
/**
* 指定某个工程师/排除某个工程师 codes 多个,分割
*/
private
String
appointEngineerCodes
;
}
\ No newline at end of file
project-order/src/main/java/com/dituhui/pea/order/entity/OrderInfoEntity.java
View file @
d888397
...
...
@@ -44,10 +44,10 @@ public class OrderInfoEntity {
private
String
address
;
@Column
(
name
=
"x"
,
nullable
=
false
,
length
=
20
)
private
String
x
=
"0"
;
private
String
x
=
"0"
;
@Column
(
name
=
"y"
,
nullable
=
false
,
length
=
20
)
private
String
y
=
"0"
;
private
String
y
=
"0"
;
@Column
(
name
=
"bean_brand"
,
nullable
=
false
,
length
=
20
)
private
String
beanBrand
;
...
...
@@ -176,4 +176,25 @@ public class OrderInfoEntity {
private
LocalDateTime
updateTime
=
LocalDateTime
.
now
();
// Getters and setters (omitted for brevity)
/**
* 是否重物搬运(双人上门) 0:否 1:是 默认0
*/
@Column
(
name
=
"is_multiple"
)
private
Integer
isMultiple
=
0
;
/**
* 是否指定某个工程师/是否排除某个工程师 0:否 1:指定 2:排除 默认0
*/
@Column
(
name
=
"is_appoint_engineer"
)
private
Integer
isAppointEngineer
=
0
;
/**
* 指定某个工程师/排除某个工程师 codes 多个,分割
*/
@Column
(
name
=
"appoint_engineer_codes"
)
private
String
appointEngineerCodes
;
}
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderServiceListServiceImpl.java
View file @
d888397
...
...
@@ -140,6 +140,9 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
record
.
setCreateTime
(
TimeUtils
.
IsoTimestamp2DateTime
(
o
.
getCreateTime
()));
record
.
setBeanPriority
(
o
.
getBeanPriority
());
record
.
setIsMultiple
(
o
.
getIsMultiple
());
record
.
setIsAppointEngineer
(
o
.
getIsAppointEngineer
());
record
.
setAppointEngineerCodes
(
o
.
getAppointEngineerCodes
());
content
.
add
(
record
);
}
...
...
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