qin пре 1 година
родитељ
комит
3d784616e1

+ 11 - 7
src/main/java/com/poteviohealth/cgp/statistics/controller/OrderController.java

@@ -58,18 +58,22 @@ public class OrderController extends BaseWebController {
            String error =  this.checkExcelExport(key);
         if ("".equals(error)) {
             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{
             throw new BusinessException(error);
         }
-
     }
 
     @PostMapping(value = "/orderDishesExport")