From da392a50b1ea129d1626c1936f0b5ed5ed457b30 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 10 九月 2024 17:14:50 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java
index e2b403c..dfcf093 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java
@@ -26,6 +26,7 @@
import com.ruoyi.system.service.TOrderSaleService;
import com.ruoyi.system.service.TOrderStockService;
import com.ruoyi.system.vo.*;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.BeanUtils;
@@ -50,6 +51,7 @@
* @author xiaochen
* @since 2024-08-27
*/
+@Api(tags = "数据生成管理")
@RestController
@RequestMapping("/t-data-generator")
public class TDataGeneratorController {
@@ -140,8 +142,9 @@
for (TOrderMealVO orderMealVO : list) {
TOrderMealExportExcel tOrderMealExportExcel = new TOrderMealExportExcel();
BeanUtils.copyProperties(orderMealVO, tOrderMealExportExcel);
- tOrderMealExportExcel.setCreateStrTime(DateUtils.localDateTimeToString(orderMealVO.getCreateTime()));
+ tOrderMealExportExcel.setCreateStrTime(DateUtils.localDateToString(orderMealVO.getMealTime()));
tOrderMealExportExcel.setGoodsList(orderMealVO.getGoodsList().stream().collect(Collectors.joining("\n")));
+ orderMeals.add(tOrderMealExportExcel);
}
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TOrderMealExportExcel.class, orderMeals);
HttpServletResponse response = WebUtils.response();
@@ -176,7 +179,8 @@
TOrderSaleAndGoodsExportExcel orderSaleExportExcel = new TOrderSaleAndGoodsExportExcel();
BeanUtils.copyProperties(orderSaleVO, orderSaleExportExcel);
orderSaleExportExcel.setCreateStrTime(DateUtils.localDateTimeToString(orderSaleVO.getCreateTime()));
- orderSaleExportExcel.setGoodsAmount(orderSaleVO.getOrderSaleGoods().stream().map(TOrderSaleGoods::getSalePrice).reduce(BigDecimal::add).get());
+ orderSaleExportExcel.setGoodsAmount(orderSaleVO.getOrderSaleGoods().stream().map(TOrderSaleGoods::getThisSalePrice).reduce(BigDecimal::add).get());
+ orderMeals.add(orderSaleExportExcel);
}
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TOrderSaleAndGoodsExportExcel.class, orderMeals);
HttpServletResponse response = WebUtils.response();
@@ -212,6 +216,7 @@
BeanUtils.copyProperties(orderStockVO, orderStockExportExcel);
orderStockExportExcel.setGoodsAmount(orderStockVO.getOrderStockGoods().stream().map(TOrderStockGoods::getSalePrice).reduce(BigDecimal::add).get());
orderStockExportExcel.setStockTime(DateUtils.localDateToString(orderStockVO.getStockTime()));
+ orderStockExportExcels.add(orderStockExportExcel);
}
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TOrderStockExportExcel.class, orderStockExportExcels);
HttpServletResponse response = WebUtils.response();
--
Gitblit v1.7.1