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 b0096c34
authored
Jul 12, 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
83551ea9
a969d4c5
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
99 additions
and
36 deletions
project-order/src/main/java/com/dituhui/pea/order/dto/ScheduleSummaryResp.java
project-order/src/main/java/com/dituhui/pea/order/dto/WorkbenchSummaryResp.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/ScheduleServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/WorkbenchServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/dto/ScheduleSummaryResp.java
View file @
b0096c3
...
...
@@ -3,6 +3,7 @@ package com.dituhui.pea.order.dto;
import
com.fasterxml.jackson.annotation.JsonInclude
;
import
lombok.Data
;
import
java.util.HashMap
;
import
java.util.List
;
@Data
...
...
@@ -18,17 +19,19 @@ public class ScheduleSummaryResp {
@Data
@JsonInclude
(
JsonInclude
.
Include
.
NON_NULL
)
public
static
class
ValueDTO
{
public
static
class
ValueDTO
<
T
>
{
private
String
title
;
private
Integer
value
;
private
String
valueColor
;
private
String
url
;
private
String
urlName
;
private
HashMap
<
String
,
List
<
T
>>
params
;
public
ValueDTO
(
String
title
,
Integer
value
,
String
valueColor
,
String
url
){
public
ValueDTO
(
String
title
,
Integer
value
,
String
valueColor
,
String
url
Name
,
HashMap
<
String
,
List
<
T
>>
params
){
this
.
title
=
title
;
this
.
value
=
value
;
this
.
valueColor
=
valueColor
;
this
.
url
=
url
;
this
.
urlName
=
urlName
;
this
.
params
=
params
;
}
}
}
project-order/src/main/java/com/dituhui/pea/order/dto/WorkbenchSummaryResp.java
View file @
b0096c3
...
...
@@ -3,6 +3,7 @@ package com.dituhui.pea.order.dto;
import
com.fasterxml.jackson.annotation.JsonInclude
;
import
lombok.Data
;
import
java.util.HashMap
;
import
java.util.List
;
@Data
...
...
@@ -18,19 +19,21 @@ public class WorkbenchSummaryResp {
@Data
@JsonInclude
(
JsonInclude
.
Include
.
NON_NULL
)
public
static
class
ValueDTO
{
public
static
class
ValueDTO
<
T
>
{
private
String
title
;
private
String
value
;
private
String
total
;
private
String
valueColor
;
private
String
url
;
private
String
urlName
;
private
HashMap
<
String
,
List
<
T
>>
params
;
public
ValueDTO
(
String
title
,
String
value
,
String
total
,
String
valueColor
,
String
url
){
public
ValueDTO
(
String
title
,
String
value
,
String
total
,
String
valueColor
,
String
url
Name
,
HashMap
<
String
,
List
<
T
>>
params
){
this
.
title
=
title
;
this
.
value
=
value
;
this
.
total
=
total
;
this
.
valueColor
=
valueColor
;
this
.
url
=
url
;
this
.
urlName
=
urlName
;
this
.
params
=
params
;
}
}
}
\ No newline at end of file
project-order/src/main/java/com/dituhui/pea/order/service/impl/ScheduleServiceImpl.java
View file @
b0096c3
...
...
@@ -15,10 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Service
;
import
java.time.LocalDate
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.*
;
import
java.util.stream.Collectors
;
...
...
@@ -420,30 +417,59 @@ public class ScheduleServiceImpl implements ScheduleService {
for
(
Map
.
Entry
<
String
,
Integer
>
entry
:
map
.
entrySet
())
{
sum
+=
entry
.
getValue
();
}
String
url
=
"/dispatchBench/index
"
;
String
url
Name
=
"DispatchBenchManage
"
;
List
<
ScheduleSummaryResp
.
ValueDTO
>
items
=
new
ArrayList
<>();
items
.
add
(
new
ScheduleSummaryResp
.
ValueDTO
(
"总单量"
,
sum
,
"#469967"
,
url
));
items
.
add
(
new
ScheduleSummaryResp
.
ValueDTO
(
"安装"
,
map
.
getOrDefault
(
"安装"
,
0
),
null
,
url
));
items
.
add
(
new
ScheduleSummaryResp
.
ValueDTO
(
"维修"
,
map
.
getOrDefault
(
"维修"
,
0
),
null
,
url
));
items
.
add
(
new
ScheduleSummaryResp
.
ValueDTO
(
"清洁保养"
,
map
.
getOrDefault
(
"清洁保养"
,
0
),
null
,
url
));
items
.
add
(
new
ScheduleSummaryResp
.
ValueDTO
(
"整改"
,
map
.
getOrDefault
(
"整改"
,
0
),
null
,
url
));
items
.
add
(
new
ScheduleSummaryResp
.
ValueDTO
(
"总单量"
,
sum
,
"#469967"
,
urlName
,
new
HashMap
<>()));
HashMap
<
String
,
List
<
String
>>
p1
=
this
.
packParams
(
"skillCategory"
,
"安装"
);
items
.
add
(
new
ScheduleSummaryResp
.
ValueDTO
(
"安装"
,
map
.
getOrDefault
(
"安装"
,
0
),
null
,
urlName
,
p1
));
HashMap
<
String
,
List
<
String
>>
p2
=
this
.
packParams
(
"skillCategory"
,
"维修"
);
items
.
add
(
new
ScheduleSummaryResp
.
ValueDTO
(
"维修"
,
map
.
getOrDefault
(
"维修"
,
0
),
null
,
urlName
,
p2
));
HashMap
<
String
,
List
<
String
>>
p3
=
this
.
packParams
(
"skillCategory"
,
"清洁保养"
);
items
.
add
(
new
ScheduleSummaryResp
.
ValueDTO
(
"清洁保养"
,
map
.
getOrDefault
(
"清洁保养"
,
0
),
null
,
urlName
,
p3
));
HashMap
<
String
,
List
<
String
>>
p4
=
this
.
packParams
(
"skillCategory"
,
"整改"
);
items
.
add
(
new
ScheduleSummaryResp
.
ValueDTO
(
"整改"
,
map
.
getOrDefault
(
"整改"
,
0
),
null
,
urlName
,
p4
));
return
items
;
}
private
List
<
ScheduleSummaryResp
.
ValueDTO
>
packGroupCategorySummary
(
HashMap
<
Integer
,
Integer
>
map
)
{
String
url
=
"/dispatchBench/index
"
;
String
url
Name
=
"DispatchBenchManage
"
;
List
<
ScheduleSummaryResp
.
ValueDTO
>
items
=
new
ArrayList
<>();
items
.
add
(
new
ScheduleSummaryResp
.
ValueDTO
(
"自有"
,
map
.
getOrDefault
(
1
,
0
),
null
,
url
));
items
.
add
(
new
ScheduleSummaryResp
.
ValueDTO
(
"网点"
,
map
.
getOrDefault
(
2
,
0
),
null
,
url
));
HashMap
<
String
,
List
<
Integer
>>
p1
=
this
.
packParams
(
"groupCategory"
,
1
);
items
.
add
(
new
ScheduleSummaryResp
.
ValueDTO
(
"自有"
,
map
.
getOrDefault
(
1
,
0
),
null
,
urlName
,
p1
));
HashMap
<
String
,
List
<
Integer
>>
p2
=
this
.
packParams
(
"groupCategory"
,
2
);
items
.
add
(
new
ScheduleSummaryResp
.
ValueDTO
(
"网点"
,
map
.
getOrDefault
(
2
,
0
),
null
,
urlName
,
p2
));
return
items
;
}
private
List
<
ScheduleSummaryResp
.
ValueDTO
>
packAppointmentSummary
(
HashMap
<
String
,
Integer
>
map
)
{
String
url
=
"/dispatchBench/index
"
;
String
url
Name
=
"DispatchBenchManage
"
;
List
<
ScheduleSummaryResp
.
ValueDTO
>
items
=
new
ArrayList
<>();
items
.
add
(
new
ScheduleSummaryResp
.
ValueDTO
(
"自动指派"
,
map
.
getOrDefault
(
"autoTotal"
,
0
),
null
,
url
));
items
.
add
(
new
ScheduleSummaryResp
.
ValueDTO
(
"人工指派"
,
map
.
getOrDefault
(
"manualTotal"
,
0
),
null
,
url
));
items
.
add
(
new
ScheduleSummaryResp
.
ValueDTO
(
"未指派"
,
map
.
getOrDefault
(
"notAssignTotal"
,
0
),
null
,
url
));
HashMap
<
String
,
List
<
String
>>
p1
=
this
.
packParams
(
"appointmentType"
,
"AUTO_NOW"
,
"AUTO_BATCH"
);
items
.
add
(
new
ScheduleSummaryResp
.
ValueDTO
(
"自动指派"
,
map
.
getOrDefault
(
"autoTotal"
,
0
),
null
,
urlName
,
p1
));
HashMap
<
String
,
List
<
String
>>
p2
=
this
.
packParams
(
"appointmentType"
,
"MANUAL"
);
items
.
add
(
new
ScheduleSummaryResp
.
ValueDTO
(
"人工指派"
,
map
.
getOrDefault
(
"manualTotal"
,
0
),
null
,
urlName
,
p2
));
HashMap
<
String
,
List
<
String
>>
p3
=
this
.
packParams
(
"appointmentStatus"
,
"NOT_ASSIGNED"
);
items
.
add
(
new
ScheduleSummaryResp
.
ValueDTO
(
"未指派"
,
map
.
getOrDefault
(
"notAssignTotal"
,
0
),
null
,
urlName
,
p3
));
return
items
;
}
private
<
T
>
HashMap
<
String
,
List
<
T
>>
packParams
(
String
key
,
T
...
values
)
{
HashMap
<
String
,
List
<
T
>>
map
=
new
HashMap
<>();
List
<
T
>
value
=
new
ArrayList
<>();
for
(
T
v:
values
){
value
.
add
(
v
);
}
map
.
put
(
key
,
value
);
return
map
;
}
}
project-order/src/main/java/com/dituhui/pea/order/service/impl/WorkbenchServiceImpl.java
View file @
b0096c3
...
...
@@ -168,23 +168,31 @@ public class WorkbenchServiceImpl implements WorkbenchService {
private
List
<
WorkbenchSummaryResp
.
ValueDTO
>
packValueAppointmentMethod
(
HashMap
<
String
,
Long
>
summary
)
{
List
<
WorkbenchSummaryResp
.
ValueDTO
>
items
=
new
ArrayList
<>();
String
url
=
"/dispatchBench/index
"
;
String
url
Name
=
"WorkbenchManage
"
;
Long
manualDealing
=
summary
.
getOrDefault
(
"manualDealing"
,
0L
);
Long
manualTotal
=
summary
.
getOrDefault
(
"manualTotal"
,
0L
);
Long
autoDealing
=
summary
.
getOrDefault
(
"autoDealing"
,
0L
);
Long
autoTotal
=
summary
.
getOrDefault
(
"autoTotal"
,
0L
);
Long
total
=
summary
.
getOrDefault
(
"total"
,
0L
);
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
(
"全部订单"
,
null
,
total
.
toString
(),
null
,
url
));
HashMap
<
String
,
List
<
String
>>
p
=
this
.
packParams
(
"appointmentStatus"
,
"NOT_ASSIGNED"
);
HashMap
<
String
,
List
<
String
>>
p1
=
this
.
packParams
(
"appointmentType"
,
"MANUAL"
);
p1
.
putAll
(
p
);
items
.
add
(
new
WorkbenchSummaryResp
.
ValueDTO
(
"待人工处理"
,
manualDealing
.
toString
(),
manualTotal
.
toString
(),
"#FF8000"
,
urlName
,
p1
));
HashMap
<
String
,
List
<
String
>>
p2
=
this
.
packParams
(
"appointmentType"
,
"AUTO_NOW"
,
"AUTO_BATCH"
,
"PROTECTION"
);
p2
.
putAll
(
p
);
items
.
add
(
new
WorkbenchSummaryResp
.
ValueDTO
(
"待自动处理"
,
autoDealing
.
toString
(),
autoTotal
.
toString
(),
"#469967"
,
urlName
,
p2
));
items
.
add
(
new
WorkbenchSummaryResp
.
ValueDTO
(
"全部订单"
,
null
,
total
.
toString
(),
null
,
urlName
,
new
HashMap
<>()));
return
items
;
}
private
List
<
WorkbenchSummaryResp
.
ValueDTO
>
packValueOrderStatus
(
HashMap
<
String
,
Long
>
summary
)
{
List
<
WorkbenchSummaryResp
.
ValueDTO
>
items
=
new
ArrayList
<>();
String
url
=
"/dispatchBench/index
"
;
String
url
Name
=
"WorkbenchManage
"
;
Long
assigned
=
summary
.
getOrDefault
(
"ASSIGNED"
,
0L
);
Long
contacted
=
summary
.
getOrDefault
(
"CONTACTED"
,
0L
);
...
...
@@ -195,12 +203,34 @@ public class WorkbenchServiceImpl implements WorkbenchService {
Long
cancel
=
summary
.
getOrDefault
(
"CANCELED"
,
0L
);
Long
finished
=
summary
.
getOrDefault
(
"FINISHED"
,
0L
);
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
(
"已完成"
,
finished
.
toString
(),
null
,
null
,
url
));
items
.
add
(
new
WorkbenchSummaryResp
.
ValueDTO
(
"已取消"
,
cancel
.
toString
(),
null
,
null
,
url
));
items
.
add
(
new
WorkbenchSummaryResp
.
ValueDTO
(
"已改约"
,
"0"
,
null
,
null
,
url
));
items
.
add
(
new
WorkbenchSummaryResp
.
ValueDTO
(
"已延误"
,
"0"
,
null
,
"#FF3D44"
,
url
));
HashMap
<
String
,
List
<
String
>>
p1
=
this
.
packParams
(
"appointmentStatus"
,
"ASSIGNED"
,
"CONTACTED"
,
"DEPARTED"
);
items
.
add
(
new
WorkbenchSummaryResp
.
ValueDTO
(
"待上门"
,
dealing
.
toString
(),
null
,
"#469967"
,
urlName
,
p1
));
HashMap
<
String
,
List
<
String
>>
p2
=
this
.
packParams
(
"appointmentStatus"
,
"STARTED"
);
items
.
add
(
new
WorkbenchSummaryResp
.
ValueDTO
(
"服务中"
,
started
.
toString
(),
null
,
"#016FFF"
,
urlName
,
p2
));
HashMap
<
String
,
List
<
String
>>
p3
=
this
.
packParams
(
"appointmentStatus"
,
"FINISHED"
);
items
.
add
(
new
WorkbenchSummaryResp
.
ValueDTO
(
"已完成"
,
finished
.
toString
(),
null
,
null
,
urlName
,
p3
));
HashMap
<
String
,
List
<
String
>>
p4
=
this
.
packParams
(
"appointmentStatus"
,
"CANCELED"
);
items
.
add
(
new
WorkbenchSummaryResp
.
ValueDTO
(
"已取消"
,
cancel
.
toString
(),
null
,
null
,
urlName
,
p4
));
HashMap
<
String
,
List
<
String
>>
p5
=
this
.
packParams
(
"appointmentStatus"
,
"RESCHEDULED"
);
items
.
add
(
new
WorkbenchSummaryResp
.
ValueDTO
(
"已改约"
,
"0"
,
null
,
null
,
urlName
,
p5
));
items
.
add
(
new
WorkbenchSummaryResp
.
ValueDTO
(
"已延误"
,
"0"
,
null
,
"#FF3D44"
,
urlName
,
new
HashMap
<>()));
return
items
;
}
private
<
T
>
HashMap
<
String
,
List
<
T
>>
packParams
(
String
key
,
T
...
values
)
{
HashMap
<
String
,
List
<
T
>>
map
=
new
HashMap
<>();
List
<
T
>
value
=
new
ArrayList
<>();
for
(
T
v:
values
){
value
.
add
(
v
);
}
map
.
put
(
key
,
value
);
return
map
;
}
}
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