From 923f13b2ac81f444376b946d073e3c3170e06f1b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 30 十月 2024 19:29:19 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 180b21c..74584cc 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
@@ -95,6 +95,13 @@
return AjaxResult.success(dataGeneratorService.pageList(query));
}
+ @ApiOperation( value = "数据生成删除")
+ @DeleteMapping(value = "/deleteById")
+ public AjaxResult<String> deleteById(@RequestParam("id") Long id) {
+ dataGeneratorService.removeById(id);
+ return AjaxResult.success();
+ }
+
@ApiOperation( value = "数据覆盖")
@GetMapping(value = "/dataCoverage")
public AjaxResult<String> dataCoverage(@RequestParam(value = "id") Long id) {
@@ -104,7 +111,7 @@
@ApiOperation( value = "数据生成终止 shopId=店铺id type: 1=餐饮 2=进货")
@GetMapping(value = "/stopGenerator")
- public AjaxResult<String> dataCoverage(@RequestParam(value = "shopId") Long shopId,
+ public AjaxResult<String> stopGenerator(@RequestParam(value = "shopId") Long shopId,
@RequestParam(value = "type") Integer type) {
if(type == 1){
redisCache.setCacheObject(OrderNumConstants.MEAL+"_"+shopId,shopId);
@@ -142,6 +149,7 @@
BeanUtils.copyProperties(orderMealVO, tOrderMealExportExcel);
tOrderMealExportExcel.setCreateStrTime(DateUtils.localDateToString(orderMealVO.getMealTime()));
tOrderMealExportExcel.setGoodsList(orderMealVO.getGoodsList().stream().collect(Collectors.joining("\n")));
+ tOrderMealExportExcel.setPersonCount(orderMealVO.getMealPerson());
orderMeals.add(tOrderMealExportExcel);
}
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TOrderMealExportExcel.class, orderMeals);
--
Gitblit v1.7.1