Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/common/utils/excel/ExportExcel.java

@@ -189,7 +189,7 @@ public class ExportExcel {
 	 * @param headerList 表头列表
 	 */
 	private void initialize(String title, List<String> headerList) {
-		this.wb = new SXSSFWorkbook(700);
+		this.wb = new SXSSFWorkbook();
 		this.sheet = wb.createSheet("Export");
 		this.styles = createStyles(wb);
 		// Create title
@@ -220,18 +220,18 @@ public class ExportExcel {
 //		sheet.addMergedRegion(new CellRangeAddress(0, 1, 9, 9));
 //		sheet.addMergedRegion(new CellRangeAddress(0, 1, 10, 10));
 //		sheet.addMergedRegion(new CellRangeAddress(0, 1, 11, 11));
-		sheet.setColumnWidth(0, 2000);
-		sheet.setColumnWidth(1, 3000);
-		sheet.setColumnWidth(2, 2000);
-		sheet.setColumnWidth(3, 12000);
-		sheet.setColumnWidth(4, 2000);
-		sheet.setColumnWidth(5, 2000);
-		sheet.setColumnWidth(6, 2000);
-		sheet.setColumnWidth(7, 2000);
-		sheet.setColumnWidth(8, 3000);
-		sheet.setColumnWidth(9, 3000);
-		sheet.setColumnWidth(10, 3000);
-		sheet.setColumnWidth(11, 3000);
+//		sheet.setColumnWidth(0, 1000);
+//		sheet.setColumnWidth(1, 3000);
+//		sheet.setColumnWidth(2, 2000);
+//		sheet.setColumnWidth(3, 12000);
+//		sheet.setColumnWidth(4, 2000);
+//		sheet.setColumnWidth(5, 2000);
+//		sheet.setColumnWidth(6, 2000);
+//		sheet.setColumnWidth(7, 2000);
+//		sheet.setColumnWidth(8, 3000);
+//		sheet.setColumnWidth(9, 3000);
+//		sheet.setColumnWidth(10, 3000);
+//		sheet.setColumnWidth(11, 3000);
 		Cell tempCell1 = headerRow.createCell(4);
 		tempCell1.setCellValue("建筑工程费");
 		tempCell1.setCellStyle(styles.get("header"));
@@ -257,6 +257,18 @@ public class ExportExcel {
 			int colWidth = sheet.getColumnWidth(i)*2;
 	        sheet.setColumnWidth(i, colWidth < 3000 ? 3000 : colWidth);
 		}
+		sheet.setColumnWidth(0, 2000);
+		sheet.setColumnWidth(1, 5000);
+		sheet.setColumnWidth(2, 3000);
+		sheet.setColumnWidth(3, 18000);
+		sheet.setColumnWidth(4, 3000);
+		sheet.setColumnWidth(5, 3000);
+		sheet.setColumnWidth(6, 3000);
+		sheet.setColumnWidth(7, 3000);
+		sheet.setColumnWidth(8, 3000);
+		sheet.setColumnWidth(9, 3000);
+		sheet.setColumnWidth(10, 3000);
+		sheet.setColumnWidth(11, 3000);
 //		sheet.addMergedRegion(new CellRangeAddress(0, 1, 0, 0));
 //		sheet.addMergedRegion(new CellRangeAddress(1, 0, 1, 1));
 //		sheet.addMergedRegion(new CellRangeAddress(1, 0, 2, 2));

src/main/java/com/jeeplus/modules/sg/project/util/ExportUtil.java

@@ -209,18 +209,18 @@ public class ExportUtil {
 //		sheet.addMergedRegion(new CellRangeAddress(0, 1, 9, 9));
 //		sheet.addMergedRegion(new CellRangeAddress(0, 1, 10, 10));
 //		sheet.addMergedRegion(new CellRangeAddress(0, 1, 11, 11));
-		sheet.setColumnWidth(0, 2000);
-		sheet.setColumnWidth(1, 3000);
-		sheet.setColumnWidth(2, 2000);
-		sheet.setColumnWidth(3, 12000);
-		sheet.setColumnWidth(4, 2000);
-		sheet.setColumnWidth(5, 2000);
-		sheet.setColumnWidth(6, 2000);
-		sheet.setColumnWidth(7, 2000);
-		sheet.setColumnWidth(8, 3000);
-		sheet.setColumnWidth(9, 3000);
-		sheet.setColumnWidth(10, 3000);
-		sheet.setColumnWidth(11, 3000);
+//		sheet.setColumnWidth(0, 2000);
+//		sheet.setColumnWidth(1, 3000);
+//		sheet.setColumnWidth(2, 2000);
+//		sheet.setColumnWidth(3, 12000);
+//		sheet.setColumnWidth(4, 2000);
+//		sheet.setColumnWidth(5, 2000);
+//		sheet.setColumnWidth(6, 2000);
+//		sheet.setColumnWidth(7, 2000);
+//		sheet.setColumnWidth(8, 3000);
+//		sheet.setColumnWidth(9, 3000);
+//		sheet.setColumnWidth(10, 3000);
+//		sheet.setColumnWidth(11, 3000);
 		Cell tempCell1 = headerRow.createCell(4);
 		tempCell1.setCellValue("建筑工程费");
 		tempCell1.setCellStyle(styles.get("header"));
@@ -246,6 +246,18 @@ public class ExportUtil {
 			int colWidth = sheet.getColumnWidth(i)*2;
 	        sheet.setColumnWidth(i, colWidth < 3000 ? 3000 : colWidth);
 		}
+		sheet.setColumnWidth(0, 2000);
+		sheet.setColumnWidth(1, 5000);
+		sheet.setColumnWidth(2, 3000);
+		sheet.setColumnWidth(3, 18000);
+		sheet.setColumnWidth(4, 3000);
+		sheet.setColumnWidth(5, 3000);
+		sheet.setColumnWidth(6, 3000);
+		sheet.setColumnWidth(7, 3000);
+		sheet.setColumnWidth(8, 3000);
+		sheet.setColumnWidth(9, 3000);
+		sheet.setColumnWidth(10, 3000);
+		sheet.setColumnWidth(11, 3000);
 //		sheet.addMergedRegion(new CellRangeAddress(0, 1, 0, 0));
 //		sheet.addMergedRegion(new CellRangeAddress(1, 0, 1, 1));
 //		sheet.addMergedRegion(new CellRangeAddress(1, 0, 2, 2));
@@ -286,18 +298,18 @@ public class ExportUtil {
 //		sheet.addMergedRegion(new CellRangeAddress(0, 1, 9, 9));
 //		sheet.addMergedRegion(new CellRangeAddress(0, 1, 10, 10));
 //		sheet.addMergedRegion(new CellRangeAddress(0, 1, 11, 11));
-			sheet.setColumnWidth(0, 4000);
-			sheet.setColumnWidth(1, 6000);
-			sheet.setColumnWidth(2, 4000);
-			sheet.setColumnWidth(3, 24000);
-			sheet.setColumnWidth(4, 4000);
-			sheet.setColumnWidth(5, 4000);
-			sheet.setColumnWidth(6, 4000);
-			sheet.setColumnWidth(7, 4000);
-			sheet.setColumnWidth(8, 6000);
-			sheet.setColumnWidth(9, 6000);
-			sheet.setColumnWidth(10, 6000);
-			sheet.setColumnWidth(11, 6000);
+//			sheet.setColumnWidth(0, 4000);
+//			sheet.setColumnWidth(1, 6000);
+//			sheet.setColumnWidth(2, 4000);
+//			sheet.setColumnWidth(3, 24000);
+//			sheet.setColumnWidth(4, 4000);
+//			sheet.setColumnWidth(5, 4000);
+//			sheet.setColumnWidth(6, 4000);
+//			sheet.setColumnWidth(7, 4000);
+//			sheet.setColumnWidth(8, 6000);
+//			sheet.setColumnWidth(9, 6000);
+//			sheet.setColumnWidth(10, 6000);
+//			sheet.setColumnWidth(11, 6000);
 			Cell tempCell1 = headerRow.createCell(4);
 			tempCell1.setCellValue("建筑工程费");
 			tempCell1.setCellStyle(styles.get("header"));
@@ -323,6 +335,18 @@ public class ExportUtil {
 				int colWidth = sheet.getColumnWidth(i) * 2;
 				sheet.setColumnWidth(i, colWidth < 3000 ? 3000 : colWidth);
 			}
+			sheet.setColumnWidth(0, 2000);
+			sheet.setColumnWidth(1, 5000);
+			sheet.setColumnWidth(2, 3000);
+			sheet.setColumnWidth(3, 18000);
+			sheet.setColumnWidth(4, 3000);
+			sheet.setColumnWidth(5, 3000);
+			sheet.setColumnWidth(6, 3000);
+			sheet.setColumnWidth(7, 3000);
+			sheet.setColumnWidth(8, 3000);
+			sheet.setColumnWidth(9, 3000);
+			sheet.setColumnWidth(10, 3000);
+			sheet.setColumnWidth(11, 3000);
 //		sheet.addMergedRegion(new CellRangeAddress(0, 1, 0, 0));
 //		sheet.addMergedRegion(new CellRangeAddress(1, 0, 1, 1));
 //		sheet.addMergedRegion(new CellRangeAddress(1, 0, 2, 2));