Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-11-24 09:05:57 +08:00
commit 54219dafdb
1 changed files with 1 additions and 1 deletions

View File

@ -509,7 +509,7 @@ public class TAbilityApplicationController {
List<Map> resultList = (List<Map>) tAbilityApplicationService.exportFundStatementTable(params); List<Map> resultList = (List<Map>) tAbilityApplicationService.exportFundStatementTable(params);
BigDecimal decimal = new BigDecimal(tAbilityApplicationDao.getFundStatementSum(params)); BigDecimal decimal = new BigDecimal(tAbilityApplicationDao.getFundStatementSum(params));
BigDecimal divide = decimal.divide(new BigDecimal("10000")); BigDecimal divide = decimal.divide(new BigDecimal("10000"));
divide.setScale(1, RoundingMode.HALF_UP); divide = divide.setScale(1, RoundingMode.HALF_UP);
List<List<Object>> date = resultList.stream().map(index -> { List<List<Object>> date = resultList.stream().map(index -> {
List<Object> data = new ArrayList<>(); List<Object> data = new ArrayList<>();
data.add(index.getOrDefault("resourceName", "") == null ? "" : index.getOrDefault("resourceName", "").toString()); data.add(index.getOrDefault("resourceName", "") == null ? "" : index.getOrDefault("resourceName", "").toString());