git-svn-id: https://192.168.57.71/svn/jsgkj@699 931142cf-59ea-a443-aa0e-51397b428577

gkjsjy/jsjy/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/service/impl/GkjyrServiceImpl.java

@@ -1067,7 +1067,6 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 				
 				cell = bodyRow3.createCell(6);
 				cell.setCellStyle(bodyStyle1);
-				//cell.setCellValue(voList.getJyfw());
 				
 				CellRangeAddress region3 = new CellRangeAddress(3,3,1,6);
 				jyrSheet.addMergedRegion(region3);
@@ -1193,7 +1192,7 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 				jyrSheet.addMergedRegion(region71);
 				
 				
-				XSSFRow bodyRow8 = jyrSheet.createRow(8);
+			XSSFRow bodyRow8 = jyrSheet.createRow(8);
 				cell = bodyRow8.createCell(0);
 				cell.setCellStyle(bodyStyle);
 				cell.setCellValue("从业人员数量");
@@ -1221,10 +1220,7 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 				cell.setCellStyle(bodyStyle1);
 				cell.setCellValue(voList.getXcglpxrysl());
 				
-				//CellRangeAddress region8 = new CellRangeAddress(8,8,1,2);
-				//jyrSheet.addMergedRegion(region8);
-				
-				XSSFRow bodyRow9 = jyrSheet.createRow(9);
+			XSSFRow bodyRow9 = jyrSheet.createRow(9);
 				cell = bodyRow9.createCell(0);
 				cell.setCellStyle(bodyStyle);
 				
@@ -1252,10 +1248,7 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 				cell.setCellStyle(bodyStyle1);
 				cell.setCellValue(voList.getZyjspxrysl());
 				
-				//CellRangeAddress region9 = new CellRangeAddress(9,9,1,2);
-				//jyrSheet.addMergedRegion(region9);
-				
-				XSSFRow bodyRow10 = jyrSheet.createRow(10);
+			XSSFRow bodyRow10 = jyrSheet.createRow(10);
 				cell = bodyRow10.createCell(0);
 				cell.setCellStyle(bodyStyle);
 				
@@ -1283,9 +1276,6 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 				cell.setCellStyle(bodyStyle1);
 				cell.setCellValue(voList.getXczyrypxsl());
 				
-				//CellRangeAddress region10 = new CellRangeAddress(10,10,1,2);
-				//jyrSheet.addMergedRegion(region10);
-				
 				CellRangeAddress region89101 = new CellRangeAddress(8,10,0,0);
 				jyrSheet.addMergedRegion(region89101);
 				CellRangeAddress region89102 = new CellRangeAddress(8,10,1,2);
@@ -1387,7 +1377,7 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 				CellRangeAddress region13 = new CellRangeAddress(13,13,1,2);
 				jyrSheet.addMergedRegion(region13);
 				
-				XSSFRow bodyRow14 = jyrSheet.createRow(14);
+			XSSFRow bodyRow14 = jyrSheet.createRow(14);
 				cell = bodyRow14.createCell(0);
 				cell.setCellStyle(bodyStyle);
 				cell.setCellValue("最大靠泊能力（万吨）");
@@ -1417,7 +1407,7 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 				CellRangeAddress region141 = new CellRangeAddress(14,14,4,5);
 				jyrSheet.addMergedRegion(region141);
 			
-				XSSFRow bodyRow15 = jyrSheet.createRow(15);	
+			XSSFRow bodyRow15 = jyrSheet.createRow(15);	
 				cell = bodyRow15.createCell(0);
 				cell.setCellStyle(bodyStyle);
 				cell.setCellValue("码头结构形式");
@@ -1448,7 +1438,7 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 				CellRangeAddress region15 = new CellRangeAddress(15,15,1,2);
 				jyrSheet.addMergedRegion(region15);
 				
-				XSSFRow bodyRow16 = jyrSheet.createRow(16);	
+			XSSFRow bodyRow16 = jyrSheet.createRow(16);	
 				cell = bodyRow16.createCell(0);
 				cell.setCellStyle(bodyStyle);
 				cell.setCellValue("设计年通过能力（万吨）");
@@ -1478,7 +1468,7 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 				CellRangeAddress region161 = new CellRangeAddress(16,16,4,5);
 				jyrSheet.addMergedRegion(region161);
 				
-				XSSFRow bodyRow17 = jyrSheet.createRow(17);
+			XSSFRow bodyRow17 = jyrSheet.createRow(17);
 				cell = bodyRow17.createCell(0);
 				cell.setCellStyle(bodyStyle);
 				cell.setCellValue("上年度总吞吐量（万吨）");
@@ -1495,7 +1485,6 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 				
 				cell = bodyRow17.createCell(4);
 				cell.setCellStyle(bodyStyle);
-				//cell.setCellValue("其中外贸吞吐量（万吨）");
 				cell.setCellValue("其中集装箱（万吨）");
 				
 				cell = bodyRow17.createCell(5);
@@ -1503,7 +1492,6 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 				
 				cell = bodyRow17.createCell(6);
 				cell.setCellStyle(bodyStyle1);
-				//cell.setCellValue(voList.getSndwmttl());
 				cell.setCellValue(voList.getSndzjzx());
 				
 				CellRangeAddress region17 = new CellRangeAddress(17,17,1,3);
