From ec266a0440669bb6b9830991770fa5b0a7568fdf Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 13 十二月 2024 15:44:55 +0800
Subject: [PATCH] 20241213
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 27d2a91..81a60ad 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -2599,8 +2599,12 @@
LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjCustomer::getCusId, byId.getUserId());
TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
+ LambdaQueryWrapper<TjReportTemplate> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjReportTemplate::getFlag,"4");
+ wrapper.eq(TjReportTemplate::getOpen,"1");
+ TjReportTemplate zongJianYiShiQianMing = reportTemplateService.getOne(wrapper);
try {
- shengchengbgmoban(byId.getTjNumber(), byId, tjCustomer, reportTemplate);
+ shengchengbgmoban(byId.getTjNumber(), byId, tjCustomer, reportTemplate,zongJianYiShiQianMing);
byId.setStatus(TjConstants.TJ_END);
byId.setReportTime(date);
byId.setPrintLastTime(date);
@@ -2627,10 +2631,10 @@
}
- public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) throws Exception {
+ public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate,TjReportTemplate zongJianYiShiQianMing) throws Exception {
// AjaxResult ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
// AjaxResult ajaxResult = hisPDFUtil.hisPDFNew(tjOrder, tjCustomer, reportTemplate);
- AjaxResult ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate);
+ AjaxResult ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
if (!ajaxResult.get("code").toString().equals("200")) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
} else {
--
Gitblit v1.8.0