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 e1faa690
authored
Jul 18, 2023
by
丁伟峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
改用apply_node,原先的order_request的description字段,仅仅用于内部备注,不对外
1 parent
a94dc1ad
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderCreateServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderCreateServiceImpl.java
View file @
e1faa69
...
@@ -120,7 +120,7 @@ public class OrderCreateServiceImpl implements OrderCreateService {
...
@@ -120,7 +120,7 @@ public class OrderCreateServiceImpl implements OrderCreateService {
entity
.
setExpectTimeBegin
(
LocalDateTimeUtil
.
parse
(
req
.
getExpectBegin
(),
PATTERN_DATETIME
));
entity
.
setExpectTimeBegin
(
LocalDateTimeUtil
.
parse
(
req
.
getExpectBegin
(),
PATTERN_DATETIME
));
entity
.
setExpectTimeEnd
(
LocalDateTimeUtil
.
parse
(
req
.
getExpectEnd
(),
PATTERN_DATETIME
));
entity
.
setExpectTimeEnd
(
LocalDateTimeUtil
.
parse
(
req
.
getExpectEnd
(),
PATTERN_DATETIME
));
entity
.
setExpectTimeDesc
(
req
.
getExpectDesc
());
entity
.
setExpectTimeDesc
(
req
.
getExpectDesc
());
entity
.
set
Description
(
req
.
getDescription
());
entity
.
set
ApplyNote
(
req
.
getDescription
());
// order_request的description字段,仅仅用于内部备注,不对外
entity
.
setDt
(
LocalDateTimeUtil
.
parseDate
(
req
.
getExpectBegin
().
substring
(
0
,
10
),
PATTERN_DATE
));
entity
.
setDt
(
LocalDateTimeUtil
.
parseDate
(
req
.
getExpectBegin
().
substring
(
0
,
10
),
PATTERN_DATE
));
// location
// location
LocationDTO
location
=
req
.
getLocation
();
LocationDTO
location
=
req
.
getLocation
();
...
@@ -128,7 +128,6 @@ public class OrderCreateServiceImpl implements OrderCreateService {
...
@@ -128,7 +128,6 @@ public class OrderCreateServiceImpl implements OrderCreateService {
entity
.
setCity
(
location
.
getCity
());
entity
.
setCity
(
location
.
getCity
());
entity
.
setCounty
(
location
.
getDistrict
());
entity
.
setCounty
(
location
.
getDistrict
());
entity
.
setAddress
(
location
.
getFormattedAddress
());
entity
.
setAddress
(
location
.
getFormattedAddress
());
// 根据分单,填写clusterId/branchId/groupId/teamId等
List
<
String
>
blockIds
=
null
;
List
<
String
>
blockIds
=
null
;
List
<
String
>
layerIds
=
capacityUtils
.
getLayers
(
req
.
getBrand
(),
req
.
getType
(),
req
.
getSkill
());
List
<
String
>
layerIds
=
capacityUtils
.
getLayers
(
req
.
getBrand
(),
req
.
getType
(),
req
.
getSkill
());
...
@@ -152,6 +151,7 @@ public class OrderCreateServiceImpl implements OrderCreateService {
...
@@ -152,6 +151,7 @@ public class OrderCreateServiceImpl implements OrderCreateService {
// 遍历工作队,每个工作队
// 遍历工作队,每个工作队
String
teamId
=
teamIds
.
get
(
0
);
String
teamId
=
teamIds
.
get
(
0
);
OrgTeamEntity
teamEntity
=
orgTeamDao
.
getByTeamId
(
teamId
);
OrgTeamEntity
teamEntity
=
orgTeamDao
.
getByTeamId
(
teamId
);
// 根据分单,填写clusterId/branchId/groupId/teamId等
entity
.
setOrgClusterId
(
teamEntity
.
getClusterId
());
entity
.
setOrgClusterId
(
teamEntity
.
getClusterId
());
entity
.
setOrgBranchId
(
teamEntity
.
getBranchId
());
entity
.
setOrgBranchId
(
teamEntity
.
getBranchId
());
entity
.
setOrgGroupId
(
teamEntity
.
getGroupId
());
entity
.
setOrgGroupId
(
teamEntity
.
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