diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java index a4409b2759..940c991efd 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java @@ -316,11 +316,22 @@ public class DailyReportService extends MybatisBaseService row3 = dailyReportVoList.stream().map(v -> v.getEmissionStandardValue()).collect(Collectors.toList()); dailyReportAppVo.setRow3(row3); - //存销比 + /* //存销比 List row4 = dailyReportVoList.stream().map(v -> v.getSaleOfStockRatio()).collect(Collectors.toList()); //合计 BigDecimal row4All = row4.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); row4.add(row4All.toString()); + dailyReportAppVo.setRow4(row4);*/ + //存销比 + List row4 = dailyReportVoList.stream().map(v -> + v.getSaleOfStockRatio().contains(".") ? dicimalToFraction(Double.valueOf(v.getSaleOfStockRatio())) : (v.getSaleOfStockRatio() + ":1") + ).collect(Collectors.toList()); + //合计 + BigDecimal row4All = dailyReportVoList.stream().map(v -> + v.getSaleOfStockRatio() + ).collect(Collectors.toList()).stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); + String row4alll = row4All.toString().contains(".") ? dicimalToFraction(Double.valueOf(row4All.toString())) : (row4All.toString() + ":1"); + row4.add(row4alll); dailyReportAppVo.setRow4(row4); //库存总计 List row5 = dailyReportVoList.stream().map(v -> String.valueOf(v.getStock_total())).collect(Collectors.toList()); @@ -559,7 +570,17 @@ public class DailyReportService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.pageList1(page, qw); + List recordList = pagging.getRecords(); + recordList.removeAll(Collections.singleton(null)); + if (!recordList.isEmpty()) { + for (int i = 0; i < recordList.size(); i++) { + DailyReportListVo dailyReportListVo = recordList.get(i); + String ratio = dailyReportListVo.getSaleOfStockRatio().contains(".") ? dicimalToFraction(Double.valueOf(dailyReportListVo.getSaleOfStockRatio())) : (dailyReportListVo.getSaleOfStockRatio() + ":1"); + dailyReportListVo.setSaleOfStockRatio(ratio); + } + } PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; } @@ -570,6 +591,8 @@ public class DailyReportService extends MybatisBaseService dailyReportVoList = baseMapper.selectReport2(date); - //存销比 + /*//存销比 List row4 = dailyReportVoList.stream().map(v -> v.getSaleOfStockRatio()).collect(Collectors.toList()); //合计 BigDecimal row4All = row4.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); row4.add(row4All.toString()); + dailyReportAppVo.setRow4(row4);*/ + //存销比 + List row4 = dailyReportVoList.stream().map(v -> + v.getSaleOfStockRatio().contains(".") ? dicimalToFraction(Double.valueOf(v.getSaleOfStockRatio())) : (v.getSaleOfStockRatio() + ":1") + ).collect(Collectors.toList()); + //合计 + BigDecimal row4All = dailyReportVoList.stream().map(v -> + v.getSaleOfStockRatio() + ).collect(Collectors.toList()).stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); + String row4alll = row4All.toString().contains(".") ? dicimalToFraction(Double.valueOf(row4All.toString())) : (row4All.toString() + ":1"); + row4.add(row4alll); dailyReportAppVo.setRow4(row4); //库存总计 List row5 = dailyReportVoList.stream().map(v -> String.valueOf(v.getStock_total())).collect(Collectors.toList()); @@ -823,11 +857,22 @@ public class DailyReportService extends MybatisBaseService dailyReportVoList = baseMapper.selectReport3(date, busOrgSid); - //存销比 + /*//存销比 List row4 = dailyReportVoList.stream().map(v -> v.getSaleOfStockRatio()).collect(Collectors.toList()); //合计 BigDecimal row4All = row4.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); row4.add(row4All.toString()); + dailyReportAppVo.setRow4(row4);*/ + //存销比 + List row4 = dailyReportVoList.stream().map(v -> + v.getSaleOfStockRatio().contains(".") ? dicimalToFraction(Double.valueOf(v.getSaleOfStockRatio())) : (v.getSaleOfStockRatio() + ":1") + ).collect(Collectors.toList()); + //合计 + BigDecimal row4All = dailyReportVoList.stream().map(v -> + v.getSaleOfStockRatio() + ).collect(Collectors.toList()).stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); + String row4alll = row4All.toString().contains(".") ? dicimalToFraction(Double.valueOf(row4All.toString())) : (row4All.toString() + ":1"); + row4.add(row4alll); dailyReportAppVo.setRow4(row4); //库存总计 List row5 = dailyReportVoList.stream().map(v -> String.valueOf(v.getStock_total())).collect(Collectors.toList()); @@ -1096,13 +1141,13 @@ public class DailyReportService extends MybatisBaseService row4 = dailyReportVoList.stream().map(v -> - v.getSaleOfStockRatio().contains(".") ?dicimalToFraction(Double.valueOf(v.getSaleOfStockRatio())):(v.getSaleOfStockRatio()+":1") + v.getSaleOfStockRatio().contains(".") ? dicimalToFraction(Double.valueOf(v.getSaleOfStockRatio())) : (v.getSaleOfStockRatio() + ":1") ).collect(Collectors.toList()); //合计 BigDecimal row4All = dailyReportVoList.stream().map(v -> v.getSaleOfStockRatio() ).collect(Collectors.toList()).stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); - String row4alll = row4All.toString().contains(".")?dicimalToFraction(Double.valueOf(row4All.toString())):(row4All.toString()+":1"); + String row4alll = row4All.toString().contains(".") ? dicimalToFraction(Double.valueOf(row4All.toString())) : (row4All.toString() + ":1"); row4.add(row4alll); dailyReportAppVo.setRow4(row4); //库存总计