From 87663d3f4bfa48e0ff50ade902aa027faf130344 Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Wed, 2 Jul 2025 14:31:27 +0800 Subject: [PATCH] =?UTF-8?q?refactor(sip):=20=E8=B0=83=E6=95=B4=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E9=80=BB=E8=BE=91-=20=E4=BF=AE=E6=94=B9=E5=88=97=E5=AE=BD?= =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94=E9=80=BB=E8=BE=91=EF=BC=8C=E5=B0=86?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E5=88=97=E8=8C=83=E5=9B=B4=E4=BB=8E=2035=20?= =?UTF-8?q?=E5=88=97=E8=B0=83=E6=95=B4=E4=B8=BA=2033=E5=88=97=20-=20?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=83=A8=E5=88=86=E8=BD=AF=E4=BB=B6=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E7=9B=B8=E5=85=B3=E5=88=97=E5=A4=B4=EF=BC=8C=E5=8C=85?= =?UTF-8?q?=E6=8B=AC=20WS=E7=98=A6=E6=8E=88=E6=9D=83=E3=80=81WS=20?= =?UTF-8?q?=E8=83=96=E6=8E=88=E6=9D=83=E5=92=8C=20LS=20=E8=BD=AF=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E7=9A=84=E6=95=B0=E9=87=8F=E5=92=8C=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E5=88=97=20-=20=E6=96=B0=E5=A2=9E=E8=BD=AF=E4=BB=B6=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E7=9B=B8=E5=85=B3=E5=88=97=E5=A4=B4=EF=BC=8C=E5=8C=85?= =?UTF-8?q?=E6=8B=AC=20WS=20=E7=98=A6=E6=8E=88=E6=9D=83=E3=80=81WS?= =?UTF-8?q?=E8=83=96=E6=8E=88=E6=9D=83=E5=92=8C=20LS=20=E8=BD=AF=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E9=87=8F=E5=92=8C=E9=87=91=E9=A2=9D=E5=88=97?= =?UTF-8?q?=EF=BC=8C=E4=BD=86=E6=8C=87=E5=AE=9A=E4=BA=86=E5=85=B7=E4=BD=93?= =?UTF-8?q?=E5=9E=8B=E5=8F=B7=20-=20=E8=B0=83=E6=95=B4=E8=BD=AF=E4=BB=B6?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=95=B0=E6=8D=AE=E5=9C=A8=E8=A1=8C=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=8F=92=E5=85=A5=E4=BD=8D=E7=BD=AE=EF=BC=8C=E4=BB=8E?= =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E7=9A=84=E5=9B=BA=E5=AE=9A=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=A0=B9=E6=8D=AE=E8=A1=8C=E7=B4=A2=E5=BC=95?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=8F=92=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectOrderInfoServiceImpl.java | 45 ++++++++++--------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java index bbfeff44..707d5bfe 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java @@ -429,7 +429,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService { int columnIndex = cell.getColumnIndex(); Sheet sheet = writeSheetHolder.getSheet(); // 基础列范围（前 25 列） - if (columnIndex >= 0 && columnIndex <= 35) { + if (columnIndex >= 0 && columnIndex <= 33) { // 自适应列宽逻辑 sheet.setColumnWidth(columnIndex, 256 * 30); // 设置固定宽度为 20 个字符 } @@ -458,20 +458,6 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService { headerList.add(Collections.singletonList("汇智责任人")); headerList.add(Collections.singletonList("下单通路")); headerList.add(Collections.singletonList("最终客户")); - headerList.add(Collections.singletonList("WS瘦授权软件数量")); - headerList.add(Collections.singletonList("WS瘦授权软件金额")); - headerList.add(Collections.singletonList("WS胖授权软件数量")); - headerList.add(Collections.singletonList("WS胖授权软件金额")); - headerList.add(Collections.singletonList("LS软件数量")); - headerList.add(Collections.singletonList("LS软件金额")); - addHeadList(maxOne, headerList, "ONEstor"); - addHeadList(maxNvidia, headerList, "nVIDIA"); -// headerList.add(Collections.singletonList("ONEstor数量")); -// headerList.add(Collections.singletonList("ONEstor金额")); -// headerList.add(Collections.singletonList("nVIDIA授权数量")); -// headerList.add(Collections.singletonList("nVIDIA授权金额")); - - headerList.add(Collections.singletonList("BG")); headerList.add(Collections.singletonList("行业")); @@ -498,6 +484,21 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService { headerList.add(Collections.singletonList("联系方式")); // headerList.add(Collections.singletonList("其他特别说明")); // headerList.add(Collections.singletonList("订单状态")); + headerList.add(Collections.singletonList("WS瘦授权软件数量-3130A6LC")); + headerList.add(Collections.singletonList("WS瘦授权软件金额")); + headerList.add(Collections.singletonList("WS胖授权软件数量-3130A6LE")); + headerList.add(Collections.singletonList("WS胖授权软件金额")); + headerList.add(Collections.singletonList("LS软件数量-3130A6LD")); + headerList.add(Collections.singletonList("LS软件金额")); + addHeadList(maxOne, headerList, "ONEstor"); + addHeadList(maxNvidia, headerList, "nVIDIA"); +// headerList.add(Collections.singletonList("ONEstor数量")); +// headerList.add(Collections.singletonList("ONEstor金额")); +// headerList.add(Collections.singletonList("nVIDIA授权数量")); +// headerList.add(Collections.singletonList("nVIDIA授权金额")); + + + // 添加软件产品列 @@ -622,13 +623,13 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService { totalPrice = processProducts(deployList, maxDeployService, row, totalPrice); //添加维保 totalPrice = processProducts(maintenanceList, maxMaintenanceService, row, totalPrice); - row.add(8, wssDto.getQuantity().toString()); - row.add(9, wssDto.getAllPrice().toString()); - row.add(10, wspDto.getQuantity().toString()); - row.add(11, wspDto.getAllPrice().toString()); - row.add(12, lsDto.getQuantity().toString()); - row.add(13, lsDto.getAllPrice().toString()); - int insertIndex=14; + int insertIndex=17; + row.add(insertIndex++, wssDto.getQuantity().toString()); + row.add(insertIndex++, wssDto.getAllPrice().toString()); + row.add(insertIndex++, wspDto.getQuantity().toString()); + row.add(insertIndex++, wspDto.getAllPrice().toString()); + row.add(insertIndex++, lsDto.getQuantity().toString()); + row.add(insertIndex++, lsDto.getAllPrice().toString()); for (int i = 0; i < maxOne; i++) { ProjectProductInfo projectProductInfo = i < oneList.size() ? oneList.get(i) : null; insertIndex = addProductRowByIndex(projectProductInfo, row, insertIndex);