From 0d4a80fd817b39417ad7eee88aa5d14bf571f79c Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期五, 28 六月 2024 17:29:09 +0800
Subject: [PATCH] zjh 本地 2024/06/28 --1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 e911655..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", "");
--
Gitblit v1.8.0