优化

platform-dao/src/main/java/com/platform/dao/dto/longyanpurchaseorder/LongYanPurchaseDetailDTO.java

@@ -2,6 +2,7 @@ package com.platform.dao.dto.longyanpurchaseorder;
 
 import com.platform.common.bean.BaseDTO;
 import com.platform.common.validation.group.UpdateGroup;
+import jdk.internal.dynalink.linker.LinkerServices;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -10,6 +11,7 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.time.LocalDate;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @Description 龙岩采购明细表DTO
@@ -21,6 +23,7 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseDetailDTO extends BaseDTO implements Serializable {
+    private List<String> longYanPurchaseOrderIds;
     private String no;
     private String ggxh;
     private String spareName;

platform-dao/src/main/java/com/platform/dao/vo/report/LongYanPurchaseOrderReportVO.java

@@ -16,6 +16,7 @@ import java.util.List;
 @Data
 @Accessors(chain = true)
 public class LongYanPurchaseOrderReportVO implements Serializable {
+    private String id;
     private static final long serialVersionUID = 1L;
     private Integer purchaseType;
     private BigDecimal orderTotalNum;

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

@@ -11,6 +11,7 @@ import com.platform.dao.entity.preparation.Preparation;
 import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.vo.export.preparation.ExportPreparationVO;
 import com.platform.dao.vo.query.preparation.PreparationVO;
+import com.platform.dao.vo.report.AllPreparationReportVO;
 import com.platform.rest.log.annotation.SysLog;
 import com.platform.service.preparation.PreparationService;
 import lombok.AllArgsConstructor;
@@ -190,6 +191,25 @@ public class PreparationController {
     return new R(preparationService.getAllPreparationReport(dto, year, startMonth, endMonth));
   }
 
+  /**
+   *
+   */
+  @GetMapping("/getAllPreparationReport/export")
+  @SysLog("筹建报表统计导出")
+  public void getAllPreparationReportExport(HttpServletResponse response,PreparationDTO dto, @RequestParam(required = false) Integer year, @RequestParam(required = false) LocalDate startMonth, @RequestParam(required = false) LocalDate endMonth) {
+    List<AllPreparationReportVO> list = preparationService.getAllPreparationReport(dto, year, startMonth, endMonth);
+    ExcelUtil.exportResponseDict(response, AllPreparationReportVO.class, BeanConverterUtil.copyListProperties(list, AllPreparationReportVO.class), "筹建报表统计导出");
+  }
+
+  @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) {
+    List<AllPreparationReportVO> list = preparationService.getAllPreparationReport(dto, year, startMonth, endMonth);
+    List<PreparationVO> preparationVOS = list.get(0).getDetailList();
+    ExcelUtil.exportResponseDict(response, ExportPreparationVO.class, BeanConverterUtil.copyListProperties(preparationVOS, ExportPreparationVO.class), "筹建报表统计导出");
+  }
+
+
   /**
    *
    */