'commit'

src/main/java/com/dsideal/base/Tools/FillData/City/C3.java

@@ -93,10 +93,10 @@ public class C3 {
                     //1号模板，数据在图表(7,30),(9,32)
                     for (int q = 0; q < listNode.size(); q++) {
                         int firstChartNumber = listNode.get(q).getFirst(), secondChartNumber = listNode.get(q).getSecond();
-                        String stageName=listNode.get(q).getStageName();
+                        String stageName = listNode.get(q).getStageName();
 
-                        List<List<String>> source1 = ExcelKit.getChartData(file.getAbsolutePath(), firstChartNumber-1, 1, 10);
-                        List<List<String>> source2 =  ExcelKit.getChartData(file.getAbsolutePath(), secondChartNumber-1, 1, 10);
+                        List<List<String>> source1 = ExcelKit.getChartData(file.getAbsolutePath(), firstChartNumber - 1, 1, 10);
+                        List<List<String>> source2 = ExcelKit.getChartData(file.getAbsolutePath(), secondChartNumber - 1, 1, 10);
 
                         String c2 = "总招生数";
                         //遍历source1
@@ -139,7 +139,7 @@ public class C3 {
                                 Row outRow = outSheet.createRow(++rowIndex);
                                 //年份,总量分类,区域分类,总量数值,区域数值,行政区划,上级行政区划
                                 ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList(r.getFirst(), areaName, "",
-                                        stageName, "", r.get(k + 1), cityName, "云南省")), dataStyle);
+                                        stageName, r.get(k + 1), "", cityName, "云南省")), dataStyle);
                             }
                             for (int i = 0; i < source2.size(); i++) {
                                 if (i == 0) continue;
@@ -147,7 +147,7 @@ public class C3 {
                                 Row outRow = outSheet.createRow(++rowIndex);
                                 //年份,总量分类,区域分类,总量数值,区域数值,行政区划,上级行政区划
                                 ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList(r.getFirst(), areaName, "",
-                                        stageName, "", r.get(k + 1), cityName, "云南省")), dataStyle);
+                                        stageName, r.get(k + 1), "", cityName, "云南省")), dataStyle);
                             }
                         }
                     }

src/main/java/com/dsideal/base/Tools/FillData/City/C4.java

@@ -137,7 +137,7 @@ public class C4 {
                                 Row outRow = outSheet.createRow(++rowIndex);
                                 //年份,总量分类,区域分类,总量数值,区域数值,行政区划,上级行政区划
                                 ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList(r.getFirst(), areaName, "",
-                                        stageName, "", r.get(k + 1), cityName, "云南省")), dataStyle);
+                                        stageName, r.get(k + 1),"",  cityName, "云南省")), dataStyle);
                             }
                             for (int i = 0; i < source2.size(); i++) {
                                 if (i == 0) continue;
@@ -145,7 +145,7 @@ public class C4 {
                                 Row outRow = outSheet.createRow(++rowIndex);
                                 //年份,总量分类,区域分类,总量数值,区域数值,行政区划,上级行政区划
                                 ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList(r.getFirst(), areaName, "",
-                                        stageName, "", r.get(k + 1), cityName, "云南省")), dataStyle);
+                                        stageName,  r.get(k + 1),"", cityName, "云南省")), dataStyle);
                             }
                         }
                     }