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 5313c619
authored
Jul 14, 2023
by
chamberone
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
https://zhangguoping@gitlab.dituhui.com/bsh/project/pr…
…oject.git into develop
2 parents
654408c8
6a8c687c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/WorkbenchServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/WorkbenchServiceImpl.java
View file @
5313c61
...
...
@@ -168,7 +168,7 @@ public class WorkbenchServiceImpl implements WorkbenchService {
private
List
<
WorkbenchSummaryResp
.
ValueDTO
>
packValueAppointmentMethod
(
HashMap
<
String
,
Long
>
summary
)
{
List
<
WorkbenchSummaryResp
.
ValueDTO
>
items
=
new
ArrayList
<>();
String
urlName
=
"
Workb
enchManage"
;
String
urlName
=
"
DispatchB
enchManage"
;
Long
manualDealing
=
summary
.
getOrDefault
(
"manualDealing"
,
0L
);
Long
manualTotal
=
summary
.
getOrDefault
(
"manualTotal"
,
0L
);
Long
autoDealing
=
summary
.
getOrDefault
(
"autoDealing"
,
0L
);
...
...
@@ -192,8 +192,7 @@ public class WorkbenchServiceImpl implements WorkbenchService {
private
List
<
WorkbenchSummaryResp
.
ValueDTO
>
packValueOrderStatus
(
HashMap
<
String
,
Long
>
summary
)
{
List
<
WorkbenchSummaryResp
.
ValueDTO
>
items
=
new
ArrayList
<>();
String
urlName
=
"WorkbenchManage"
;
String
urlName
=
"DispatchBenchManage"
;
Long
assigned
=
summary
.
getOrDefault
(
"ASSIGNED"
,
0L
);
Long
contacted
=
summary
.
getOrDefault
(
"CONTACTED"
,
0L
);
Long
departed
=
summary
.
getOrDefault
(
"DEPARTED"
,
0L
);
...
...
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