From b8956e97ad7e40240dcf9015f82b323eb3f2e193 Mon Sep 17 00:00:00 2001
From: chenshaoxin <1981897232@qq.com>
Date: Wed, 20 Nov 2024 13:45:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=99=88=E7=BB=8D=E9=91=AB?=
 =?UTF-8?q?=20=E6=97=B6=E9=97=B4=EF=BC=9A2024/11/19=20=2017=EF=BC=9A00=20?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=EF=BC=9A=E6=88=90=E6=9C=AC=E6=B5=8B=E7=AE=97?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../formplugin/RecosMeasurecosFormPlugin.java | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/main/java/shkd/repc/recos/formplugin/RecosMeasurecosFormPlugin.java b/main/java/shkd/repc/recos/formplugin/RecosMeasurecosFormPlugin.java
index 912cf7f..2f7956b 100644
--- a/main/java/shkd/repc/recos/formplugin/RecosMeasurecosFormPlugin.java
+++ b/main/java/shkd/repc/recos/formplugin/RecosMeasurecosFormPlugin.java
@@ -195,17 +195,11 @@ public class RecosMeasurecosFormPlugin extends AbstractFormPlugin implements Upl
             billFont.setFontName("黑体");
             billFont.setFontHeight(15);
             billStyle.setFont(billFont);
+
             //写入单据列表数据
             for (int i = 0; i < excel.size(); i++) {
                 // i+1是因为前面第1行加了一个标题，单据列表数据是从Excel的第2行开始的，所以要+1
                 XSSFRow nrow = sheet.createRow(i+1);
-//                if (i==0){
-//                    XSSFCellStyle style = workbook.createCellStyle();
-//                    style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-//                    XSSFColor grayColor = new XSSFColor(new java.awt.Color(128, 128, 128), new DefaultIndexedColorMap());
-//                    style.setFillForegroundColor(grayColor);
-//                    nrow.setRowStyle(style);
-//                }
                 for (int u=0;u<excel.get(i).size();u++){
                     XSSFCell ncell = nrow.createCell(u);
                     ncell.setCellStyle(billStyle);
@@ -332,7 +326,7 @@ public class RecosMeasurecosFormPlugin extends AbstractFormPlugin implements Upl
                                         row.getCell(13).getNumericCellValue(),//单价
                                         row.getCell(11).getNumericCellValue(),//工程量
                                         row.getCell(9).getStringCellValue(),//估算口径
-                                        row.getCell(15).getStringCellValue()//备注
+                                        String.valueOf(getcellvallue(row.getCell(15)))//备注
                                 );
                                 arrayList.add(calculation);
                             }
@@ -466,4 +460,14 @@ public class RecosMeasurecosFormPlugin extends AbstractFormPlugin implements Upl
         String targetFormId = view.getPageCache().get(tabKey);
         return StringUtils.isEmpty(targetFormId) ? null : view.getView(targetFormId);
     }
+
+    public Object  getcellvallue(Cell cell) {
+        if (cell.getCellType() == CellType.STRING) {
+            String Stringvalue = cell.getStringCellValue();
+            return Stringvalue;
+        }else {
+            double numericCellValue = cell.getNumericCellValue();
+            return numericCellValue;
+        }
+    }
 }