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 b9ee0b92
authored
Oct 26, 2023
by
huangjinxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:工程师工作地址和首选工作地址相关处理
1 parent
43c2dae6
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
2 deletions
project-order/src/main/java/com/dituhui/pea/order/dto/EngineerInfoListResp.java
project-order/src/main/java/com/dituhui/pea/order/entity/EngineerBusinessEntity.java
project-order/src/main/java/com/dituhui/pea/order/entity/EngineerInfoEntity.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/dto/EngineerInfoListResp.java
View file @
b9ee0b9
...
@@ -26,5 +26,10 @@ public class EngineerInfoListResp {
...
@@ -26,5 +26,10 @@ public class EngineerInfoListResp {
private
List
<
String
>
tags
;
private
List
<
String
>
tags
;
private
List
<
String
>
credentials
;
private
List
<
String
>
credentials
;
private
String
grade
;
private
String
grade
;
/**
* 工作地址
*/
private
String
workAddress
;
}
}
}
}
project-order/src/main/java/com/dituhui/pea/order/entity/EngineerBusinessEntity.java
View file @
b9ee0b9
...
@@ -58,8 +58,11 @@ public class EngineerBusinessEntity implements Serializable {
...
@@ -58,8 +58,11 @@ public class EngineerBusinessEntity implements Serializable {
@Column
(
name
=
"priority"
,
nullable
=
false
,
columnDefinition
=
"tinyint(4) default '1'"
)
@Column
(
name
=
"priority"
,
nullable
=
false
,
columnDefinition
=
"tinyint(4) default '1'"
)
private
int
priority
;
private
int
priority
;
@Column
(
name
=
"departure"
,
nullable
=
false
,
columnDefinition
=
"tinyint(4) default '0'"
)
/**
private
int
departure
;
* 常规出发地,1配件仓,2家庭住址,3工作地址 默认工作地址
*/
@Column
(
name
=
"departure"
,
nullable
=
false
,
columnDefinition
=
"tinyint(4) default '3'"
)
private
int
departure
=
3
;
@Column
(
name
=
"dispatch_strategy"
,
nullable
=
false
,
length
=
32
,
columnDefinition
=
"varchar(32) default 'CENTER'"
)
@Column
(
name
=
"dispatch_strategy"
,
nullable
=
false
,
length
=
32
,
columnDefinition
=
"varchar(32) default 'CENTER'"
)
private
String
dispatchStrategy
;
private
String
dispatchStrategy
;
...
...
project-order/src/main/java/com/dituhui/pea/order/entity/EngineerInfoEntity.java
View file @
b9ee0b9
...
@@ -58,6 +58,11 @@ public class EngineerInfoEntity {
...
@@ -58,6 +58,11 @@ public class EngineerInfoEntity {
private
String
address
;
private
String
address
;
/**
/**
* 工作地址
*/
private
String
workAddress
;
/**
* 类型(1全职 2兼职)
* 类型(1全职 2兼职)
*/
*/
private
Integer
kind
;
private
Integer
kind
;
...
...
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerServiceImpl.java
View file @
b9ee0b9
...
@@ -350,6 +350,7 @@ public class EngineerServiceImpl implements EngineerService {
...
@@ -350,6 +350,7 @@ public class EngineerServiceImpl implements EngineerService {
item
.
setPhone
(
e
.
getPhone
());
item
.
setPhone
(
e
.
getPhone
());
item
.
setAddress
(
e
.
getAddress
());
item
.
setAddress
(
e
.
getAddress
());
item
.
setGrade
(
e
.
getGrade
());
item
.
setGrade
(
e
.
getGrade
());
item
.
setWorkAddress
(
e
.
getWorkAddress
());
// group name
// group name
groupName
=
groups
.
getOrDefault
(
e
.
getGroupId
(),
""
);
groupName
=
groups
.
getOrDefault
(
e
.
getGroupId
(),
""
);
...
...
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