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 401a767b
authored
Nov 06, 2023
by
Ren Ping
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:排班结果工程师详情修改
1 parent
013a03db
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/ScheduleServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/ScheduleServiceImpl.java
View file @
401a767
...
...
@@ -200,6 +200,7 @@ public class ScheduleServiceImpl implements ScheduleService {
dynamics
.
add
(
new
LabelValueDTO
(
"姓名"
,
engineer
.
getName
()));
dynamics
.
add
(
new
LabelValueDTO
(
"日期"
,
TimeUtils
.
IsoLocalDate2String
(
date
)));
dynamics
.
add
(
new
LabelValueDTO
(
"状态"
,
"上班"
));
dynamics
.
add
(
new
LabelValueDTO
(
"总单数"
,
orderAppointments
.
size
()
+
""
));
dynamics
.
add
(
new
LabelValueDTO
(
"待服务"
,
Integer
.
toString
(
countPending
)));
dynamics
.
add
(
new
LabelValueDTO
(
"服务中"
,
Integer
.
toString
(
statusGroup
.
getOrDefault
(
"STARTED"
,
empty
).
size
())));
dynamics
.
add
(
new
LabelValueDTO
(
"已完成"
,
Integer
.
toString
(
statusGroup
.
getOrDefault
(
"FINISHED"
,
empty
).
size
())));
...
...
@@ -208,7 +209,7 @@ public class ScheduleServiceImpl implements ScheduleService {
dynamics
.
add
(
new
LabelValueDTO
(
"预计总耗时"
,
new
BigDecimal
(
sumElapsed
)
.
divide
(
new
BigDecimal
(
60
),
2
,
RoundingMode
.
HALF_UP
)
.
stripTrailingZeros
()
+
"
小
时"
));
+
"时"
));
dynamics
.
add
(
new
LabelValueDTO
(
"公里数"
,
sumDistance
+
""
));
if
(
Objects
.
nonNull
(
engineerBusinessEntity
))
{
dynamics
.
add
(
new
LabelValueDTO
(
"工作时间"
,
engineerBusinessEntity
.
getWorkOn
()
+
"-"
+
engineerBusinessEntity
.
getWorkOff
()));
...
...
@@ -266,7 +267,11 @@ public class ScheduleServiceImpl implements ScheduleService {
}
ScheduleEngineerOverviewResp
res
=
new
ScheduleEngineerOverviewResp
();
res
.
setTitle
(
String
.
format
(
"%s_%s"
,
groupName
,
engineer
.
getName
()));
res
.
setTitle
(
String
.
format
(
"%s_%s_%s_%s_%s"
,
groupName
,
engineer
.
getName
(),
engineer
.
getEngineerCode
(),
engineer
.
getPhone
(),
engineer
.
getGrade
()));
res
.
setEngineerCode
(
engineerCode
);
res
.
setStartTime
(
String
.
format
(
"%s 08:00:00"
,
date
));
// TODO
res
.
setEndTime
(
String
.
format
(
"%s 18:00:00"
,
date
));
...
...
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