From b6ec9700dda9dfa2530ddd9aac3c992acd9e5af2 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期日, 01 十二月 2024 21:32:56 +0800
Subject: [PATCH] zjh20241201-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index 1315849..2a6a257 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -827,12 +827,13 @@
* @param customer
*/
private void notHuaYanData(String tjNumber, Map<TjOrderRemark, List<TjPdfVO>> printReport, TjOrder one, TjCustomer customer) {
- 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");
- wqq.notIn(TjOrderRemark::getProId, projectService.getNneedReprotProId());
- List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
+// 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");
+// wqq.notIn(TjOrderRemark::getProId, projectService.getNneedReprotProId());
+// List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
+ List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.notHuaYanData(tjNumber);
for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
printReport.put(tjOrderRemark, null);
}
@@ -1064,7 +1065,7 @@
table1.setSpacingAfter(10f);
Font titleFont = PdfUtils.setFont(12);
- PdfPCell mergedCell = new PdfPCell(new Phrase("娉� 宸� 鍘� 浜� 姘� 鍖� 闄�", titleFont));
+ PdfPCell mergedCell = new PdfPCell(new Phrase("闄曞仴鍖绘緞鍚堢熆鍔″眬涓績鍖婚櫌", titleFont));
mergedCell.setBorder(Rectangle.NO_BORDER);
mergedCell.setColspan(10);
mergedCell.setHorizontalAlignment(Element.ALIGN_CENTER);
--
Gitblit v1.8.0