|
@@ -418,10 +418,6 @@ public class XmCostDetailsServiceImpl extends BaseServiceImpl<XmCostDetailsMappe
|
|
|
map.put("year", yearAndMonth.substring(0, 4));
|
|
map.put("year", yearAndMonth.substring(0, 4));
|
|
|
map.put("month", yearAndMonth.substring(4));
|
|
map.put("month", yearAndMonth.substring(4));
|
|
|
|
|
|
|
|
- R<Tenant> tenant = sysClient.getTenant(SecureUtil.getTenantId());
|
|
|
|
|
- if (tenant.isSuccess()) {
|
|
|
|
|
- map.put("enterpriseName", tenant.getData().getTenantName());
|
|
|
|
|
- }
|
|
|
|
|
excelWriter.fill(map, writeSheet);
|
|
excelWriter.fill(map, writeSheet);
|
|
|
excelWriter.finish();
|
|
excelWriter.finish();
|
|
|
if (templateFileName != null) {
|
|
if (templateFileName != null) {
|
|
@@ -623,6 +619,8 @@ public class XmCostDetailsServiceImpl extends BaseServiceImpl<XmCostDetailsMappe
|
|
|
map.put("wxzctxTotalSum", list.stream().map(HighTechCostSummary::getWxzctxTotal).reduce(BigDecimal.ZERO, BigDecimal::add));
|
|
map.put("wxzctxTotalSum", list.stream().map(HighTechCostSummary::getWxzctxTotal).reduce(BigDecimal.ZERO, BigDecimal::add));
|
|
|
map.put("zbtsfyysyfyTotalSum", list.stream().map(HighTechCostSummary::getZbtsfyysyfyTotal).reduce(BigDecimal.ZERO, BigDecimal::add));
|
|
map.put("zbtsfyysyfyTotalSum", list.stream().map(HighTechCostSummary::getZbtsfyysyfyTotal).reduce(BigDecimal.ZERO, BigDecimal::add));
|
|
|
map.put("qtfyTotalSum", list.stream().map(HighTechCostSummary::getQtfyTotal).reduce(BigDecimal.ZERO, BigDecimal::add));
|
|
map.put("qtfyTotalSum", list.stream().map(HighTechCostSummary::getQtfyTotal).reduce(BigDecimal.ZERO, BigDecimal::add));
|
|
|
|
|
+ map.put("qtfyLimitSum", list.stream().map(HighTechCostSummary::getQtfyLimit).reduce(BigDecimal.ZERO, BigDecimal::add));
|
|
|
|
|
+ map.put("qtfyAdjustSum", list.stream().map(HighTechCostSummary::getQtfyAdjust).reduce(BigDecimal.ZERO, BigDecimal::add));
|
|
|
map.put("wwyfTotalSum", list.stream().map(HighTechCostSummary::getWwyfTotal).reduce(BigDecimal.ZERO, BigDecimal::add));
|
|
map.put("wwyfTotalSum", list.stream().map(HighTechCostSummary::getWwyfTotal).reduce(BigDecimal.ZERO, BigDecimal::add));
|
|
|
map.put("totalSum", list.stream().map(HighTechCostSummary::getTotal).reduce(BigDecimal.ZERO, BigDecimal::add));
|
|
map.put("totalSum", list.stream().map(HighTechCostSummary::getTotal).reduce(BigDecimal.ZERO, BigDecimal::add));
|
|
|
WriteSheet writeSheet = EasyExcel.writerSheet().build();
|
|
WriteSheet writeSheet = EasyExcel.writerSheet().build();
|
|
@@ -632,10 +630,10 @@ public class XmCostDetailsServiceImpl extends BaseServiceImpl<XmCostDetailsMappe
|
|
|
map.put("year", yearAndMonth.substring(0, 4));
|
|
map.put("year", yearAndMonth.substring(0, 4));
|
|
|
map.put("month", yearAndMonth.substring(4));
|
|
map.put("month", yearAndMonth.substring(4));
|
|
|
|
|
|
|
|
- R<Tenant> tenant = sysClient.getTenant(SecureUtil.getTenantId());
|
|
|
|
|
- if (tenant.isSuccess()) {
|
|
|
|
|
- map.put("enterpriseName", tenant.getData().getTenantName());
|
|
|
|
|
- }
|
|
|
|
|
|
|
+// R<Tenant> tenant = sysClient.getTenant(SecureUtil.getTenantId());
|
|
|
|
|
+// if (tenant.isSuccess()) {
|
|
|
|
|
+// map.put("enterpriseName", tenant.getData().getTenantName());
|
|
|
|
|
+// }
|
|
|
|
|
|
|
|
excelWriter.fill(map, writeSheet);
|
|
excelWriter.fill(map, writeSheet);
|
|
|
excelWriter.finish();
|
|
excelWriter.finish();
|