From 682ddfd6816a3ec5b0937e982ed0d2f8071a380a Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 20 十一月 2023 09:18:06 +0800
Subject: [PATCH] zjh 2023/11/20--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 fca4429..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;
@@ -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