diff --git a/Doc/待处理/市/【7】概览/概览.xlsx b/Doc/待处理/市/【7】概览/概览.xlsx index d784f83d..dee2c5c7 100644 Binary files a/Doc/待处理/市/【7】概览/概览.xlsx and b/Doc/待处理/市/【7】概览/概览.xlsx differ diff --git a/Doc/待处理/市/【7】概览/概览【成果】.xlsx b/Doc/待处理/市/【7】概览/概览【成果】.xlsx index 4a7b49eb..42787eeb 100644 Binary files a/Doc/待处理/市/【7】概览/概览【成果】.xlsx and b/Doc/待处理/市/【7】概览/概览【成果】.xlsx differ diff --git a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java index 76bef68e..2f0c88d3 100644 --- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java +++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java @@ -770,7 +770,7 @@ public class DataEaseModel { //第一行是表头 String colName = listExcelRow.getFirst().getData().get(j); - if (StrKit.isBlank(value.trim()) && (colName.contains("数值") || colName.contains("万人"))) { + if (StrKit.isBlank(value.trim()) || colName.contains("数值") || colName.contains("万人")) { record.set(colName, null); } else if (isInteger(value)) { record.set(colName, Integer.parseInt(value)); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C7.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C7.java index 5e64f511..dfbd2029 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/City/C7.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C7.java @@ -80,7 +80,7 @@ public class C7 { // 初始化数据 String[] a = {"学前", "小学", "初中", "高中", "中职"}; - String[] b = {"招生总数", "在校生总数", "教职工总数", "专任教师数"}; + String[] b = {"学校总数","招生总数", "在校生总数", "教职工总数", "专任教师数"}; String[][] data = { {"学前", "学校总数", "I"},