From 3c4c9d16fbe7f36203f4a6ad5f3726e4cca48663 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 12 十二月 2024 00:09:01 +0800
Subject: [PATCH] 2024-12-12
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 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 355ffc7..4924895 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
@@ -39,6 +39,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Propagation;
@@ -56,6 +57,7 @@
* @author ltkj
* @date 2022-12-06
*/
+@Slf4j
@RestController
@RequestMapping("/system/report")
@Api(tags = "AAAA_浣撴鎶ュ憡")
@@ -100,6 +102,8 @@
private ITjBigPositiveService tjBigPositiveService;
@Autowired
private HisPDFUtil hisPDFUtil;
+ @Autowired
+ private IDictHospService dictHospService;
@GetMapping("/savePdf")
@ApiOperation(value = "浠庢湰鍦板瓨鍌ㄦā鏉垮埌鏁版嵁搴�")
@@ -299,9 +303,10 @@
// return error;
// }
// return AjaxResult.success("璇ョ敤鎴蜂綋妫�鏈畬鎴愶紝涓嶈兘鎵撳嵃鎶ュ憡锛侊紒锛�");
- int num = tjOrderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
- if (num > 0) {
- return AjaxResult.error("鏈夊欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
+ String config = configService.selectConfigByKey("sfjcwjhyqxm");
+ if(null != config && config.equalsIgnoreCase("Y")){
+ int num = tjOrderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
+ if (num > 0) return AjaxResult.error("瀛樺湪鏈鎴栧欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
}
// String configByKey = configService.selectConfigByKey("sfkqdyhis");
@@ -391,7 +396,7 @@
return shengchengbgmoban(tjNumber, tjOrder, tjCustomer, reportTemplate);
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- e.printStackTrace();
+ log.error(String.valueOf(e));
// 璋冪敤鎾ら攢
// tjReportController.backOnlyCheckType(tjNumber);
logger.error("鐢熸垚鎶ュ憡寮傚父");
@@ -404,8 +409,15 @@
return AjaxResult.error();
}
- public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) throws Exception {
- AjaxResult ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
+ public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) {
+ AjaxResult ajaxResult = null;
+ try {
+// ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
+ ajaxResult = hisPDFUtil.hisPDFNew(tjOrder, tjCustomer, reportTemplate);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error(String.valueOf(e));
+ }
if (!ajaxResult.get("code").toString().equals("200")) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
} else {
@@ -897,7 +909,8 @@
// 璁剧疆姝ｆ枃瀛椾綋鏍峰紡锛�12鍙�
Font textFont = PdfUtils.setFont(9);
//鍒涘缓琛ㄦ牸 灏嗚〃澶村瓧浣撳拰姝ｆ枃瀛椾綋鏀捐繘鍘�
- PdfPTable table = PdfUtils.setTable(headFont, textFont, titles, value);
+ DictHosp dictHosp = dictHospService.list().get(0);
+ PdfPTable table = PdfUtils.setTable(headFont, textFont, titles, value,dictHosp.equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌"));
document.add(paragraph);
document.add(table);
//鍒ゆ柇澶囨敞鏄惁涓虹┖ 绌轰笉鑳芥樉绀簄ull
@@ -951,6 +964,7 @@
}
private AjaxResult oldFun(String tjNumber) {
+ DictHosp dictHosp = dictHospService.list().get(0);
long startTime = System.currentTimeMillis();
int num = tjOrderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
if (num > 0) return AjaxResult.error("鏈夊欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
@@ -1277,7 +1291,7 @@
// 璁剧疆姝ｆ枃瀛椾綋鏍峰紡锛�12鍙�
Font textFont = PdfUtils.setFont(9);
//鍒涘缓琛ㄦ牸 灏嗚〃澶村瓧浣撳拰姝ｆ枃瀛椾綋鏀捐繘鍘�
- PdfPTable table = PdfUtils.setTable(headFont, textFont, titles, value);
+ PdfPTable table = PdfUtils.setTable(headFont, textFont, titles, value,dictHosp.equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌"));
document.add(paragraph);
document.add(table);
--
Gitblit v1.8.0