From 65696e950e892e0ccea91d1fee017a81e5df6aa7 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Mon, 11 Nov 2024 15:04:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=20?=
 =?UTF-8?q?=E5=8F=8A=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gzgqj/business/plan/controller/ExportController.java   | 7 +++++--
 .../bonus/gzgqj/business/plan/entity/ProPlanInfoVo.java    | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/bonus/gzgqj/business/plan/controller/ExportController.java b/src/main/java/com/bonus/gzgqj/business/plan/controller/ExportController.java
index 812deab..847109a 100644
--- a/src/main/java/com/bonus/gzgqj/business/plan/controller/ExportController.java
+++ b/src/main/java/com/bonus/gzgqj/business/plan/controller/ExportController.java
@@ -105,7 +105,10 @@ public class ExportController {
     public void exportFhList(HttpServletRequest request, HttpServletResponse response,@RequestBody  ProPlanInfoVo o) {
         try {
             List<ProPlanInfoVo> results = service.getProPlanPage(o);
+            final int[] num = {1};
             results.forEach(vo->{
+                vo.setXh(num[0]);
+                num[0]++;
                 if("0".equals(vo.getStatus())){
                     vo.setStatusName("未发货");
                 }else   if("1".equals(vo.getStatus())){
@@ -114,10 +117,10 @@ public class ExportController {
                     vo.setStatusName("全部发货");
                 }
                 vo.setProgress(vo.getProgress()+"%");
-            });
 
+            });
             ExportParams exportParams = new ExportParams("发货统计", "发货统计", ExcelType.XSSF);
-            Workbook workbook = ExcelExportUtil.exportExcel(exportParams, PlanApplyBean.class, results);
+            Workbook workbook = ExcelExportUtil.exportExcel(exportParams, ProPlanInfoVo.class, results);
             response.setContentType("application/vnd.ms-excel");
             response.setHeader("content-disposition", "attachment;fileName=" + URLEncoder.encode("发货统计" + ".xlsx", "UTF-8"));
             ServletOutputStream outputStream = response.getOutputStream();
diff --git a/src/main/java/com/bonus/gzgqj/business/plan/entity/ProPlanInfoVo.java b/src/main/java/com/bonus/gzgqj/business/plan/entity/ProPlanInfoVo.java
index 6ca97c1..b25ac52 100644
--- a/src/main/java/com/bonus/gzgqj/business/plan/entity/ProPlanInfoVo.java
+++ b/src/main/java/com/bonus/gzgqj/business/plan/entity/ProPlanInfoVo.java
@@ -11,6 +11,8 @@ public class ProPlanInfoVo extends PageInfo {
          * 工程id
          */
         @Excel(name = "序号", width = 10.0, orderNum = "0")
+        private int xh;
+
         private String proId;
         /**
          * 工程名称
@@ -20,7 +22,7 @@ public class ProPlanInfoVo extends PageInfo {
         /**
          * 计划 量
          */
-        @Excel(name = "需求计划数量", width = 10.0,height = 20.0, orderNum = "3")
+        @Excel(name = "需求计划数量", width = 30.0,height = 20.0, orderNum = "3")
         private int planNum;
         /**
          * 出库单量
@@ -39,7 +41,7 @@ public class ProPlanInfoVo extends PageInfo {
         /**
          * 最后发货时间
          */
-        @Excel(name = "最后发货时间", width = 10.0,height = 20.0, orderNum = "6")
+        @Excel(name = "最后发货时间", width = 15.0,height = 20.0, orderNum = "6")
         private String lastDay;
 
         /**