From fcc5d56c4fa7b269d96b8ef66a527fa6a7c90450 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 28 二月 2024 19:10:18 +0800
Subject: [PATCH] zjh 本地 2024/02/28 -2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 8 +++++---
1 files changed, 5 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 dafeb79..ee8ed63 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
@@ -98,10 +98,10 @@
@ApiOperation(value = "浠庢湰鍦板瓨鍌ㄦā鏉垮埌鏁版嵁搴�")
public AjaxResult savePdf() {
//浠庢枃浠跺湴鍧�璇诲叆PDF鏂囦欢 浠呭瓨鍌ㄤ竴娆�
- String base64String = PDFBinaryUtil.getPDFBinary("D:\\Tjreport\\浣撴妯℃澘6.pdf");
+ String base64String = PDFBinaryUtil.getPDFBinary("D:\\Tjreport\\浣撴妯℃澘5.pdf");
TjReportTemplate tem = new TjReportTemplate();
- tem.setName("浣撴鎶ュ憡妯℃澘6");
- tem.setRemark("浣撴鎶ュ憡妯℃澘6");
+ tem.setName("浣撴鎶ュ憡妯℃澘5");
+ tem.setRemark("浣撴鎶ュ憡妯℃澘5");
tem.setTemplate(base64String);
tem.setFlag("1");
tem.setOpen("0");
@@ -724,6 +724,7 @@
//20230323鍒ゆ柇椤圭洰宸叉
wq.ne(TjOrderDetail::getTjStatus, 0);
wq.ne(TjOrderDetail::getProId,projectService.getHuaYanProId());
+ wq.eq(TjOrderDetail::getProId,projectService.getNotCcCtXdtProId());
List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.list(wq);
//閬嶅巻浣撴璁板綍 灏嗛」鐩殑鍏蜂綋淇℃伅
@@ -741,6 +742,7 @@
LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
wqq.ne(TjOrderRemark::getDeptId,"241");
+ wqq.in(TjOrderRemark::getDeptId,"269","270","253","254","255","257");
List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
--
Gitblit v1.8.0