From bda1ce873514c0848c4ad76bdd2274f01ab5dcc1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 11 八月 2025 08:48:08 +0800
Subject: [PATCH] zjh202500811
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index a16ea26..ec609de 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -748,7 +748,7 @@
tjOrderDetail.setStandard(list2.get(0));
} else {
Long cusSex = customer.getCusSex();
- Date cusBrithday = customer.getCusBrithday();
+ String cusBrithday = customer.getCusBrithday();
int age = DateUtil.ageOfNow(cusBrithday);
for (TjStandard tjStandard : list2) {
LambdaQueryWrapper<TjStandard> wq8 = new LambdaQueryWrapper<>();
@@ -826,7 +826,7 @@
tjOrderDetail.setStandard(list2.get(0));
} else {
Long cusSex = customer.getCusSex();
- Date cusBrithday = customer.getCusBrithday();
+ String cusBrithday = customer.getCusBrithday();
int age = DateUtil.ageOfNow(cusBrithday);
for (TjStandard tjStandard : list2) {
LambdaQueryWrapper<TjStandard> wq8 = new LambdaQueryWrapper<>();
@@ -1056,8 +1056,9 @@
public AjaxResult preview(@RequestBody String data) {
String is_batch_report_use_sql = configService.selectConfigByKey("is_batch_report_use_sql");
List<String> tjNumbers = Arrays.stream(data.split(",")).collect(Collectors.toList());
+ String value = configService.selectConfigByKey("path_filePath");
if ("true".equals(is_batch_report_use_sql)) {
- return tjReportService.makeBatchReport(tjNumbers);
+ return tjReportService.makeBatchReport(tjNumbers, value);
} else {
return makeReport(tjNumbers);
}
--
Gitblit v1.8.0