@@ -1511,10 +1499,9 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 				CellRangeAddress region171 = new CellRangeAddress(17,17,4,5);
 				jyrSheet.addMergedRegion(region171);
 				
-				XSSFRow bodyRow171 = jyrSheet.createRow(18);
+			XSSFRow bodyRow171 = jyrSheet.createRow(18);
 				cell = bodyRow171.createCell(0);
 				cell.setCellStyle(bodyStyle);
-				//cell.setCellValue("上年度总吞吐量（万吨）");
 				cell.setCellValue("其中外贸吞吐量（万吨）");
 				
 				cell = bodyRow171.createCell(1);
@@ -1530,7 +1517,6 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 				
 				cell = bodyRow171.createCell(4);
 				cell.setCellStyle(bodyStyle);
-				//cell.setCellValue("其中外贸吞吐量（万吨）");
 				cell.setCellValue("其中集装箱（万吨）");
 				
 				cell = bodyRow171.createCell(5);
@@ -1538,7 +1524,6 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 				
 				cell = bodyRow171.createCell(6);
 				cell.setCellStyle(bodyStyle1);
-				//cell.setCellValue(voList.getSndwmttl());
 				cell.setCellValue(voList.getSndwmjzx());
 				
 				CellRangeAddress region1711 = new CellRangeAddress(18,18,1,3);
@@ -1546,7 +1531,7 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 				CellRangeAddress region1712 = new CellRangeAddress(18,18,4,5);
 				jyrSheet.addMergedRegion(region1712);
 				
-				XSSFRow bodyRow18 = jyrSheet.createRow(19);
+			XSSFRow bodyRow18 = jyrSheet.createRow(19);
 				cell = bodyRow18.createCell(0);
 				cell.setCellStyle(bodyStyle);
 				cell.setCellValue("陆域总面积（平米）");
@@ -1576,7 +1561,7 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 				CellRangeAddress region18 = new CellRangeAddress(19,19,1,2);
 				jyrSheet.addMergedRegion(region18);
 				
-				XSSFRow bodyRow19 = jyrSheet.createRow(20);
+			XSSFRow bodyRow19 = jyrSheet.createRow(20);
 				cell = bodyRow19.createCell(0);
 				cell.setCellStyle(bodyStyle);
 				cell.setCellValue("装卸设备总数量（台）");
@@ -1604,10 +1589,7 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 				cell.setCellStyle(bodyStyle1);
 				cell.setCellValue(voList.getLtqzjgs());
 				
-				//CellRangeAddress region19 = new CellRangeAddress(19,19,1,2);
-				//jyrSheet.addMergedRegion(region19);
-				
-				XSSFRow bodyRow20 = jyrSheet.createRow(21);
+			XSSFRow bodyRow20 = jyrSheet.createRow(21);
 				cell = bodyRow20.createCell(0);
 				cell.setCellStyle(bodyStyle);
 				
@@ -1635,10 +1617,7 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 				cell.setCellStyle(bodyStyle1);
 				cell.setCellValue(voList.getQcqzjgs());
 				
-				//CellRangeAddress region20 = new CellRangeAddress(20,20,1,2);
-				//jyrSheet.addMergedRegion(region20);
-				
-				XSSFRow bodyRow21 = jyrSheet.createRow(22);
+			XSSFRow bodyRow21 = jyrSheet.createRow(22);
 				cell = bodyRow21.createCell(0);
 				cell.setCellStyle(bodyStyle);
 				
@@ -1666,17 +1645,13 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 				cell.setCellStyle(bodyStyle1);
 				cell.setCellValue(voList.getQtjxgs());
 				
-				//CellRangeAddress region21 = new CellRangeAddress(21,21,1,2);
-				//jyrSheet.addMergedRegion(region21);
-				
 				CellRangeAddress region1920211 = new CellRangeAddress(20,22,0,0);
 				jyrSheet.addMergedRegion(region1920211);
 				CellRangeAddress region1920212 = new CellRangeAddress(20,22,1,2);
 				jyrSheet.addMergedRegion(region1920212);
 				
 				
-				
-				XSSFRow bodyRow22 = jyrSheet.createRow(23);	
+			XSSFRow bodyRow22 = jyrSheet.createRow(23);	
 				cell = bodyRow22.createCell(0);
 				cell.setCellStyle(bodyStyle);
 				cell.setCellValue("港作船舶（艘）");
@@ -1707,7 +1682,7 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 				CellRangeAddress region221 = new CellRangeAddress(23,23,4,5);
 				jyrSheet.addMergedRegion(region221);
 				
-				XSSFRow bodyRow23 = jyrSheet.createRow(24);	
+			XSSFRow bodyRow23 = jyrSheet.createRow(24);	
 				cell = bodyRow23.createCell(0);
 				cell.setCellStyle(bodyStyle);
 				cell.setCellValue("工艺管线长度（米）");
@@ -1739,7 +1714,7 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 				CellRangeAddress region232 = new CellRangeAddress(24,24,5,6);
 				jyrSheet.addMergedRegion(region232);
 				
-				XSSFRow bodyRow24 = jyrSheet.createRow(25);
+			XSSFRow bodyRow24 = jyrSheet.createRow(25);
 				cell = bodyRow24.createCell(0);
 				cell.setCellStyle(bodyStyle);
 				cell.setCellValue("储罐数量(个)");