From 3f28b46171934066aeeff9af80d3f0ce6afb3adf Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期四, 30 十一月 2023 17:55:27 +0800
Subject: [PATCH] 优化
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 4f4c2c0..78eed12 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
@@ -25,6 +25,7 @@
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
import com.ltkj.mall.mallOrderUtils.TjConstants;
+import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysUserService;
import com.ltkj.web.config.pdfutils.MergePdf;
import com.ltkj.web.config.pdfutils.MyHeaderFooter;
@@ -81,6 +82,8 @@
private ITjOrderDetailRulesService detailRulesService;
@Resource
private ITjRulesService rulesService;
+ @Autowired
+ private ISysConfigService configService;
@@ -547,21 +550,21 @@
// TODO: 2023/3/29 鏌ヨ闄勪欢pdf 濡傚績鐢靛浘銆侀檮浠�
LambdaQueryWrapper<TjReport> rtwq1 = new LambdaQueryWrapper<>();
rtwq1.eq(TjReport::getType, "鍖诲鍚嶈瘝");
- rtwq1.eq(TjReport::getTjNumber, tjNumber);
+// rtwq1.eq(TjReport::getTjNumber, tjNumber);
TjReport one11111 = tjReportService.getOne(rtwq1);
String report1 = one11111.getReport();
PDFBinaryUtil.base64StringToPDF(report1, FileUtil.mkdir(value).getPath() + "\\" + userId + "鍖诲鍚嶈瘝.pdf");
LambdaQueryWrapper<TjReport> rtwq = new LambdaQueryWrapper<>();
rtwq.eq(TjReport::getType, "蹇冪數鍥�");
- rtwq.eq(TjReport::getTjNumber, tjNumber);
+// rtwq.eq(TjReport::getTjNumber, tjNumber);
TjReport one1111 = tjReportService.getOne(rtwq);
String report = one1111.getReport();
PDFBinaryUtil.base64StringToPDF(report, FileUtil.mkdir(value).getPath() + "\\" + userId + "蹇冪數鍥�.pdf");
LambdaQueryWrapper<TjReport> rtwq12 = new LambdaQueryWrapper<>();
rtwq12.eq(TjReport::getType, "闄勪欢");
- rtwq12.eq(TjReport::getTjNumber, tjNumber);
+// rtwq12.eq(TjReport::getTjNumber, tjNumber);
TjReport one111112 = tjReportService.getOne(rtwq12);
String report12 = one111112.getReport();
PDFBinaryUtil.base64StringToPDF(report12, FileUtil.mkdir(value).getPath() + "\\" + userId + "闄勪欢.pdf");
@@ -822,7 +825,12 @@
wq2.eq("tj_number", tjNumber);
TjOrder one = tjOrderService.getOne(wq2);
one.setCheckStatus(0);
- one.setStatus(TjConstants.TJ_WAIT);
+ String config = configService.selectConfigByKey("tj_confirm");
+ if ("Y".equals(config)) {
+ one.setStatus(TjConstants.TJ_CHECK);
+ }else {
+ one.setStatus(TjConstants.TJ_CONFIRM);
+ }
//灏嗙姸鎬佹敼涓烘湭瀹℃牳
// UpdateWrapper updateWrapper=new UpdateWrapper();
// updateWrapper.eq("tj_number",tjNumber);
--
Gitblit v1.8.0