yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化

master
dimengzhe 1 year ago
parent
7703b653ec
commit
fb898f287c
1 changed files with 50 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 55
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java

55
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java
View File

@ -316,11 +316,22 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
//排放标准
List<String> row3 = dailyReportVoList.stream().map(v -> v.getEmissionStandardValue()).collect(Collectors.toList());
dailyReportAppVo.setRow3(row3);
//存销比
/* //存销比
List<String> 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<String> 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<String> row5 = dailyReportVoList.stream().map(v -> String.valueOf(v.getStock_total())).collect(Collectors.toList());
@ -559,7 +570,17 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
}
IPage<DailyReport> page = PagerUtil.queryToPage(pagerQuery);
IPage<DailyReportListVo> pagging = baseMapper.pageList1(page, qw);
List<DailyReportListVo> 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<DailyReportAppPagerVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
@ -570,6 +591,8 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
qw.like("createTime", date);
}
ReportVo reportVo = baseMapper.getReport(qw);
String ratio = reportVo.getSaleOfStockRatio().contains(".") ? dicimalToFraction(Double.valueOf(reportVo.getSaleOfStockRatio())) : (reportVo.getSaleOfStockRatio() + ":1");
reportVo.setSaleOfStockRatio(ratio);
return rb.success().setData(reportVo);
}
@ -581,11 +604,22 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
rows1.removeAll(Collections.singleton(null));
dailyReportAppVo.setRow1(rows1);
List<DailyReportVo> dailyReportVoList = baseMapper.selectReport2(date);
//存销比
/*//存销比
List<String> 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<String> 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<String> row5 = dailyReportVoList.stream().map(v -> String.valueOf(v.getStock_total())).collect(Collectors.toList());
@ -823,11 +857,22 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
rows1.removeAll(Collections.singleton(null));
dailyReportAppVo.setRow1(rows1);
List<DailyReportVo> dailyReportVoList = baseMapper.selectReport3(date, busOrgSid);
//存销比
/*//存销比
List<String> 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<String> 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<String> row5 = dailyReportVoList.stream().map(v -> String.valueOf(v.getStock_total())).collect(Collectors.toList());
@ -1096,13 +1141,13 @@ public class DailyReportService extends MybatisBaseService<DailyReportMapper, Da
dailyReportAppVo.setRow3(row3);
//存销比
List<String> 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);
//库存总计

Write Preview
Loading…
Cancel
Save