From b786574e53a6f38d330cbc2564d3acda113af5ac Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 10 十二月 2024 01:00:41 +0800
Subject: [PATCH] 方法增加参数
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 25481cf..71287d4 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
@@ -1717,6 +1717,11 @@
transitionService.deletedTbTransitionListByCusIdAndPac(cusId, cardId);
List<TjPackageProject> ppList = tjPackageProjectService.getTjPackageProjectListByPacId(String.valueOf(pacId));
if (null != ppList && !ppList.isEmpty()) {
+ String string = transitionService.panduantaocanshifouchongfu(cusId,pacId);
+ if(!StringUtils.isBlank(string)){
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎿嶄綔澶辫触! 浠ヤ笅椤圭洰宸插瓨鍦�: "+string);
+ }
transitionService.saveRedisTransitionByPacId(cusId, cardId, pacId);
}
}
@@ -2631,7 +2636,7 @@
TjReport tjReport = new TjReport();
tjReport.setTjNumber(String.valueOf(tjNumber));
tjReport.setPath(urlValue + outputFileName1);
- String outputPath1 = value + "\\";
+ String outputPath1 = value + File.separator;
String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
tjReport.setReport(pdfBinary);
tjReport.setType("浣撴鎶ュ憡");
--
Gitblit v1.8.0