From 6341f129682926b3909604e9b04dc95199c2059a Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 09 五月 2025 18:15:01 +0800
Subject: [PATCH] zjh20250509
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 0faa62b..c585dbb 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
@@ -283,7 +283,7 @@
@GetMapping("/toPdf/{TjNumber}")
@ApiOperation(value = "鎵撳嵃浣撴鎶ュ憡涓簆df")
- @Transactional
+// @Transactional
public AjaxResult toPdf(@PathVariable("TjNumber") @ApiParam(value = "浣撴鍙�") String tjNumber) {
// AjaxResult error = null;
// 涔嬪墠鐨勪唬鐮� 浼樺寲閫熷害
@@ -412,15 +412,15 @@
try {
return shengchengbgmoban(tjNumber, tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
} catch (Exception e) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- log.error(String.valueOf(e));
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ log.error("鐢熸垚鎶ュ憡澶辫触锛�"+e.getMessage(),String.valueOf(e));
tjOrder.setReportTime(null);
tjOrder.setCheckTime(null);
tjOrder.setCheckStatus(0);
tjOrder.setPrintLastTime(null);
tjOrderService.updateById(tjOrder);
- logger.error(String.valueOf(e));
+// logger.error(String.valueOf(e));
return AjaxResult.error("鐢熸垚鎶ュ憡澶辫触");
}
} else {
@@ -430,7 +430,7 @@
return AjaxResult.error();
}
- public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate,TjReportTemplate zongJianYiShiQianMing) {
+ public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate,TjReportTemplate zongJianYiShiQianMing) throws Exception {
AjaxResult ajaxResult = null;
try {
// ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
@@ -438,11 +438,13 @@
ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
} catch (Exception e) {
- e.printStackTrace();
- log.error(String.valueOf(e));
+// e.printStackTrace();
+// log.error(String.valueOf(e));
+ throw new Exception(e);
}
if (!ajaxResult.get("code").toString().equals("200")) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鐢熸垚鎶ュ憡澶辫触");
} else {
Long userId = tjCustomer.getCusId();
String outputFileName1 = userId + tjNumber + tjCustomer.getCusName() + "_鎶ュ憡.pdf";
--
Gitblit v1.8.0