Commit a48101cfcfbf7c03dcf3dc0542b5dcbce5b1a488
1 parent
5a94fa34
人机材修改
Showing
2 changed files
with
3 additions
and
3 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/CostFeeController.java
| ... | ... | @@ -286,12 +286,12 @@ public class CostFeeController{ |
| 286 | 286 | } |
| 287 | 287 | // 关键:移除最后一行(以“说明”开头的行) |
| 288 | 288 | removeLastLineIfStartWithExplain(dataList, importClass); |
| 289 | - // 基础数据校验(非空、格式等) | |
| 290 | - costFeeService.validateImportData(dataList, template); | |
| 291 | 289 | |
| 292 | 290 | } catch (IOException e) { |
| 293 | 291 | log.error(e.getMessage()); |
| 294 | 292 | } |
| 293 | + // 基础数据校验(非空、格式等) | |
| 294 | + costFeeService.validateImportData(dataList, template); | |
| 295 | 295 | return new ImportResult<>(dataList, template.isNeedPreview()); |
| 296 | 296 | } |
| 297 | 297 | /** | ... | ... |
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/costfee/CostFeeServiceImpl.java
| ... | ... | @@ -727,7 +727,7 @@ public class CostFeeServiceImpl implements CostFeeService { |
| 727 | 727 | |
| 728 | 728 | if (totalWeight > 100) { |
| 729 | 729 | throw exception0(BAD_REQUEST.getCode(), String.format( |
| 730 | - "第%d条数据:权重值合计不能大于100%", rowNum, totalWeight | |
| 730 | + "第%d条数据:权重值合计不能大于100%%", rowNum, totalWeight | |
| 731 | 731 | )); |
| 732 | 732 | } |
| 733 | 733 | } | ... | ... |