|
|
|
@ -80,7 +80,7 @@ public class A1 {
|
|
|
|
|
if (flag) continue;
|
|
|
|
|
//只关心发展规模数据的表格
|
|
|
|
|
if (!file.getName().contains(fileNameKey)) continue;
|
|
|
|
|
//县区名称
|
|
|
|
|
//县区名称
|
|
|
|
|
String areaName = ru.getAreaName(file.getName());
|
|
|
|
|
//市州名称
|
|
|
|
|
String cityName = ru.getCityNameByAreaName(areaName);
|
|
|
|
@ -132,7 +132,16 @@ public class A1 {
|
|
|
|
|
//年份
|
|
|
|
|
int year = Integer.parseInt(stringList.getFirst());
|
|
|
|
|
//E:修正城区招生A 修正县城内招生
|
|
|
|
|
int v = Integer.parseInt(stringList.get(ExcelKit.transLetter2Num("E")).split("\\.")[0]);
|
|
|
|
|
String q = "0";
|
|
|
|
|
int v = 0;
|
|
|
|
|
if (!StrKit.isBlank(q)) {
|
|
|
|
|
try {
|
|
|
|
|
q = stringList.get(ExcelKit.transLetter2Num("E")).split("\\.")[0];
|
|
|
|
|
v = Integer.parseInt(q);
|
|
|
|
|
} catch (Exception err) {
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
Row outRow = outSheet.createRow(++rowIndex);
|
|
|
|
|
ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year),
|
|
|
|
|
"", "城区", "", String.valueOf(v), areaName, cityName), dataStyle);
|
|
|
|
@ -143,7 +152,9 @@ public class A1 {
|
|
|
|
|
//年份
|
|
|
|
|
int year = Integer.parseInt(stringList.getFirst());
|
|
|
|
|
//F:修正镇区招生B 修正县城内招生
|
|
|
|
|
int v = Integer.parseInt(stringList.get(ExcelKit.transLetter2Num("F")).split("\\.")[0]);
|
|
|
|
|
String q = stringList.get(ExcelKit.transLetter2Num("F"));
|
|
|
|
|
if (StrKit.isBlank(q)) q = "0";
|
|
|
|
|
int v = Integer.parseInt(q.split("\\.")[0]);
|
|
|
|
|
if (colsCount == 9) {
|
|
|
|
|
v = (int) (v * 0.3);//乘以0.3
|
|
|
|
|
}
|
|
|
|
|