|
@@ -58,18 +58,22 @@ public class OrderController extends BaseWebController {
|
|
|
String error = this.checkExcelExport(key);
|
|
String error = this.checkExcelExport(key);
|
|
|
if ("".equals(error)) {
|
|
if ("".equals(error)) {
|
|
|
orgConstrainService.fillOrgParams(orderServiceWebInDTO);
|
|
orgConstrainService.fillOrgParams(orderServiceWebInDTO);
|
|
|
-
|
|
|
|
|
- List<OrderExcelDTO> list = orderService.orderExcel(orderServiceWebInDTO);
|
|
|
|
|
- ExcelUtils.easyDownload("classpath:excel/order_service.xlsx", Maps.newHashMap(), list, "", resp);
|
|
|
|
|
- if(cacheService.exists(key)){
|
|
|
|
|
- if(cacheService.get(key).equals(TokenContext.cureWebUser().getUserId().toString())){
|
|
|
|
|
- cacheService.del(key);
|
|
|
|
|
|
|
+ try {
|
|
|
|
|
+ List<OrderExcelDTO> list = orderService.orderExcel(orderServiceWebInDTO);
|
|
|
|
|
+ ExcelUtils.easyDownload("classpath:excel/order_service.xlsx", Maps.newHashMap(), list, "", resp);
|
|
|
|
|
+ }catch (Exception e){
|
|
|
|
|
+ e.printStackTrace();
|
|
|
|
|
+ throw new BusinessException(e.getMessage());
|
|
|
|
|
+ }finally {
|
|
|
|
|
+ if(cacheService.exists(key)){
|
|
|
|
|
+ if(cacheService.get(key).equals(TokenContext.cureWebUser().getUserId().toString())){
|
|
|
|
|
+ cacheService.del(key);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}else{
|
|
}else{
|
|
|
throw new BusinessException(error);
|
|
throw new BusinessException(error);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping(value = "/orderDishesExport")
|
|
@PostMapping(value = "/orderDishesExport")
|