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 b360f624
authored
Jun 14, 2023
by
王力
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature_mvp616_wangl' into 'develop'
接口变更 See merge request !84
2 parents
667acf8c
db22661f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
project-order/src/main/java/com/alibaba/cloud/integration/order/dto/DispatchEngineerOrderListResp.java
project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/DispatchServiceImpl.java
project-order/src/main/java/com/alibaba/cloud/integration/order/dto/DispatchEngineerOrderListResp.java
View file @
b360f62
...
@@ -15,7 +15,7 @@ public class DispatchEngineerOrderListResp {
...
@@ -15,7 +15,7 @@ public class DispatchEngineerOrderListResp {
private
String
engineerName
;
private
String
engineerName
;
private
String
capacity
;
private
String
capacity
;
private
String
capacityStatus
;
private
String
capacityStatus
;
private
String
certificat
e
;
private
String
grad
e
;
private
List
<
OrderInfo
>
orders
;
private
List
<
OrderInfo
>
orders
;
}
}
@Data
@Data
...
...
project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/DispatchServiceImpl.java
View file @
b360f62
...
@@ -178,7 +178,7 @@ public class DispatchServiceImpl implements DispatchService {
...
@@ -178,7 +178,7 @@ public class DispatchServiceImpl implements DispatchService {
eg
.
setOrders
(
items
);
eg
.
setOrders
(
items
);
eg
.
setEngineerCode
(
e
.
getEngineerCode
());
eg
.
setEngineerCode
(
e
.
getEngineerCode
());
eg
.
setEngineerName
(
e
.
getName
());
eg
.
setEngineerName
(
e
.
getName
());
eg
.
set
Certificate
(
e
.
getCredentials
());
eg
.
set
Grade
(
e
.
getGrade
());
eg
.
setCapacity
(
String
.
format
(
"%d/%d"
,
capUsed
,
capTotal
));
eg
.
setCapacity
(
String
.
format
(
"%d/%d"
,
capUsed
,
capTotal
));
eg
.
setCapacityStatus
(
capacityStatus
);
eg
.
setCapacityStatus
(
capacityStatus
);
...
...
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