From a51a70b780ef0ed24abb81b096c80649a0255ece Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 02 七月 2024 19:29:23 +0800
Subject: [PATCH] zjh 2024/07/2-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 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..78952c1 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
@@ -349,12 +349,29 @@
}
Integer checkStatus = tjOrder.getCheckStatus();
if (checkStatus == 1) {
+ if ("鎶ヨ〃".equals(reportTemplate.getPrint())) {
+ TjReport tjReport = new TjReport();
+ tjReport.setTjNumber(String.valueOf(tjNumber));
+ tjReport.setPath(reportTemplate.getUrl() + "?tjNum=" + tjNumber);
+ tjReport.setType("浣撴鎶ュ憡");
+ tjReport.setPrint("鎶ヨ〃");
+ tjReportService.save(tjReport);
+ //淇敼order琛ㄤ腑鐨勬墦鍗版姤鍛婃椂闂翠负褰撳墠鏃堕棿
+ LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(TjOrder::getTjNumber, tjNumber);
+ updateWrapper.set(TjOrder::getReportTime, new Date());
+ updateWrapper.set(TjOrder::getPrintLastTime, new Date());
+ updateWrapper.set(TjOrder::getDownloadLastTime, new Date());
+ updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END);
+ tjOrderService.update(updateWrapper);
+ return AjaxResult.success("宸茬敓鎴愭姤鍛婏紒鍙洿鎺ョ偣鍑婚瑙堬紒");
+ }
String hisRegistrationId = tjOrder.getCardId();
Date createTime = tjOrder.getCreateTime();
Date finishTime = tjOrder.getFinishTime();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String ksrq = dateFormat.format(createTime);
- String jsrq = dateFormat.format(finishTime);
+ String jsrq = dateFormat.format(new Date());
HashMap<String, Object> params = new HashMap<>();
params.put("his_registration_id", hisRegistrationId);
params.put("ksbm", "");
@@ -364,7 +381,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 +1361,7 @@
e.printStackTrace();
return AjaxResult.success("PDF瀵煎嚭澶辫触");
} finally {
- transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(), tjOrder.getCardId());
+// transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(), tjOrder.getCardId());
}
}
}
--
Gitblit v1.8.0