From b83df5a43c563bac919dee41d3a8b794f22f1030 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 13 十二月 2024 19:20:45 +0800
Subject: [PATCH] zjh202412013
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 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 7d02495..5214c0e 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
@@ -104,6 +104,8 @@
private HisPDFUtil hisPDFUtil;
@Autowired
private IDictHospService dictHospService;
+ @Autowired
+ private ITjReportPrintService printService;
@GetMapping("/savePdf")
@ApiOperation(value = "浠庢湰鍦板瓨鍌ㄦā鏉垮埌鏁版嵁搴�")
@@ -392,8 +394,12 @@
LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjCustomer::getCusId, tjOrder.getUserId());
TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
+ LambdaQueryWrapper<TjReportTemplate> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjReportTemplate::getFlag,"4");
+ wrapper.eq(TjReportTemplate::getOpen,"1");
+ TjReportTemplate zongJianYiShiQianMing = reportTemplateService.getOne(wrapper);
try {
- return shengchengbgmoban(tjNumber, tjOrder, tjCustomer, reportTemplate);
+ return shengchengbgmoban(tjNumber, tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
log.error(String.valueOf(e));
@@ -409,13 +415,13 @@
return AjaxResult.error();
}
- public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) {
+ public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate,TjReportTemplate zongJianYiShiQianMing) {
AjaxResult ajaxResult = null;
try {
// ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
// ajaxResult = hisPDFUtil.hisPDFNew(tjOrder, tjCustomer, reportTemplate);
- ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate);
+ ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
} catch (Exception e) {
e.printStackTrace();
log.error(String.valueOf(e));
@@ -1714,22 +1720,23 @@
@ApiOperation(value = "涓嬭浇浣撴鎶ュ憡")
public void preview(HttpServletResponse response, @PathVariable("flag") boolean flag, @PathVariable("TjNumber") String tjNumber) {
//淇敼order琛ㄤ腑鐨勪笅杞芥姤鍛婃椂闂翠负褰撳墠鏃堕棿
- LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper.eq(TjOrder::getTjNumber, tjNumber);
- updateWrapper.set(TjOrder::getPrintLastTime, new Date());
- updateWrapper.set(TjOrder::getDownloadLastTime, new Date());
- updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END);
- tjOrderService.update(updateWrapper);
+// LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
+// updateWrapper.eq(TjOrder::getTjNumber, tjNumber);
+// updateWrapper.set(TjOrder::getPrintLastTime, new Date());
+// updateWrapper.set(TjOrder::getDownloadLastTime, new Date());
+// updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END);
+// tjOrderService.update(updateWrapper);
+
+ Date date = new Date();
+// LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
+// wq1.eq(TjOrder::getTjNumber, tjNumber);
+// TjOrder tjOrder = tjOrderService.getOne(wq1);
+ TjOrder tjOrder = tjOrderService.getOrderByTjNum(tjNumber);
- LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjOrder::getTjNumber, tjNumber);
- TjOrder tjOrder = tjOrderService.getOne(wq1);
-
-
- LambdaQueryWrapper<TjCustomer> wq2 = new LambdaQueryWrapper<>();
- wq2.eq(TjCustomer::getCusId, tjOrder.getUserId());
- TjCustomer tjCustomer = tjCustomerService.getOne(wq2);
+// LambdaQueryWrapper<TjCustomer> wq2 = new LambdaQueryWrapper<>();
+// wq2.eq(TjCustomer::getCusId, tjOrder.getUserId());
+ TjCustomer tjCustomer = tjCustomerService.getById( tjOrder.getUserId());
LambdaQueryWrapper<TjReport> we = new LambdaQueryWrapper<>();
@@ -1777,6 +1784,17 @@
while ((len = br.read(bs)) > 0) {
out.write(bs, 0, len);
}
+ if(null !=tjOrder.getHeshouTime() && tjOrder.getHeshouStatus()==1){
+ TjReportPrint print=new TjReportPrint();
+ print.setTjNumber(tjNumber);
+ print.setPrintBy(SecurityUtils.getLoginUser().getUser().getNickName());
+ print.setPrintTime(date);
+ print.setPrintStatus("宸叉墦鍗�");
+ if (printService.save(print)) {
+ tjOrder.setPrintLastTime(date);
+ tjOrderService.updateById(tjOrder);
+ }
+ }
out.flush();
out.close();
br.close();
--
Gitblit v1.8.0