|
@@ -535,14 +535,18 @@ public class TqContractServiceImpl implements ITqContractService
|
|
|
|
|
|
// 4. 全年各区域签约金额
|
|
|
List<LiftMonthCount> signingAmountAll = tqContractLiftMapper.countSigningStatisticAll(year);
|
|
|
+ result.setSigningAreaColStatisticsTitle(year + "国际各区域签单");
|
|
|
result.setSigningAreaColStatistics(getAreaColList(signingAmountAll));
|
|
|
// 5. 全年各区域排产金额
|
|
|
List<LiftMonthCount> productionAmountAll = tqContractLiftMapper.countProductionStatisticAll(year);
|
|
|
+ result.setProductionAreaColStatisticsTitle(year + "国际各区域排产");
|
|
|
result.setProductionAreaColStatistics(getAreaColList(productionAmountAll));
|
|
|
// 6. 全年各区域发货金额
|
|
|
List<LiftMonthCount> deliveryAmountAll = tqContractLiftMapper.countDeliveryStatisticAll(year);
|
|
|
+ result.setDeliveryMonthColStatisticsTitle(year + "发货金额");
|
|
|
result.setDeliveryMonthColStatistics(getMonthColList(deliveryAmountAll));
|
|
|
// 7. 全年各区域排产金额
|
|
|
+ result.setProductionAreaColStatisticsTitle(year + "排产金额");
|
|
|
result.setProductionMonthColStatistics(getMonthColList(productionAmountAll));
|
|
|
|
|
|
return result;
|
|
@@ -698,10 +702,10 @@ public class TqContractServiceImpl implements ITqContractService
|
|
|
response.setCharacterEncoding("utf-8");
|
|
|
try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).build()) {
|
|
|
|
|
|
- excelWriter.write(contractSigningStatistic.getSigningAreaColStatistics(), EasyExcel.writerSheet(year + "国际各区域签单").build());
|
|
|
- excelWriter.write(contractSigningStatistic.getProductionAreaColStatistics(), EasyExcel.writerSheet(year + "国际各区域排产").build());
|
|
|
- excelWriter.write(contractSigningStatistic.getDeliveryMonthColStatistics(), EasyExcel.writerSheet(year + "发货金额").build());
|
|
|
- excelWriter.write(contractSigningStatistic.getProductionMonthColStatistics(), EasyExcel.writerSheet(year + "排产金额").build());
|
|
|
+ excelWriter.write(contractSigningStatistic.getSigningAreaColStatistics(), EasyExcel.writerSheet(contractSigningStatistic.getSigningAreaColStatisticsTitle()).build());
|
|
|
+ excelWriter.write(contractSigningStatistic.getProductionAreaColStatistics(), EasyExcel.writerSheet(contractSigningStatistic.getProductionAreaColStatisticsTitle()).build());
|
|
|
+ excelWriter.write(contractSigningStatistic.getDeliveryMonthColStatistics(), EasyExcel.writerSheet(contractSigningStatistic.getDeliveryMonthColStatisticsTitle()).build());
|
|
|
+ excelWriter.write(contractSigningStatistic.getProductionMonthColStatistics(), EasyExcel.writerSheet(contractSigningStatistic.getProductionMonthColStatisticsTitle()).build());
|
|
|
} catch (IOException e) {
|
|
|
e.printStackTrace();
|
|
|
throw new ServiceException("导出失败");
|