Commit e59067f5 by 丁伟峰

Merge branch 'feat-dingwf-mvp616' into develop

2 parents d6c9225a 4f8444d0
......@@ -130,6 +130,8 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
}
contents.add(content);
}
contents.stream().sorted(
Comparator.comparing(CapacityStatQueryRespDTO.Content::getDate)).collect(Collectors.toList());
data.setContent(contents);
return Result.success(data);
......
......@@ -130,8 +130,12 @@ public class WorkbenchServiceImpl implements WorkbenchService {
}
private List<?> getOrderTips(String orderId) {
log.info("==> getOrdertips: orderId[{}]", orderId);
log.info("==> getOrderTips: orderId[{}]", orderId);
OrderRequestEntity order = orderRequestDao.getByOrderId(orderId);
if (order == null) {
log.error("对应的订单不存在!{}", orderId);
return null;
}
List<LabelValueDTO> tips = new ArrayList<>();
tips.add(new LabelValueDTO().setLabel("工单号码").setValue(orderId));
tips.add(new LabelValueDTO().setLabel("类型/品牌").setValue(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!