From ec2bb08f0aad10bbf1f133046d8e9943be3a6d72 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 26 六月 2024 15:34:44 +0800
Subject: [PATCH] zjh 本地 2024/06/26 --3修改签到撤销接口不判断作废状态
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 06b92e0..e911655 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
@@ -364,7 +364,17 @@
params.put("pagecount", 100);
params.put("page", 1);
HashMap<String, Object> map = new HashMap<>();
- return hisPDFUtil.execHisRequest(map, params, tjOrder, reportTemplate);
+ LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjCustomer::getCusId, tjOrder.getUserId());
+ TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
+// return hisPDFUtil.execHisRequest(map, params, tjOrder, reportTemplate);
+ try {
+ return hisPDFUtil.hisPDF(tjOrder,tjCustomer,reportTemplate);
+ } catch (DocumentException e) {
+ logger.error("鐢熸垚鎶ュ憡寮傚父");
+ e.printStackTrace();
+ return AjaxResult.error("鐢熸垚鎶ュ憡寮傚父");
+ }
} else {
return AjaxResult.error("璇峰厛鎬绘");
}
@@ -1334,7 +1344,7 @@
e.printStackTrace();
return AjaxResult.success("PDF瀵煎嚭澶辫触");
} finally {
- transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(), tjOrder.getCardId());
+// transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(), tjOrder.getCardId());
}
}
}
--
Gitblit v1.8.0