From 2a9583fd376451ca77a0400af7f3a02d1b80e7f5 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 24 六月 2025 18:04:34 +0800
Subject: [PATCH] 2025-06-24
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 282 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 207 insertions(+), 75 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 dede3db..95519f5 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
@@ -49,6 +49,9 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.math.BigDecimal;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.text.Collator;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -92,8 +95,8 @@
private LtkjHysqdService ltkjHysqdService;
@Autowired
private LtkjGetexamreportinfoService ltkjGetexamreportinfoService;
- @Value("${path.filePath}")
- private String value;
+// @Value("${path.filePath}")
+// private String value;
@Value("${path.reportServer}")
private String urlValue;
@Autowired
@@ -122,6 +125,8 @@
private ITjProAdvicerulesService tjProAdvicerulesService;
@Autowired
private TjOrderYcxmService ycxmService;
+ @Resource
+ private TjXdtgmdjgService xdtgmdjgService;
private Integer pdfPage = 0;
@@ -870,6 +875,7 @@
String s2 = sysConfigService.selectConfigByKey("tjreport_font_size_second_page_title");
String s3 = sysConfigService.selectConfigByKey("tjreport_font_size_result_title");
String s4 = sysConfigService.selectConfigByKey("tjreport_font_size_zongjian");
+ String value = sysConfigService.selectConfigByKey("path_filePath");
// String hospName = sysDeptController.getdangqiandengluyuanqu().get("msg").toString();
if (StrUtil.isNotBlank(s1) && Integer.parseInt(s1) > 10) DEFAULT_FONT_SIZE = Integer.parseInt(s1);
else DEFAULT_FONT_SIZE = 10;
@@ -1032,7 +1038,8 @@
StringBuilder builder = new StringBuilder();
if (StrUtil.isBlank(result.replaceAll("\n", "").trim())) continue;
- builder.append(" (").append(index).append(")").append(detail.getJcxm()).append(": ").append(result).append("\n");
+ builder.append(" (").append(index).append(")").append(detail.getJcxm()).append(": ")
+ .append(result.replaceAll("\n", "").trim()).append("\n");
index++;
result = builder.toString();
@@ -1050,9 +1057,10 @@
xmXh++;
}
}
- }else {
+ }
+ /* else {
- if (!collect.isEmpty() && !map.isEmpty()){
+ if (!collect.isEmpty() || !map.isEmpty()){
paragraph = PdfUtils.setParagraph(defaultTitleFont, "妫�鏌ョ患杩帮細");
paragraph.setSpacingBefore(3f);
paragraph.setSpacingAfter(2f);
@@ -1146,7 +1154,7 @@
}
}
}
- }
+ } */
@@ -1191,7 +1199,8 @@
if (StrUtil.isNotBlank(result)) {
StringBuilder builder = new StringBuilder();
if (StrUtil.isBlank(result.replaceAll("\n", "").trim())) continue;
- builder.append(" (").append(index1).append(")").append(detail.getJcxm()).append(": ").append(result).append("\n");
+ builder.append(" (").append(index1).append(")").append(detail.getJcxm()).append(": ")
+ .append(result.replaceAll("\n", "").trim()).append("\n");
index1++;
result = builder.toString();
@@ -1390,9 +1399,10 @@
}
}
}*/
- } else {
+ }
+ /* else {
- if (!collect.isEmpty() && !map.isEmpty()){
+ if (!collect.isEmpty() || !map.isEmpty()){
paragraph = PdfUtils.setParagraph(defaultTitleFont, "鍖荤敓寤鸿锛�");
paragraph.setSpacingBefore(3f);
paragraph.setSpacingAfter(2f);
@@ -1536,7 +1546,7 @@
}
}
}
- }
+ } */
for (int i = 0; i < 1; i++) {
paragraph = PdfUtils.setParagraph(defaultFont, "");
@@ -1733,6 +1743,46 @@
log.error(String.valueOf(e));
return AjaxResult.error();
}
+
+ LambdaQueryWrapper<TjXdtgmdjg> wqq=new LambdaQueryWrapper<>();
+ wqq.eq(TjXdtgmdjg::getTjh,tjOrder.getTjNumber());
+ wqq.isNotNull(TjXdtgmdjg::getUrl);
+ List<TjXdtgmdjg> xdtgmdjgList = xdtgmdjgService.list(wqq);
+
+ int index=1;
+ for (TjXdtgmdjg xdtgmdjg : xdtgmdjgList) {
+ document.newPage();
+ cell = new PdfPCell();
+ PdfPTable tablefj = new PdfPTable(new float[]{100f});
+ tablefj.setTotalWidth(PageSize.A4.getWidth() - 100);
+ tablefj.setLockedWidth(true);
+ tablefj.setHorizontalAlignment(Element.ALIGN_LEFT);
+ tablefj.getDefaultCell().setBorder(0);
+ tablefj.getDefaultCell().setHorizontalAlignment(Element.ALIGN_RIGHT);
+
+ cell.setBorder(Rectangle.NO_BORDER);
+ cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+ cell.setHorizontalAlignment(Element.ALIGN_CENTER);
+ cell.setPaddingTop(10);
+ cell.setPaddingBottom(10);
+ cell.setPhrase(new Phrase("闄勪欢"+index+": "+ xdtgmdjg.getProName(), zongJianFont));
+ Path path = Paths.get(xdtgmdjg.getUrl());
+ byte[] bytesfj = null;
+ try {
+ bytesfj = Files.readAllBytes(path);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ Image image = Image.getInstance(bytesfj);
+ image.scaleToFit(500, 2500);
+ tablefj.addCell(cell);
+ cell = new PdfPCell();
+ cell.addElement(image);
+ tablefj.addCell(cell);
+ document.add(tablefj);
+ index++;
+ }
+
document.close();
@@ -1757,7 +1807,7 @@
AcroFields acroFields = pdfStamper.getAcroFields();
BaseFont bf = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED);
acroFields.addSubstitutionFont(bf);
- HashMap<String, Object> data = new HashMap<>();
+// HashMap<String, Object> data = new HashMap<>();
Long cusSex = customer.getCusSex();
String tjtype;
if (cusSex == 0) {
@@ -1777,10 +1827,6 @@
if (StrUtil.isNotBlank(tjOrder.getFirmName())) {
hashMap.put("work", tjOrder.getFirmName());
} else {
-// LambdaQueryWrapper<DictComp> wq111 = new LambdaQueryWrapper<>();
-// wq111.eq(DictComp::getDrugManufacturerId, tjOrder.getFirmId());
-// DictComp dictComp = dictCompService.getOne(wq111);
-
if (StrUtil.isBlank(tjOrder.getFirmName())) {
hashMap.put("work", "鏃�");
} else {
@@ -1824,6 +1870,9 @@
PdfImportedPage page = copy.getImportedPage(reader2, i);
copy.addPage(page);
}
+
+
+
reader2.close();
PdfReader reader1 = new PdfReader(byteArrayOutputStream.toByteArray());
@@ -2027,6 +2076,7 @@
*/
private void savePDFFile(String outputFileName1, TjOrder tjOrder, TjCustomer customer, ByteArrayOutputStream finalOutPut) throws IOException, DocumentException, InterruptedException {
// 绗竴姝ワ細鐢熸垚鏂囦欢骞朵繚瀛�
+ String value = sysConfigService.selectConfigByKey("path_filePath");
String key = DataSourceContextHolder.getDataSourceKey();
key = key.replace("ltkjpeis10_","");
String outputPath1 = value + File.separator + key + File.separator;
@@ -2145,7 +2195,7 @@
LambdaQueryWrapper<TjProject> wqqq = new LambdaQueryWrapper<>();
wqqq.eq(TjProject::getProId, entry.getKey().getProId());
TjProject one11 = projectService.getOne(wqqq);
- if (entry.getValue() == null || entry.getValue().isEmpty()) continue;
+ if (entry.getValue() == null || entry.getValue().isEmpty() || entry.getValue().equals("null")) continue;
//鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
if (null != one11 && "Y".equals(one11.getNeedReport())) {
TjOrderRemark orderRemark = entry.getKey();
@@ -2220,12 +2270,66 @@
paragraph.setLeading(5f);
document1.add(ppp);
if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
- ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark(), remarkFonts);
+ ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark().replaceAll("null",""), remarkFonts);
paragraph.setAlignment(Element.ALIGN_LEFT);
paragraph.setLeading(5f);
document1.add(ppp);
}
- } else {
+ }
+ // 纰�14
+// else if (value.get(0).getPid().equals("1870371396991955967")){
+// Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+// Paragraph ppp = new Paragraph("闃虫�у弬鑰冨��(Delta Over Baseline(DPM))锛�", remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
+//
+// LineSeparator objectName = new LineSeparator();
+// objectName.setOffset(-5);
+// document1.add(objectName);
+//
+// ppp = new Paragraph("DPM鍊硷細 > 149 闃虫��", remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
+//
+// ppp = new Paragraph(" 猢� 99 闃存��", remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
+//
+// objectName.setOffset(-5);
+// document1.add(objectName);
+//
+//
+// int result = Integer.parseInt(value.get(0).getProResult());
+// String after = "";
+// if (result > 149){
+// after = "闃虫��";
+// }else {
+// after = "闃存��";
+// }
+// ppp = new Paragraph("妫�娴嬬粨鏋滐細 DPM=" + result, remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
+//
+// ppp = new Paragraph("", remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
+// ppp = new Paragraph("", remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
+// if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
+// ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark(), remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
+// }
+// }
+ else {
String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
Font textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
@@ -2236,18 +2340,22 @@
Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
if (isPacs) {
- Paragraph pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
+ Paragraph pp;
+ Paragraph ppp;
+ if (StrUtil.isNotBlank(value.get(0).getSj())) {
+ pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
+ document1.add(pp);
+ ppp = new Paragraph(value.get(0).getSj(), remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ }
+ pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ彁绀猴細"+value.get(0).getTs());
document1.add(pp);
- Paragraph ppp = new Paragraph(value.get(0).getSj(), remarkFonts);
- paragraph.setAlignment(Element.ALIGN_LEFT);
- paragraph.setLeading(5f);
- document1.add(ppp);
- pp = PdfUtils.setParagraph(remarkFonts, "缁撹锛�");
- document1.add(pp);
- ppp = new Paragraph(value.get(0).getTs(), remarkFonts);
- paragraph.setAlignment(Element.ALIGN_LEFT);
- paragraph.setLeading(5f);
- document1.add(ppp);
+// ppp = new Paragraph(value.get(0).getTs(), remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
} else {
if (value.get(0).getPid().equals("1862852701533012001")) {
remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
@@ -2281,7 +2389,7 @@
paragraph.setLeading(5f);
document1.add(ppp);
if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
- ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark(), remarkFonts);
+ ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark().replaceAll("null",""), remarkFonts);
paragraph.setAlignment(Element.ALIGN_LEFT);
paragraph.setLeading(5f);
document1.add(ppp);
@@ -2404,7 +2512,7 @@
paragraph.setLeading(5f);
document1.add(ppp);
if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
- ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark(), remarkFonts);
+ ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark().replaceAll("null",""), remarkFonts);
paragraph.setAlignment(Element.ALIGN_LEFT);
paragraph.setLeading(5f);
document1.add(ppp);
@@ -2421,18 +2529,40 @@
Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
if (isPacs) {
- Paragraph pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
+ Paragraph pp;
+ Paragraph ppp;
+ String key = sysConfigService.selectConfigByKey("makepdfuseorderdetailproresult");
+ if (StrUtil.isNotBlank(key) && !key.equals("Y")){
+ if (StrUtil.isNotBlank(value.get(0).getSj())) {
+ pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
+ document1.add(pp);
+ ppp = new Paragraph(value.get(0).getSj(), remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ }
+ }else{
+ if (StrUtil.isNotBlank(value.get(0).getSj()) || StrUtil.isNotBlank(value.get(0).getProResult())) {
+ pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
+ document1.add(pp);
+ ppp = new Paragraph(value.get(0).getSj() != null ? value.get(0).getSj() : value.get(0).getProResult(), remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ }
+ }
+// pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ彁绀猴細"+ (value.get(0).getTs() != null ? value.get(0).getTs() : value.get(0).getProResult()));
+// document1.add(pp);
+ pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ彁绀猴細");
document1.add(pp);
- Paragraph ppp = new Paragraph(value.get(0).getSj() != null ? value.get(0).getSj() : value.get(0).getProResult(), remarkFonts);
+ ppp = new Paragraph((value.get(0).getTs() != null ? value.get(0).getTs() : value.get(0).getProResult()), remarkFonts);
paragraph.setAlignment(Element.ALIGN_LEFT);
paragraph.setLeading(5f);
document1.add(ppp);
- pp = PdfUtils.setParagraph(remarkFonts, "缁撹锛�");
- document1.add(pp);
- ppp = new Paragraph(value.get(0).getTs() != null ? value.get(0).getTs() : value.get(0).getProResult(), remarkFonts);
- paragraph.setAlignment(Element.ALIGN_LEFT);
- paragraph.setLeading(5f);
- document1.add(ppp);
+// ppp = new Paragraph(value.get(0).getTs() != null ? value.get(0).getTs() : value.get(0).getProResult(), remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
} else {
if (value.get(0).getPid().equals("1862852701533012001")) {
remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
@@ -2466,7 +2596,7 @@
paragraph.setLeading(5f);
document1.add(ppp);
if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
- ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark(), remarkFonts);
+ ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark().replaceAll("null",""), remarkFonts);
paragraph.setAlignment(Element.ALIGN_LEFT);
paragraph.setLeading(5f);
document1.add(ppp);
@@ -2614,9 +2744,10 @@
List<LtkjHysqd> list = ltkjHysqdService.list(ltkjHysqdLambdaQueryWrapper);
HashMap<String, Object> data = new HashMap<>();
for (LtkjHysqd hysqd : list) {
- LambdaQueryWrapper<LtkjHybgd> ltkjHybgdLambdaQueryWrapper = new LambdaQueryWrapper<>();
- ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh, hysqd.getTmh());
- List<LtkjHybgd> hybgds = ltkjHybgdService.list(ltkjHybgdLambdaQueryWrapper);
+// LambdaQueryWrapper<LtkjHybgd> ltkjHybgdLambdaQueryWrapper = new LambdaQueryWrapper<>();
+// ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh, hysqd.getTmh());
+// List<LtkjHybgd> hybgds = ltkjHybgdService.list(ltkjHybgdLambdaQueryWrapper);
+ List<LtkjHybgd> hybgds = ltkjHybgdService.getReportJianYanBaoGaoDanList(hysqd.getTmh());
if(null !=hybgds && !hybgds.isEmpty()){
// hybgds = hybgds.stream().distinct().collect(Collectors.toList());
hybgds = new ArrayList<>(hybgds.stream()
@@ -2884,12 +3015,7 @@
* @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);
+
List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.notHuaYanData(tjNumber);
for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
printReport.put(tjOrderRemark, null);
@@ -2908,7 +3034,14 @@
if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId()) && entry.getKey().getType() == 1) {
TjPdfVO tjPdfVO = new TjPdfVO();
tjPdfVO.setProName(tjOrderDetail.getProject().getProName());
- tjPdfVO.setProResult(tjOrderDetail.getProResult());
+ if(tjProject.getProDelivery()==1){
+ if(StringUtil.isNotBlank(tjOrderDetail.getConclusion())){
+ tjPdfVO.setProResult(tjOrderDetail.getProResult()+" "+tjOrderDetail.getConclusion());
+ }
+ }else {
+ tjPdfVO.setProResult(tjOrderDetail.getProResult());
+ }
+
tjPdfVO.setExc(tjOrderDetail.getExceptionDesc());
if (null != tjProject.getProMetering()) {
tjPdfVO.setCompany(tjProject.getProMetering());
@@ -2917,6 +3050,7 @@
}
tjPdfVO.setProId(String.valueOf(tjOrderDetail.getProject().getProId()));
tjPdfVO.setPid(String.valueOf(tjProject.getProParentId()));
+ tjPdfVO.setXh(tjProject.getXh());
// LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(LtkjExamJcbgd::getTjh, tjNumber);
// wrapper.eq(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()));
@@ -2925,24 +3059,20 @@
}
}
if(!tjPdfVOS.isEmpty()){
- tjPdfVOS=tjPdfVOS.stream().sorted(Comparator.comparing(TjPdfVO::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
- tjPdfVOS = tjPdfVOS.stream()
- .sorted(Comparator.comparingInt(
- tjPdfVO -> tjPdfVO.getProName().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
- ))
- .collect(Collectors.toList());
+// tjPdfVOS=tjPdfVOS.stream().sorted(Comparator.comparing(TjPdfVO::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
+// tjPdfVOS = tjPdfVOS.stream()
+// .sorted(Comparator.comparingInt(
+// tjPdfVO -> tjPdfVO.getProName().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
+// ))
+// .collect(Collectors.toList());
+ tjPdfVOS=tjPdfVOS.stream().sorted(Comparator.comparing(TjPdfVO::getXh)).collect(Collectors.toList());
}
printReport.put(entry.getKey(), tjPdfVOS);
}
}
private void pacsJianChaData(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);
+
List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.pacsJianChaData(tjNumber);
for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
printReport.put(tjOrderRemark, null);
@@ -2960,6 +3090,7 @@
if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId())
&& entry.getKey().getType() == 1
&& !ids.contains(String.valueOf(tjOrderDetail.getProject().getProParentId()))) {
+ TjProject tjProjectq = projectService.getById(tjOrderDetail.getProject().getProParentId());
TjPdfVO tjPdfVO = new TjPdfVO();
tjPdfVO.setProName(tjOrderDetail.getProject().getProName());
tjPdfVO.setProResult(tjOrderDetail.getProResult());
@@ -2971,15 +3102,24 @@
}
tjPdfVO.setProId(String.valueOf(tjOrderDetail.getProject().getProId()));
LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(LtkjExamJcbgd::getTjh, tjNumber);
- wrapper.like(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()));
- wrapper.orderByDesc(LtkjExamJcbgd::getZdsj);
+ wrapper.eq(LtkjExamJcbgd::getTjh, one.getCardId())
+ .and(w -> w.like(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()))
+ .or()
+ .eq(LtkjExamJcbgd::getXmdm, String.valueOf(tjProjectq.getHisXmbm()))).orderByDesc(LtkjExamJcbgd::getZdsj);
List<LtkjExamJcbgd> list = jcbgdService.list(wrapper);
if (null != list && !list.isEmpty()) {
LtkjExamJcbgd jcbgd = list.get(0);
if (jcbgd != null) {
- tjPdfVO.setTs(jcbgd.getYxbx());
- tjPdfVO.setSj(jcbgd.getBgNr());
+ String yxbx = jcbgd.getYxbx();
+ String bgNr = jcbgd.getBgNr();
+ // 姝ｅ垯琛ㄨ揪寮忥細鍖归厤鏁板瓧鍚庤窡 '.' 鎴� '銆�'
+ String regex = "\\d+[\\.,銆乚";
+ // 浣跨敤姝ｅ垯鏇挎崲锛屽尮閰嶇殑鏁板瓧鍚庢坊鍔犳崲琛岀
+ if(StringUtil.isNotBlank(yxbx)) yxbx = yxbx.replaceAll(regex, "\n$0");
+ if(StringUtil.isBlank(bgNr)) bgNr = "";
+ if(StringUtil.isBlank(yxbx)) yxbx = "";
+ tjPdfVO.setTs(yxbx);
+ tjPdfVO.setSj(bgNr);
tjPdfVO.setShys(jcbgd.getShysxm());
tjPdfVO.setProName(jcbgd.getXmmc());
ids += "|" + jcbgd.getXmdm();
@@ -2989,14 +3129,6 @@
}
}
}
-// if(!tjPdfVOS.isEmpty()){
-// tjPdfVOS=tjPdfVOS.stream().sorted(Comparator.comparing(TjPdfVO::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
-// tjPdfVOS = tjPdfVOS.stream()
-// .sorted(Comparator.comparingInt(
-// tjPdfVO -> tjPdfVO.getProName().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
-// ))
-// .collect(Collectors.toList());
-// }
printReport.put(entry.getKey(), tjPdfVOS);
}
}
--
Gitblit v1.8.0