|
@@ -197,7 +197,7 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
|
|
|
this.saveBatch(costIncomeGroupArrayList);
|
|
|
return Result.build(200,"数据导入成功",null);
|
|
|
}else {
|
|
|
- return Result.build(500, "数据未成功导入", null);
|
|
|
+ return Result.build(200, "数据未成功导入", null);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -333,7 +333,7 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
|
|
|
continue;
|
|
|
}
|
|
|
BigDecimal beforeMoney = BigDecimal.valueOf(Double.parseDouble(("0".equals(data.get(15).toString()) || StrUtil.isBlank(data.get(15).toString())) ?"0.00":data.get(15).toString()));
|
|
|
- boolean checkNull = StrUtil.isBlank(data.get(15).toString());
|
|
|
+ boolean checkNull = StrUtil.isNotBlank(data.get(15).toString());
|
|
|
boolean checkOne = "0".equals(data.get(15).toString());
|
|
|
// TODO 为0的时候这一行是否可以输入空的
|
|
|
if (checkNull || checkOne) {
|