From 945df2d60ab4f17f18642d795ac1b1e6977cd43e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Fri, 15 Nov 2024 11:26:01 +0800 Subject: [PATCH] 'commit' --- Doc/待处理/市/【7】概览/概览.xlsx | Bin 9234 -> 9234 bytes .../市/【7】概览/概览【成果】.xlsx | Bin 12368 -> 14335 bytes .../base/DataEase/Model/DataEaseModel.java | 2 +- .../dsideal/base/Tools/FillData/City/C7.java | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/待处理/市/【7】概览/概览.xlsx b/Doc/待处理/市/【7】概览/概览.xlsx index d784f83d983f5edd33cf5b9f943356e49f581565..dee2c5c78f1f53b54e377350a9e08391413aa05e 100644 GIT binary patch delta 177 zcmbQ_G0B4`z?+#xgn@&DgW+4$MxIHGOy8n5FJROH(`T5H!L%VuE<~I)6-=|UcYx`M z9GAI3>eGbdS%LK8;}T3D?nx<#_OH@GAmPcLiuNF?OVJ!e9agjfQH)BqAj&}rEZ3;y a0G3m-1X2GWg7(VRAYP5K8;Clh><0j>kwMo0 delta 177 zcmbQ_G0B4`z?+#xgn@&DgW;;vMxIHGOjn&YFJROH(`T5H!L%VuE<~I)6-=|UcYx`M z9GAI3>eGbdS%LK8;}T3D?nx<#_OH@GAmPcLiuNF?OVJ!e9agjfQH)BqAj&}rEZ3;y a0G3m-1X2GWg7(VRAYP5K8;Clh><0iGtvvAn diff --git a/Doc/待处理/市/【7】概览/概览【成果】.xlsx b/Doc/待处理/市/【7】概览/概览【成果】.xlsx index 4a7b49eb492ed7fbbb1dc7d8ee33bccc6c1ac3b4..42787eebe66fe769dacea6700c925772243ff16f 100644 GIT binary patch literal 14335 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 LAi<#sy!ihBP8xHZ 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"},