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 03293e41
authored
Jul 17, 2023
by
wangli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改描述顺序
1 parent
feafc23e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/DispatchServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/DispatchServiceImpl.java
View file @
03293e4
...
...
@@ -73,8 +73,8 @@ public class DispatchServiceImpl implements DispatchService {
item
.
setRemark
(
o
.
getApplyNote
());
item
.
setCustomerName
(
o
.
getName
());
String
description
=
String
.
format
(
"%s:%s
%s-%s\n%s:%s-%s-%s"
,
o
.
getOrderId
(),
o
.
getSkill
(),
o
.
get
Type
(),
o
.
getBrand
(),
o
.
getName
(),
o
.
getCity
(),
o
.
getCounty
(),
o
.
getAddress
());
String
description
=
String
.
format
(
"%s:%s
-%s-%s\n%s:%s-%s-%s"
,
o
.
getOrderId
(),
o
.
getBrand
(),
o
.
getType
(),
o
.
get
Skill
(),
o
.
getName
(),
o
.
getCity
(),
o
.
getCounty
(),
o
.
getAddress
());
item
.
setDescription
(
description
);
String
key
=
String
.
format
(
"%s%s%s"
,
o
.
getBrand
(),
o
.
getType
(),
o
.
getSkill
());
...
...
@@ -140,7 +140,7 @@ public class DispatchServiceImpl implements DispatchService {
// 获取服务单/工单列表
Map
<
String
,
List
<
OrderRequest
>>
orders
=
new
HashMap
<>();
if
(!
orderIds
.
isEmpty
())
{
if
(!
orderIds
.
isEmpty
())
{
orders
=
orderRequestMPDao
.
selectByOrderIds
(
new
ArrayList
<>(
orderIds
)).
stream
().
collect
(
Collectors
.
groupingBy
(
OrderRequest:
:
getOrderId
));
}
...
...
@@ -155,7 +155,7 @@ public class DispatchServiceImpl implements DispatchService {
List
<
OrderAppointment
>
records
=
engineerOrders
.
getOrDefault
(
e
.
getEngineerCode
(),
new
ArrayList
<>());
for
(
OrderAppointment
r
:
records
)
{
// 获取对应的工单信息
if
(
ListUtils
.
isEmpty
(
orders
.
get
(
r
.
getOrderId
()))){
if
(
ListUtils
.
isEmpty
(
orders
.
get
(
r
.
getOrderId
())))
{
continue
;
}
OrderRequest
o
=
orders
.
get
(
r
.
getOrderId
()).
get
(
0
);
...
...
@@ -289,9 +289,9 @@ public class DispatchServiceImpl implements DispatchService {
lqw
.
in
(
ListUtils
.
isNotEmpty
(
reqDTO
.
getTeamIds
()),
OrderRequest:
:
getOrgTeamId
,
reqDTO
.
getTeamIds
());
lqw
.
in
(
ListUtils
.
isNotEmpty
(
reqDTO
.
getAppointmentType
()),
OrderRequest:
:
getAppointmentMethod
,
reqDTO
.
getAppointmentType
());
if
(
ListUtils
.
isNotEmpty
(
reqDTO
.
getPriorities
()))
{
if
(
ListUtils
.
isNotEmpty
(
reqDTO
.
getPriorities
()))
{
List
<
Integer
>
p
=
reqDTO
.
getPriorities
();
if
(
p
.
contains
(
0
)
&&
p
.
contains
(
1
))
{
if
(
p
.
contains
(
0
)
&&
p
.
contains
(
1
))
{
lqw
.
ge
(
OrderRequest:
:
getPriority
,
1
);
}
else
if
(
p
.
contains
(
0
)
&&
!
p
.
contains
(
1
))
{
lqw
.
le
(
OrderRequest:
:
getPriority
,
1
);
...
...
@@ -312,7 +312,7 @@ public class DispatchServiceImpl implements DispatchService {
lqw
.
exists
(
sql
);
}
if
(
ListUtils
.
isNotEmpty
(
reqDTO
.
getEngineerCodes
()))
{
if
(
ListUtils
.
isNotEmpty
(
reqDTO
.
getEngineerCodes
()))
{
String
engineerCodes
=
"'"
+
String
.
join
(
"','"
,
reqDTO
.
getEngineerCodes
())
+
"'"
;
String
sql
=
String
.
format
(
"select 1 from order_appointment oa where oa.order_id = order_request.order_id and oa.dt = order_request.dt and oa.engineer_code in (%s)"
,
engineerCodes
);
lqw
.
exists
(
sql
);
...
...
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