před 1 rokem
rodič
revize
6e986baaa0

+ 14 - 2
platform-rest/src/main/java/com/platform/rest/controller/preparation/PreparationController.java

@@ -1,6 +1,7 @@
 package com.platform.rest.controller.preparation;
 
 import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.common.exception.BusinessException;
 import com.platform.common.util.BeanConverterUtil;
 import com.platform.common.util.R;
 import com.platform.common.validation.group.AddGroup;
@@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -204,9 +206,19 @@ public class PreparationController {
 
   @GetMapping("/getPreparationDetailReport/export")
   @SysLog("筹建报表统计导出")
-  public void getPreparationDetailReport(HttpServletResponse response,PreparationDTO dto, @RequestParam(required = false) Integer year, @RequestParam(required = false) LocalDate startMonth, @RequestParam(required = false) LocalDate endMonth) {
+  public void getPreparationDetailReport(HttpServletResponse response,PreparationDTO dto, @RequestParam(required = false) Integer year, @RequestParam(required = false) LocalDate startMonth, @RequestParam(required = false) LocalDate endMonth,String yearMonth) {
     List<AllPreparationReportVO> list = preparationService.getAllPreparationReport(dto, year, startMonth, endMonth);
-    List<PreparationVO> preparationVOS = list.get(0).getDetailList();
+    List<PreparationVO> preparationVOS = new ArrayList<>();
+    for (AllPreparationReportVO vo:list){
+      String str = vo.getYear()+"-"+vo.getMonth();
+      if (str.equals(yearMonth)){
+        preparationVOS = vo.getDetailList();
+        break;
+      }
+    }
+    if (preparationVOS.size() == 0){
+      throw new BusinessException("系统出错,请联系管理员!");
+    }
     ExcelUtil.exportResponseDict(response, ExportPreparationVO.class, BeanConverterUtil.copyListProperties(preparationVOS, ExportPreparationVO.class), "筹建报表统计导出");
   }