From 9cf381f93354a5f0fcaf14bd3ab118886d589f80 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 06 八月 2025 13:38:01 +0800
Subject: [PATCH] zjh20250806
---
ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
index 76a89f0..17af177 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
@@ -21,6 +21,7 @@
import com.ltkj.hosp.sqlDomain.LtkjHysqd;
import com.ltkj.hosp.vodomain.ShenGaoTiZhongVo;
import com.ltkj.mall.mallOrderUtils.TjConstants;
+import com.ltkj.system.service.ISysConfigService;
import com.ltkj.web.config.pdfutils.PDFBinaryUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -75,8 +76,8 @@
private IDictCompService compService;
@Resource
private ITjReportTemplateService reportTemplateService;
- @Value("${path.filePath}")
- private String value;
+// @Value("${path.filePath}")
+// private String value;
@Resource
private LtkjHybgdService ltkjHybgdService;
@Resource
@@ -85,6 +86,8 @@
private LtkjExamJcbgdService jcbgdService;
@Resource
private LtkjExamJcsqdService jcsqdService;
+ @Autowired
+ private ISysConfigService configService;
/**
@@ -101,7 +104,7 @@
LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjCustomer::getCusPhone, cusPhone);
List<TjCustomer> list1 = customerService.list(wq1);
- if (list1.size() != 0) {
+ if (null != list1 && !list1.isEmpty()) {
for (TjCustomer tjCustomer : list1) {
Map<String, Object> map = new HashMap<>();
QueryWrapper<TjOrder> wq2 = new QueryWrapper<>();
@@ -110,7 +113,7 @@
wq2.isNotNull("finish_time");
wq2.orderByDesc("finish_time");
List<TjOrder> list = orderService.list(wq2);
- if (null != list && list.size() > 0) {
+ if (null != list && !list.isEmpty()) {
TjOrder tjOrder = orderService.list(wq2).get(0);
map.put("report", tjOrder);
map.put("customer", tjCustomer);
@@ -425,7 +428,7 @@
wq1.eq(TjOrder::getTjNumber, tjNumber);
TjOrder tjOrder = orderService.getOne(wq1);
-
+ String value = configService.selectConfigByKey("path_filePath");
LambdaQueryWrapper<TjCustomer> wq2 = new LambdaQueryWrapper<>();
wq2.eq(TjCustomer::getCusId, tjOrder.getUserId());
TjCustomer tjCustomer = customerService.getOne(wq2);
--
Gitblit v1.8.0