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 9cc1f4cf
authored
Jul 06, 2023
by
王力
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_bugfix_workbench_summary' into 'develop'
修改 See merge request !158
2 parents
c3f240e4
1f99d935
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
25 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 @
9cc1f4c
...
@@ -84,13 +84,13 @@ public class WorkbenchServiceImpl implements WorkbenchService {
...
@@ -84,13 +84,13 @@ public class WorkbenchServiceImpl implements WorkbenchService {
public
Result
<?>
getWorkbenchSummary
(
String
levelType
,
String
levelValue
,
LocalDate
dt
)
{
public
Result
<?>
getWorkbenchSummary
(
String
levelType
,
String
levelValue
,
LocalDate
dt
)
{
List
<
WorkbenchSummaryResp
.
ItemDTO
>
items
=
new
ArrayList
<>();
List
<
WorkbenchSummaryResp
.
ItemDTO
>
items
=
new
ArrayList
<>();
HashMap
<
String
,
Integer
>
methodSummary
=
this
.
transAppointmentMethod
(
this
.
queryCountByAppointmentMethod
(
levelType
,
levelValue
,
dt
));
HashMap
<
String
,
Long
>
methodSummary
=
this
.
transAppointmentMethod
(
this
.
queryCountByAppointmentMethod
(
levelType
,
levelValue
,
dt
));
WorkbenchSummaryResp
.
ItemDTO
methodItem
=
new
WorkbenchSummaryResp
.
ItemDTO
();
WorkbenchSummaryResp
.
ItemDTO
methodItem
=
new
WorkbenchSummaryResp
.
ItemDTO
();
methodItem
.
setType
(
"order"
);
methodItem
.
setType
(
"order"
);
methodItem
.
setRows
(
this
.
packValueAppointmentMethod
(
methodSummary
));
methodItem
.
setRows
(
this
.
packValueAppointmentMethod
(
methodSummary
));
items
.
add
(
methodItem
);
items
.
add
(
methodItem
);
HashMap
<
String
,
Integer
>
statusSummary
=
this
.
transOrderStatus
(
this
.
queryCountByOrderStatus
(
levelType
,
levelValue
,
dt
));
HashMap
<
String
,
Long
>
statusSummary
=
this
.
transOrderStatus
(
this
.
queryCountByOrderStatus
(
levelType
,
levelValue
,
dt
));
WorkbenchSummaryResp
.
ItemDTO
statusItem
=
new
WorkbenchSummaryResp
.
ItemDTO
();
WorkbenchSummaryResp
.
ItemDTO
statusItem
=
new
WorkbenchSummaryResp
.
ItemDTO
();
statusItem
.
setType
(
"order"
);
statusItem
.
setType
(
"order"
);
statusItem
.
setRows
(
this
.
packValueOrderStatus
(
statusSummary
));
statusItem
.
setRows
(
this
.
packValueOrderStatus
(
statusSummary
));
...
@@ -125,16 +125,16 @@ public class WorkbenchServiceImpl implements WorkbenchService {
...
@@ -125,16 +125,16 @@ public class WorkbenchServiceImpl implements WorkbenchService {
return
orderRequestMPDao
.
selectMaps
(
wrapper
);
return
orderRequestMPDao
.
selectMaps
(
wrapper
);
}
}
private
HashMap
<
String
,
Integer
>
transAppointmentMethod
(
List
<
Map
<
String
,
Object
>>
results
)
{
private
HashMap
<
String
,
Long
>
transAppointmentMethod
(
List
<
Map
<
String
,
Object
>>
results
)
{
HashMap
<
String
,
Integer
>
map
=
new
HashMap
<>();
HashMap
<
String
,
Long
>
map
=
new
HashMap
<>();
Integer
manualTotal
=
0
;
// 人工
Long
manualTotal
=
0L
;
// 人工
Integer
autoTotal
=
0
;
Long
autoTotal
=
0L
;
Integer
total
=
0
;
Long
total
=
0L
;
for
(
Map
<
String
,
Object
>
result
:
results
)
{
for
(
Map
<
String
,
Object
>
result
:
results
)
{
String
method
=
(
String
)
result
.
get
(
"appointment_method"
);
String
method
=
(
String
)
result
.
get
(
"appointment_method"
);
String
status
=
(
String
)
result
.
get
(
"appointment_status"
);
String
status
=
(
String
)
result
.
get
(
"appointment_status"
);
Integer
count
=
(
int
)
result
.
get
(
"count"
);
Long
count
=
(
long
)
result
.
get
(
"count"
);
total
+=
count
;
total
+=
count
;
...
@@ -156,26 +156,26 @@ public class WorkbenchServiceImpl implements WorkbenchService {
...
@@ -156,26 +156,26 @@ public class WorkbenchServiceImpl implements WorkbenchService {
return
map
;
return
map
;
}
}
private
HashMap
<
String
,
Integer
>
transOrderStatus
(
List
<
Map
<
String
,
Object
>>
results
)
{
private
HashMap
<
String
,
Long
>
transOrderStatus
(
List
<
Map
<
String
,
Object
>>
results
)
{
HashMap
<
String
,
Integer
>
map
=
new
HashMap
<>();
HashMap
<
String
,
Long
>
map
=
new
HashMap
<>();
for
(
Map
<
String
,
Object
>
result
:
results
)
{
for
(
Map
<
String
,
Object
>
result
:
results
)
{
String
status
=
(
String
)
result
.
get
(
"appointment_status"
);
String
status
=
(
String
)
result
.
get
(
"appointment_status"
);
Integer
count
=
(
int
)
result
.
get
(
"count"
);
Long
count
=
(
long
)
result
.
get
(
"count"
);
map
.
put
(
status
,
count
);
map
.
put
(
status
,
count
);
}
}
return
map
;
return
map
;
}
}
private
List
<
WorkbenchSummaryResp
.
ValueDTO
>
packValueAppointmentMethod
(
HashMap
<
String
,
Integer
>
summary
)
{
private
List
<
WorkbenchSummaryResp
.
ValueDTO
>
packValueAppointmentMethod
(
HashMap
<
String
,
Long
>
summary
)
{
List
<
WorkbenchSummaryResp
.
ValueDTO
>
items
=
new
ArrayList
<>();
List
<
WorkbenchSummaryResp
.
ValueDTO
>
items
=
new
ArrayList
<>();
String
url
=
"/dispatchBench/index"
;
String
url
=
"/dispatchBench/index"
;
Integer
manualDealing
=
summary
.
getOrDefault
(
"manualDealing"
,
0
);
Long
manualDealing
=
summary
.
getOrDefault
(
"manualDealing"
,
0L
);
Integer
manualTotal
=
summary
.
getOrDefault
(
"manualTotal"
,
0
);
Long
manualTotal
=
summary
.
getOrDefault
(
"manualTotal"
,
0L
);
Integer
autoDealing
=
summary
.
getOrDefault
(
"autoDealing"
,
0
);
Long
autoDealing
=
summary
.
getOrDefault
(
"autoDealing"
,
0L
);
Integer
autoTotal
=
summary
.
getOrDefault
(
"autoTotal"
,
0
);
Long
autoTotal
=
summary
.
getOrDefault
(
"autoTotal"
,
0L
);
Integer
total
=
summary
.
getOrDefault
(
"total"
,
0
);
Long
total
=
summary
.
getOrDefault
(
"total"
,
0L
);
items
.
add
(
new
WorkbenchSummaryResp
.
ValueDTO
(
"待人工处理"
,
manualDealing
.
toString
(),
manualTotal
.
toString
(),
"#FF8000"
,
url
));
items
.
add
(
new
WorkbenchSummaryResp
.
ValueDTO
(
"待人工处理"
,
manualDealing
.
toString
(),
manualTotal
.
toString
(),
"#FF8000"
,
url
));
items
.
add
(
new
WorkbenchSummaryResp
.
ValueDTO
(
"待自动处理"
,
autoDealing
.
toString
(),
autoTotal
.
toString
(),
"#469967"
,
url
));
items
.
add
(
new
WorkbenchSummaryResp
.
ValueDTO
(
"待自动处理"
,
autoDealing
.
toString
(),
autoTotal
.
toString
(),
"#469967"
,
url
));
...
@@ -183,19 +183,19 @@ public class WorkbenchServiceImpl implements WorkbenchService {
...
@@ -183,19 +183,19 @@ public class WorkbenchServiceImpl implements WorkbenchService {
return
items
;
return
items
;
}
}
private
List
<
WorkbenchSummaryResp
.
ValueDTO
>
packValueOrderStatus
(
HashMap
<
String
,
Integer
>
summary
)
{
private
List
<
WorkbenchSummaryResp
.
ValueDTO
>
packValueOrderStatus
(
HashMap
<
String
,
Long
>
summary
)
{
List
<
WorkbenchSummaryResp
.
ValueDTO
>
items
=
new
ArrayList
<>();
List
<
WorkbenchSummaryResp
.
ValueDTO
>
items
=
new
ArrayList
<>();
String
url
=
"/dispatchBench/index"
;
String
url
=
"/dispatchBench/index"
;
Integer
assigned
=
summary
.
getOrDefault
(
"ASSIGNED"
,
0
);
Long
assigned
=
summary
.
getOrDefault
(
"ASSIGNED"
,
0L
);
Integer
contacted
=
summary
.
getOrDefault
(
"CONTACTED"
,
0
);
Long
contacted
=
summary
.
getOrDefault
(
"CONTACTED"
,
0L
);
Integer
departed
=
summary
.
getOrDefault
(
"DEPARTED"
,
0
);
Long
departed
=
summary
.
getOrDefault
(
"DEPARTED"
,
0L
);
Integer
dealing
=
assigned
+
contacted
+
departed
;
Long
dealing
=
assigned
+
contacted
+
departed
;
Integer
started
=
summary
.
getOrDefault
(
"STARTED"
,
0
);
Long
started
=
summary
.
getOrDefault
(
"STARTED"
,
0L
);
Integer
cancel
=
summary
.
getOrDefault
(
"CANCELED"
,
0
);
Long
cancel
=
summary
.
getOrDefault
(
"CANCELED"
,
0L
);
Integer
finished
=
summary
.
getOrDefault
(
"FINISHED"
,
0
);
Long
finished
=
summary
.
getOrDefault
(
"FINISHED"
,
0L
);
items
.
add
(
new
WorkbenchSummaryResp
.
ValueDTO
(
"待上门"
,
dealing
.
toString
(),
null
,
"#469967"
,
url
));
items
.
add
(
new
WorkbenchSummaryResp
.
ValueDTO
(
"待上门"
,
dealing
.
toString
(),
null
,
"#469967"
,
url
));
items
.
add
(
new
WorkbenchSummaryResp
.
ValueDTO
(
"服务中"
,
started
.
toString
(),
null
,
"#016FFF"
,
url
));
items
.
add
(
new
WorkbenchSummaryResp
.
ValueDTO
(
"服务中"
,
started
.
toString
(),
null
,
"#016FFF"
,
url
));
...
...
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