Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 08a137b3 by 丁伟峰
Options

Merge branch 'feat-dingwf-mvp616' into develop

2 parents 0b5a0c48 b6efe234
Inline Side-by-side
Showing with 21 additions and 13 deletions
project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/WorkbenchServiceImpl.java
...@@ -73,21 +73,29 @@ public class WorkbenchServiceImpl implements WorkbenchService { ...@@ -73,21 +73,29 @@ public class WorkbenchServiceImpl implements WorkbenchService {
} }
@Override @Override
public Result<?> getEngineersGanttList(WorkbenchEngineersGanttReqDTO ganttReqDTO) { public Result<?> getEngineersGanttList(WorkbenchEngineersGanttReqDTO reqDTO) {
// 按日期返回技术员们当天的服务甘特图，不需要翻页 // 按日期返回技术员们当天的服务甘特图，不需要翻页
log.info("getEngineersGanttList: {}", ganttReqDTO); log.info("getEngineersGanttList: {}", reqDTO);
List<?> orderAppointments = orderAppointmentDao.findByDateAndEngineerCodeIn(ganttReqDTO.getDate(), ganttReqDTO.getEngineerCodes()); List<?> orderAppointments = orderAppointmentDao.findByDateAndEngineerCodeIn(reqDTO.getDate(), reqDTO.getEngineerCodes());
HashMap<String, List<?>> mapEngineers = new HashMap<>(); HashMap<String, List<?>> mapEngineers = new HashMap<>();
for (Object e : orderAppointments) { for (Object e : orderAppointments) {
OrderAppointmentEntity entity = (OrderAppointmentEntity) e; OrderAppointmentEntity entity = (OrderAppointmentEntity) e;
log.info("===== order_id: [{}]", entity.getOrderId()); log.info("===== order_id: [{}]", entity.getOrderId());
if (!mapEngineers.containsKey(entity.getEngineerCode())) {
mapEngineers.put(entity.getEngineerCode(), new ArrayList<>());
}
WorkbenchEngineersGanttRespDTO.Order order = new WorkbenchEngineersGanttRespDTO.Order(); WorkbenchEngineersGanttRespDTO.Order order = new WorkbenchEngineersGanttRespDTO.Order();
order.setStartTime(entity.getStartTime()).setEndTime(entity.getEndTime()) order.setStartTime(entity.getStartTime())
.setOrderId(entity.getOrderId()).setOrderStatus(entity.getStatus()); .setEndTime(entity.getEndTime())
.setOrderId(entity.getOrderId())
.setOrderStatus(entity.getStatus());
order.setTips(getOrderTips(entity.getOrderId())); order.setTips(getOrderTips(entity.getOrderId()));
List<?> orders = null;
if (mapEngineers.containsKey(entity.getEngineerCode())) {
orders = mapEngineers.get(entity.getEngineerCode());
} else {
orders = new ArrayList<>();
}
orders.add(order);
mapEngineers.put(entity.getEngineerCode(), orders);
} }
List<WorkbenchEngineersGanttRespDTO.GanttChart> engineers = new ArrayList<>(); List<WorkbenchEngineersGanttRespDTO.GanttChart> engineers = new ArrayList<>();
...@@ -95,23 +103,23 @@ public class WorkbenchServiceImpl implements WorkbenchService { ...@@ -95,23 +103,23 @@ public class WorkbenchServiceImpl implements WorkbenchService {
EngineerInfoEntity engineerInfo = engineerInfoDao.getByEngineerCode(engineerCode); EngineerInfoEntity engineerInfo = engineerInfoDao.getByEngineerCode(engineerCode);
WorkbenchEngineersGanttRespDTO.GanttChart engineer = new WorkbenchEngineersGanttRespDTO.GanttChart(); WorkbenchEngineersGanttRespDTO.GanttChart engineer = new WorkbenchEngineersGanttRespDTO.GanttChart();
engineer.setEngineerCode(engineerCode) engineer.setEngineerCode(engineerCode)
.setStartTime(String.format("%s 00:00", ganttReqDTO.getDate())) .setStartTime(String.format("%s 00:00", reqDTO.getDate()))
.setEndTime(String.format("%s 23:59", ganttReqDTO.getDate())) .setEndTime(String.format("%s 23:59", reqDTO.getDate()))
.setHoliday(false) // todo .setHoliday(false) // todo
.setOrders(mapEngineers.get(engineerCode)) .setOrders(mapEngineers.get(engineerCode))
.setEngineerName(engineerInfo.getName()) .setEngineerName(engineerInfo.getName())
.setGrade(engineerInfo.getGrade()); .setGrade(engineerInfo.getGrade());
CapacityEngineerStatEntity capacityEngineerStat = capacityEngineerStatDao.getByEngineerCodeAndWorkday(engineerCode, ganttReqDTO.getDate()); CapacityEngineerStatEntity capacityEngineerStat = capacityEngineerStatDao.getByEngineerCodeAndWorkday(engineerCode, reqDTO.getDate());
if (capacityEngineerStat == null) { if (capacityEngineerStat == null) {
log.warn("技术员当日的容量数据不存在，{}{}", engineerCode, ganttReqDTO.getDate()); log.warn("技术员当日的容量数据不存在，{}{}", engineerCode, reqDTO.getDate());
} else { } else {
engineer.setCapTotal(capacityEngineerStat.getCapTotal().toString()).setCapUsed(capacityEngineerStat.getCapUsed().toString()); engineer.setCapTotal(capacityEngineerStat.getCapTotal().toString()).setCapUsed(capacityEngineerStat.getCapUsed().toString());
} }
// engineer.setErrorTip(); todo // engineer.setErrorTip(); todo
engineers.add(engineer); engineers.add(engineer);
} }
WorkbenchEngineersGanttRespDTO data = new WorkbenchEngineersGanttRespDTO().setDate(ganttReqDTO.getDate()).setEngineers(engineers); WorkbenchEngineersGanttRespDTO data = new WorkbenchEngineersGanttRespDTO().setDate(reqDTO.getDate()).setEngineers(engineers);
return Result.success(data); return Result.success(data);
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!