'commit'

src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java

@@ -164,17 +164,23 @@ public class A1 {
 
                 // 修正乡村招生C 修正县城外招生-修正县城外招生*30%
                 for (List<String> stringList : dataList) {
-                    //年份
+                    try {
-                    int year = Integer.parseInt(stringList.getFirst());
+                        //年份
-                    //G:6修正乡村招生G
+                        int year = Integer.parseInt(stringList.getFirst());
-                    int v = Integer.parseInt(stringList.get(ExcelKit.transLetter2Num("G")).split("\\.")[0]);
+                        //G:6修正乡村招生G
-                    if (colsCount == 9) {
+                        String q = stringList.get(ExcelKit.transLetter2Num("G"));
-                        v = Integer.parseInt(stringList.get(ExcelKit.transLetter2Num("F")).split("\\.")[0]);
+                        if (StrKit.isBlank(q)) q = "0";
-                        int d = (int) (v * 0.3);//乘以0.3
+                        int v = Integer.parseInt(q.split("\\.")[0]);
-                        v = v - d;//剩下70%
+                        if (colsCount == 9) {
+                            v = Integer.parseInt(stringList.get(ExcelKit.transLetter2Num("F")).split("\\.")[0]);
+                            int d = (int) (v * 0.3);//乘以0.3
+                            v = v - d;//剩下70%
+                        }
+                        Row outRow = outSheet.createRow(++rowIndex);
+                        ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year), "", "乡村", "", String.valueOf(v), areaName, cityName), dataStyle);
+                    } catch (Exception err) {
+
                     }
-                    Row outRow = outSheet.createRow(++rowIndex);
-                    ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year), "", "乡村", "", String.valueOf(v), areaName, cityName), dataStyle);
                 }
             }
         }