From 13a3236249d21e1ed1a0f1e8ae20a29d6bf3913a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 26 九月 2025 17:49:11 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataStatisticsController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataStatisticsController.java
index 465a773..cd03634 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataStatisticsController.java
@@ -6,8 +6,10 @@
import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
import cn.hutool.core.io.resource.ClassPathResource;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.WebUtils;
@@ -151,7 +153,7 @@
}
return AjaxResult.success(profitDetailsVO);
}
-
+ @Log(title = "统计-盈利明细导出", businessType = BusinessType.UPDATE)
@ApiOperation( value = "盈利明细导出")
@PostMapping(value = "/profitDetailsExport")
public void profitDetailsExport(@RequestBody ProfitDetailsQuery query) {
@@ -362,7 +364,7 @@
return AjaxResult.success(personnelStatisticsAndSumVO);
}
-
+ @Log(title = "统计-汇总导出", businessType = BusinessType.UPDATE)
@ApiOperation( value = "汇总导出")
@PostMapping(value = "/sumExport")
public void sumExport(@RequestBody ProfitDetailsQuery query) {
@@ -401,12 +403,12 @@
}
}
- sumGeneratorClient.setGeneratorTime(DateUtils.stringToLocalDate(query.getStartTime()) + " ~ " + DateUtils.stringToLocalDate(query.getEndTime()));
+ sumGeneratorClient = orderMealService.sumExport(query);
+ sumGeneratorClient.setGeneratorTime(DateUtils.stringToLocalDateTime(query.getStartTime()).toLocalDate() + " ~ " + DateUtils.stringToLocalDateTime(query.getEndTime()).toLocalDate());
TShop shop = shopService.getById(objectId);
if(Objects.nonNull(shop)){
sumGeneratorClient.setShopName(shop.getShopName());
}
- sumGeneratorClient = orderSaleService.sumExport(query);
result.put("sumGeneratorClient",sumGeneratorClient);
//1.获取excel模板
ClassPathResource classPathResource = new ClassPathResource("template/营业统计报表.xls");
--
Gitblit v1.7.1