| | |
| | | |
| | | Order orderData = orderClient.detail(order.getOrderId()).getData(); |
| | | |
| | | if(!order.getTime().equals(orderData.getTime()) || !order.getServerId().equals(orderData.getServerId())){ |
| | | if(!order.getTime().equals(orderData.getTime()) || (Objects.nonNull(order.getServerId())&&Objects.nonNull(orderData.getServerId())&&!order.getServerId().equals(orderData.getServerId()))){ |
| | | // 修改sys_change_dispatch 为已改派 |
| | | dispatchClient.changeReason(order.getOrderId(),""); |
| | | } |
| | |
| | | |
| | | R<List<Order>> result = orderClient.excelExport(orderQueryRequest); |
| | | for (Order datum : result.getData()) { |
| | | datum.setServeName(around(datum.getServeName(), 1, datum.getServeName().length()-1)); |
| | | datum.setServerPhone(around(datum.getServerPhone(), 3, 4)); |
| | | if(StringUtils.hasLength(datum.getServerName())){ |
| | | datum.setServerName(datum.getServerName().charAt(0)+"***"); |
| | | } |
| | | if(StringUtils.hasLength(datum.getServerPhone())){ |
| | | datum.setServerPhone(around(datum.getServerPhone(), 3, 4)); |
| | | } |
| | | } |
| | | // 独立orderService |
| | | return orderService.excelExport(result.getData(), response); |