新增导出功能

ruoyi-admin/src/main/resources/application.yml

@@ -71,7 +71,7 @@ spring:
     basename: i18n/messages
   profiles:
     #@profiles.active@
-    active: prod
+    active: dev
   # 文件上传
   servlet:
     multipart:

zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualProductInfoController.java

@@ -56,8 +56,21 @@ public class ContractualProductInfoController extends BaseController {
     @Log(title = "合同产品信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ContractualProductInfoBo bo, HttpServletResponse response) {
-        List<ContractualProductInfoVo> list = contractualProductInfoService.queryList(bo);
-        ExcelUtil.exportExcel(list, "合同产品信息", ContractualProductInfoVo.class, response);
+            // 设置响应头
+            response.setContentType("application/vnd.ms-excel");
+            response.setCharacterEncoding("utf-8");
+            String fileName = "合同产品信息_" + System.currentTimeMillis() + ".xlsx";
+            response.setHeader("Content-disposition", "attachment;filename=" + fileName);
+            PageQuery pageQuery = new PageQuery();
+            pageQuery.setPageNum(1);
+            pageQuery.setPageSize(Integer.MAX_VALUE);
+            // 获取数据
+            TableDataInfo<ContractualProductInfoVo> tableDataInfo = contractualProductInfoService.queryPageList(bo, pageQuery);
+            List<ContractualProductInfoVo> list = tableDataInfo.getRows();
+
+            // 导出Excel
+            ExcelUtil.exportExcel(list, "合同产品信息", ContractualProductInfoVo.class, response);
+
     }
 
     /**
@@ -129,7 +142,7 @@ public class ContractualProductInfoController extends BaseController {
     /**
      * 获取产品统计数据
      *
-     * @param type 设备类型(终端、服务器、数据库)
+     * @param bo 设备类型(终端、服务器、数据库)
      */
     @GetMapping("/getProductStatistics")
     public R<ProductStatisticsData> getProductStatistics(ContractualProductInfoBo bo) {

zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/domain/vo/ContractualProductInfoVo.java

@@ -31,15 +31,15 @@ public class ContractualProductInfoVo implements Serializable {
     /**
      * 主键ID
      */
-    @ExcelProperty(value = "主键ID")
     private Long id;
 
     /**
      * 任务ID
      */
-    @ExcelProperty(value = "任务ID")
     private String taskId;
+    @ExcelProperty(value = "单位名称")
 
+    public String unitName;
     /**
      * 文件名称
      */
@@ -52,23 +52,30 @@ public class ContractualProductInfoVo implements Serializable {
     @ExcelProperty(value = "品牌")
     private String brand;
 
+    /**
+     * 类型
+     */
+    @ExcelProperty(value = "类型")
+    private String type;
     /**
      * 版本号
      */
     @ExcelProperty(value = "版本号")
     private String versionStr;
 
+    @ExcelProperty(value = "CPU型号")
+
+    private String cpuModel;
+
     /**
      * 单价
      */
     @ExcelProperty(value = "单价")
     private Long unitPrice;
-    private String cpuModel;
 
     /**
      * 价格单位
      */
-    @ExcelProperty(value = "价格单位")
     private String priceUnit;
 
     /**
@@ -83,13 +90,8 @@ public class ContractualProductInfoVo implements Serializable {
     @ExcelProperty(value = "总价")
     private Long totalPrice;
 
-    /**
-     * 类型
-     */
-    @ExcelProperty(value = "类型")
-    private String type;
 
-    public String unitName;
+
     private String os;
 
 }

zaojiaManagement/zaojia-productManagement/src/main/resources/mapper/productManagement/ContractualProductInfoMapper.xml

@@ -22,7 +22,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN document_tasks dt ON p.task_id = dt.id
         LEFT JOIN jyj_contractual_task_batch b ON dt.group_id = b.id
         <where>
-            b.document_name = #{queryParam.unitName}
+            <if test="queryParam.unitName != null and queryParam.unitName != ''">
+                AND b.document_name = #{queryParam.unitName}
+            </if>
             <if test="queryParam.fileName != null and queryParam.fileName != ''">
                 AND p.file_name LIKE CONCAT('%', #{queryParam.fileName}, '%')
             </if>