Commit 191f5178 by 丁伟峰

Merge branch 'feat-dingwf-mvp616' into develop

2 parents 0c9f6386 5c5225a4
...@@ -78,6 +78,7 @@ public class WorkbenchServiceImpl implements WorkbenchService { ...@@ -78,6 +78,7 @@ public class WorkbenchServiceImpl implements WorkbenchService {
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());
if (!mapEngineers.containsKey(entity.getEngineerCode())) { if (!mapEngineers.containsKey(entity.getEngineerCode())) {
mapEngineers.put(entity.getEngineerCode(), new ArrayList<>()); mapEngineers.put(entity.getEngineerCode(), new ArrayList<>());
} }
...@@ -102,6 +103,7 @@ public class WorkbenchServiceImpl implements WorkbenchService { ...@@ -102,6 +103,7 @@ public class WorkbenchServiceImpl implements WorkbenchService {
} }
private List<?> getOrderTips(String orderId) { private List<?> getOrderTips(String orderId) {
log.info("==> getOrdertips: orderId[{}]", orderId);
OrderRequestEntity order = orderRequestDao.getByOrderId(orderId); OrderRequestEntity order = orderRequestDao.getByOrderId(orderId);
List<WorkbenchEngineersGanttRespDTO.Tip> tips = new ArrayList<>(); List<WorkbenchEngineersGanttRespDTO.Tip> tips = new ArrayList<>();
tips.add(new WorkbenchEngineersGanttRespDTO.Tip().setTitle("类型/品牌").setDesc(String.format("%s %s", order.getBrand(), order.getType()))); tips.add(new WorkbenchEngineersGanttRespDTO.Tip().setTitle("类型/品牌").setDesc(String.format("%s %s", order.getBrand(), order.getType())));
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!