Merge branch 'feat-dingwf-mvp616' into develop

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/CapacityQueryServiceImpl.java

@@ -130,6 +130,8 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
             }
             }
             contents.add(content);
             contents.add(content);
         }
         }
+        contents.stream().sorted(
+                Comparator.comparing(CapacityStatQueryRespDTO.Content::getDate)).collect(Collectors.toList());
         data.setContent(contents);
         data.setContent(contents);
 
 
         return Result.success(data);
         return Result.success(data);

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/WorkbenchServiceImpl.java

@@ -130,8 +130,12 @@ public class WorkbenchServiceImpl implements WorkbenchService {
     }
     }
 
 
     private List<?> getOrderTips(String orderId) {
     private List<?> getOrderTips(String orderId) {
-        log.info("==> getOrdertips: orderId[{}]", orderId);
+        log.info("==> getOrderTips: orderId[{}]", orderId);
         OrderRequestEntity order = orderRequestDao.getByOrderId(orderId);
         OrderRequestEntity order = orderRequestDao.getByOrderId(orderId);
+        if (order == null) {
+            log.error("对应的订单不存在！{}", orderId);
+            return null;
+        }
         List<LabelValueDTO> tips = new ArrayList<>();
         List<LabelValueDTO> tips = new ArrayList<>();
         tips.add(new LabelValueDTO().setLabel("工单号码").setValue(orderId));
         tips.add(new LabelValueDTO().setLabel("工单号码").setValue(orderId));
         tips.add(new LabelValueDTO().setLabel("类型/品牌").setValue(String.format("%s %s", order.getBrand(), order.getType())));
         tips.add(new LabelValueDTO().setLabel("类型/品牌").setValue(String.format("%s %s", order.getBrand(), order.getType())));