Commit 401a767b by Ren Ping

fix:排班结果工程师详情修改

1 parent 013a03db
...@@ -200,6 +200,7 @@ public class ScheduleServiceImpl implements ScheduleService { ...@@ -200,6 +200,7 @@ public class ScheduleServiceImpl implements ScheduleService {
dynamics.add(new LabelValueDTO("姓名", engineer.getName())); dynamics.add(new LabelValueDTO("姓名", engineer.getName()));
dynamics.add(new LabelValueDTO("日期", TimeUtils.IsoLocalDate2String(date))); dynamics.add(new LabelValueDTO("日期", TimeUtils.IsoLocalDate2String(date)));
dynamics.add(new LabelValueDTO("状态", "上班")); dynamics.add(new LabelValueDTO("状态", "上班"));
dynamics.add(new LabelValueDTO("总单数", orderAppointments.size() + ""));
dynamics.add(new LabelValueDTO("待服务", Integer.toString(countPending))); 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("STARTED", empty).size())));
dynamics.add(new LabelValueDTO("已完成", Integer.toString(statusGroup.getOrDefault("FINISHED", empty).size()))); dynamics.add(new LabelValueDTO("已完成", Integer.toString(statusGroup.getOrDefault("FINISHED", empty).size())));
...@@ -208,7 +209,7 @@ public class ScheduleServiceImpl implements ScheduleService { ...@@ -208,7 +209,7 @@ public class ScheduleServiceImpl implements ScheduleService {
dynamics.add(new LabelValueDTO("预计总耗时", new BigDecimal(sumElapsed) dynamics.add(new LabelValueDTO("预计总耗时", new BigDecimal(sumElapsed)
.divide(new BigDecimal(60), 2, RoundingMode.HALF_UP) .divide(new BigDecimal(60), 2, RoundingMode.HALF_UP)
.stripTrailingZeros() .stripTrailingZeros()
+ "时")); + "时"));
dynamics.add(new LabelValueDTO("公里数", sumDistance + "")); dynamics.add(new LabelValueDTO("公里数", sumDistance + ""));
if (Objects.nonNull(engineerBusinessEntity)) { if (Objects.nonNull(engineerBusinessEntity)) {
dynamics.add(new LabelValueDTO("工作时间", engineerBusinessEntity.getWorkOn() + "-" + engineerBusinessEntity.getWorkOff())); dynamics.add(new LabelValueDTO("工作时间", engineerBusinessEntity.getWorkOn() + "-" + engineerBusinessEntity.getWorkOff()));
...@@ -266,7 +267,11 @@ public class ScheduleServiceImpl implements ScheduleService { ...@@ -266,7 +267,11 @@ public class ScheduleServiceImpl implements ScheduleService {
} }
ScheduleEngineerOverviewResp res = new ScheduleEngineerOverviewResp(); 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.setEngineerCode(engineerCode);
res.setStartTime(String.format("%s 08:00:00", date)); // TODO res.setStartTime(String.format("%s 08:00:00", date)); // TODO
res.setEndTime(String.format("%s 18:00:00", date)); res.setEndTime(String.format("%s 18:00:00", date));
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!