|
@@ -82,10 +82,13 @@ public class LiveDataAgeServiceImpl extends ServiceImpl<LiveDataAgeMapper, LiveD
|
|
|
for (int j = 0; j < lastCellNum; j++) {
|
|
|
String value = eeu.getCellValue2(row.getCell(j));
|
|
|
String code = titleObj.getString(String.valueOf(j));
|
|
|
- // 省份为空时,添加不成功!
|
|
|
if (Check.isNull(value)) {
|
|
|
return Result.error("数据缺失,文档中第" + (i + 1) + "行,【" + ProvinceEnum.getNameByCode(code) + "】为空项,请补充完善后导入");
|
|
|
}
|
|
|
+ //不要汇总这条数据
|
|
|
+ if(value.contains("汇总")){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
entityObj.put(code, value);
|
|
|
}
|
|
|
entityObj.put("accountId", accountId);
|
|
@@ -143,10 +146,13 @@ public class LiveDataAgeServiceImpl extends ServiceImpl<LiveDataAgeMapper, LiveD
|
|
|
for (int j = 0; j < values.size(); j++) {
|
|
|
String value = values.get(j);
|
|
|
String code = titleObj.getString(String.valueOf(j));
|
|
|
- // 省份为空时,添加不成功!
|
|
|
if (Check.isNull(value)) {
|
|
|
return Result.error("数据缺失,文档中第" + (i + 1) + "行,【" + ProvinceEnum.getNameByCode(code) + "】为空项,请补充完善后导入");
|
|
|
}
|
|
|
+ //不要汇总这条数据
|
|
|
+ if(value.contains("汇总")){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
if (value.contains("%")) {
|
|
|
value = value.replace("%", "");
|
|
|
if (!("0.00".equals(value) || "0.0".equals(value) || "0".equals(value))) {
|