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 1ba7d97d
authored
Jun 12, 2023
by
王力
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature_mvp616_wangl' into 'develop'
Feature mvp616 wangl See merge request !58
2 parents
e09f94f6
686d84e2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
3 deletions
project-interface/src/main/java/com/alibaba/cloud/integration/common/Result.java
project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/DispatchServiceImpl.java
project-interface/src/main/java/com/alibaba/cloud/integration/common/Result.java
View file @
1ba7d97
...
...
@@ -73,11 +73,11 @@ public class Result<T> {
this
.
message
=
message
;
}
public
T
get
Data
()
{
public
T
get
Result
()
{
return
this
.
result
;
}
public
void
set
Data
(
T
result
)
{
public
void
set
Result
(
T
result
)
{
this
.
result
=
result
;
}
...
...
@@ -85,7 +85,7 @@ public class Result<T> {
Result
<
T
>
r
=
new
Result
<>();
r
.
setCode
(
code
);
r
.
setMessage
(
message
);
r
.
set
Data
(
result
);
r
.
set
Result
(
result
);
return
r
;
}
}
project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/DispatchServiceImpl.java
View file @
1ba7d97
...
...
@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.lang.management.PlatformManagedObject
;
import
java.sql.Timestamp
;
import
java.time.format.DateTimeFormatter
;
import
java.util.ArrayList
;
...
...
@@ -98,6 +99,8 @@ public class DispatchServiceImpl implements DispatchService {
List
<
String
>
orderIds
=
this
.
queryOrderAppointmentOrderIds
(
engineerCodes
,
date
);
List
<
OrderRequest
>
orders
=
this
.
queryOrderRequestByOrderId
(
orderIds
);
return
null
;
}
...
...
@@ -122,6 +125,16 @@ public class DispatchServiceImpl implements DispatchService {
return
orderRequestMPDao
.
selectList
(
lqw
);
}
private
List
<
OrderRequest
>
queryOrderRequestByOrderId
(
List
<
String
>
orderIds
)
{
List
<
OrderRequest
>
orders
=
new
ArrayList
<>();
if
(
orderIds
.
isEmpty
()){
return
orders
;
}
LambdaQueryWrapper
<
OrderRequest
>
lqw
=
new
LambdaQueryWrapper
<>();
lqw
.
in
(
OrderRequest:
:
getOrderId
,
orderIds
);
return
orderRequestMPDao
.
selectList
(
lqw
);
}
private
List
<
String
>
queryOrderAppointmentOrderIds
(
List
<
String
>
engineerCodes
,
String
date
)
{
// 获取工程师服务单列表
List
<
String
>
orderIds
=
new
ArrayList
<>();
...
...
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