From b3a30267d5fcb3e2a4f19441b8667c728fd28609 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 18 七月 2025 14:37:39 +0800
Subject: [PATCH] 报告弃检重复问题
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 615 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 426 insertions(+), 189 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 4338132..21aac68 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
@@ -870,7 +870,7 @@
return AjaxResult.success();
}*/
- public AjaxResult hisPDFNew2(TjOrder tjOrder, TjCustomer customer, TjReportTemplate tjReportTemplate, TjReportTemplate zongJianYiShiQianMing) throws Exception {
+ public AjaxResult hisPDFNew2(TjOrder tjOrder, TjCustomer customer, TjReportTemplate tjReportTemplate, TjReportTemplate zongJianYiShiQianMing) throws Exception {
try {
String s1 = sysConfigService.selectConfigByKey("tjreport_font_size_second_page_info");
String s2 = sysConfigService.selectConfigByKey("tjreport_font_size_second_page_title");
@@ -1002,6 +1002,37 @@
// List<TjOrderRemark> remarks = tjOrderRemarkMapper.getzongjianyishengchakanyichangxiangmu3( tjOrder.getTjNumber());
List<TjOrderDetail> orderDetails = tjOrderDetailMapper.getzongjianyishengchakanyichangxiangmu4(tjOrder.getTjNumber());
// List<Map<String, Object>> jiancha = new ArrayList<>();
+
+ Font zongJianFont = PdfUtils.setFont(DEFAULT_ZONGJIAN_FONT_SIZE);
+ Font zongJianTitleFont = PdfUtils.setFont(DEFAULT_ZONGJIAN_FONT_SIZE);
+ zongJianTitleFont.setStyle(Font.BOLD);
+ PdfPCell cell;
+
+
+ String zjjyandqmgzIstop = sysConfigService.selectConfigByKey("pdf_zjjyandqmgz_istop");
+ boolean zjjyandqmgzIstopFlag = false;
+ if (StrUtil.isNotBlank(zjjyandqmgzIstop) && zjjyandqmgzIstop.equalsIgnoreCase("y")){
+ zjjyandqmgzIstopFlag = true;
+ paragraph = PdfUtils.setParagraph(defaultTitleFont, "鎬绘鍖荤敓寤鸿锛�");
+ document2.add(paragraph);
+ if (tjOrder.getCheckAdvice() == null) {
+ paragraph = PdfUtils.setParagraph(defaultFont, "鏃�");
+ document2.add(paragraph);
+ } else {
+ Paragraph paragraphs = new Paragraph(tjOrder.getCheckAdvice(), defaultFont);
+ //璁剧疆鏂囧瓧灞呬腑
+ paragraphs.setAlignment(Element.ALIGN_LEFT);
+ //琛岄棿璺�
+// paragraphs.setLeading(5f);
+ //璁剧疆娈佃惤涓婄┖鐧�
+ paragraphs.setSpacingBefore(10f);
+ //璁剧疆娈佃惤涓嬬┖鐧�
+ paragraphs.setSpacingAfter(10f);
+// paragraph = PdfUtils.setParagraph(defaultFont, tjOrder.getCheckAdvice());
+ document2.add(paragraphs);
+ }
+ makeZjjyAndQmgzTab(tjOrder, zongJianYiShiQianMing, zongJianFont, zongJianTitleFont, value, document2, defaultFont);
+ }
@@ -1135,10 +1166,15 @@
List<Map<String, Object>> collect1 = maps.stream().distinct().collect(Collectors.toList());
for (Map<String, Object> objectMap : collect1) {
String content = str + objectMap.get("bt").toString() + objectMap.get("nr").toString();
- if (StrUtil.isBlank(content)) content = " ";
- paragraph = new Paragraph(content, defaultFont);
- paragraph.setAlignment(Element.ALIGN_LEFT);
- document2.add(paragraph);
+// if (StrUtil.isBlank(content)) content = " ";
+// paragraph = new Paragraph(content, defaultFont);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// document2.add(paragraph);
+ if (StrUtil.isNotBlank(content) && StrUtil.isNotBlank(content.trim())){
+ paragraph = new Paragraph(content, defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ }
}
index++;
paragraph = PdfUtils.setParagraph(defaultFont, "");
@@ -1157,24 +1193,27 @@
paragraph = PdfUtils.setParagraph(defaultFont, "");
document2.add(paragraph);
}
- paragraph = PdfUtils.setParagraph(defaultTitleFont, "鎬绘鍖荤敓寤鸿锛�");
- document2.add(paragraph);
- if (tjOrder.getCheckAdvice() == null) {
- paragraph = PdfUtils.setParagraph(defaultFont, "鏃�");
+ if (!zjjyandqmgzIstopFlag){
+ paragraph = PdfUtils.setParagraph(defaultTitleFont, "鎬绘鍖荤敓寤鸿锛�");
document2.add(paragraph);
- } else {
- Paragraph paragraphs = new Paragraph(tjOrder.getCheckAdvice(), defaultFont);
- //璁剧疆鏂囧瓧灞呬腑
- paragraphs.setAlignment(Element.ALIGN_LEFT);
- //琛岄棿璺�
+ if (tjOrder.getCheckAdvice() == null) {
+ paragraph = PdfUtils.setParagraph(defaultFont, "鏃�");
+ document2.add(paragraph);
+ } else {
+ Paragraph paragraphs = new Paragraph(tjOrder.getCheckAdvice(), defaultFont);
+ //璁剧疆鏂囧瓧灞呬腑
+ paragraphs.setAlignment(Element.ALIGN_LEFT);
+ //琛岄棿璺�
// paragraphs.setLeading(5f);
- //璁剧疆娈佃惤涓婄┖鐧�
- paragraphs.setSpacingBefore(10f);
- //璁剧疆娈佃惤涓嬬┖鐧�
- paragraphs.setSpacingAfter(10f);
+ //璁剧疆娈佃惤涓婄┖鐧�
+ paragraphs.setSpacingBefore(10f);
+ //璁剧疆娈佃惤涓嬬┖鐧�
+ paragraphs.setSpacingAfter(10f);
// paragraph = PdfUtils.setParagraph(defaultFont, tjOrder.getCheckAdvice());
- document2.add(paragraphs);
+ document2.add(paragraphs);
+ }
}
+
Paragraph paragraphNone = new Paragraph("", defaultFont);
@@ -1193,124 +1232,16 @@
document2.add(paragraphNone);
- PdfPTable tableQz = new PdfPTable(new float[]{100f, 100f, 50f});
- tableQz.setTotalWidth(PageSize.A4.getWidth() - 100);
- tableQz.setLockedWidth(true);
- tableQz.setHorizontalAlignment(Element.ALIGN_LEFT);
- tableQz.getDefaultCell().setBorder(0);
- tableQz.getDefaultCell().setHorizontalAlignment(Element.ALIGN_RIGHT);
- Font zongJianFont = PdfUtils.setFont(DEFAULT_ZONGJIAN_FONT_SIZE);
- Font zongJianTitleFont = PdfUtils.setFont(DEFAULT_ZONGJIAN_FONT_SIZE);
- zongJianTitleFont.setStyle(Font.BOLD);
-
- for (int i = 0; i < 3; i++) {
- PdfPCell cell = new PdfPCell();
- cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
- cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
- cell.setPhrase(new Phrase("", defaultFont));
- cell.setBorder(Rectangle.NO_BORDER);
- tableQz.addCell(cell);
+ if (!zjjyandqmgzIstopFlag){
+ makeZjjyAndQmgzTab(tjOrder, zongJianYiShiQianMing, zongJianFont, zongJianTitleFont, value, document2, defaultFont);
}
-
-
- PdfPCell cell = new PdfPCell();
- cell.setBorder(Rectangle.NO_BORDER);
- cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
- cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
- cell.setPhrase(new Phrase("", defaultFont));
- cell.setRowspan(3);
- tableQz.addCell(cell);
-
- cell = new PdfPCell();
- cell.setBorder(Rectangle.NO_BORDER);
- cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
- cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
- cell.setPaddingTop(10);
- cell.setPaddingBottom(10);
- cell.setPaddingRight(4);
- cell.setPhrase(new Phrase("浣撴鍗曚綅鐩栫珷:", zongJianTitleFont));
-
- tableQz.addCell(cell);
-
- File file = new File(value + File.separator + "yinzhang.png");
- cell = new PdfPCell();
- cell.setBorder(Rectangle.NO_BORDER);
- cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
- cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
- cell.setPaddingTop(10);
- cell.setPaddingBottom(10);
- cell.setPaddingRight(4);
- if (!file.exists()) {
- cell.setPhrase(new Phrase("", zongJianFont));
- }else {
- FileInputStream fileInputStream = new FileInputStream(file);
- byte[] fileBytes = new byte[(int) file.length()];
- fileInputStream.read(fileBytes);
- fileInputStream.close();
- Image image = Image.getInstance(Base64.getDecoder().decode(Base64.getEncoder().encodeToString(fileBytes)));
- image.scaleToFit(90, 90);
- cell.addElement(image);
- }
- tableQz.addCell(cell);
-
- cell = new PdfPCell();
- cell.setBorder(Rectangle.NO_BORDER);
- cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
- cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
- cell.setPaddingTop(10);
- cell.setPaddingBottom(10);
- cell.setPaddingRight(4);
- cell.setPhrase(new Phrase("鎬绘鍖诲笀:", zongJianTitleFont));
- tableQz.addCell(cell);
-
-
- cell = new PdfPCell();
- cell.setBorder(Rectangle.NO_BORDER);
- cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
- cell.setHorizontalAlignment(Element.ALIGN_CENTER);
- cell.setPaddingTop(10);
- cell.setPaddingBottom(10);
- cell.setPaddingRight(4);
- String zongjianysname = sysConfigService.selectConfigByKey("pdf_report_zongjianysname");
- if (zongJianYiShiQianMing == null && StrUtil.isNotBlank(zongjianysname) && !zongjianysname.equals("鏃�")) {
- cell.setPhrase(new Phrase(zongjianysname, zongJianFont));
- tableQz.addCell(cell);
- } else if (zongJianYiShiQianMing == null && zongjianysname.equals("鏃�")) {
- String nickName = SecurityUtils.getLoginUser().getUser().getNickName();
- cell.setPhrase(new Phrase(nickName, zongJianFont));
- tableQz.addCell(cell);
- } else {
- byte[] bytes = Base64.getDecoder().decode(zongJianYiShiQianMing.getTemplate());
- Image image = Image.getInstance(bytes);
- image.scaleToFit(100, 100);
- cell.addElement(image);
- tableQz.addCell(cell);
- }
-
- cell = new PdfPCell();
- cell.setBorder(Rectangle.NO_BORDER);
- cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
- cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
- cell.setPaddingTop(10);
- cell.setPaddingBottom(10);
- cell.setPaddingRight(4);
- cell.setPhrase(new Phrase("鎬绘鏃ユ湡:", zongJianTitleFont));
- tableQz.addCell(cell);
-
- cell = new PdfPCell();
- cell.setBorder(Rectangle.NO_BORDER);
- cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
- cell.setHorizontalAlignment(Element.ALIGN_CENTER);
- cell.setPaddingTop(10);
- cell.setPaddingBottom(10);
- cell.setPaddingRight(4);
- cell.setPhrase(new Phrase(new SimpleDateFormat("yyyy-MM-dd").format(tjOrder.getCheckTime()), zongJianFont));
- tableQz.addCell(cell);
-
- document2.add(tableQz);
-
document2.close();
+
+
+ zongJianFont = PdfUtils.setFont(DEFAULT_ZONGJIAN_FONT_SIZE);
+ zongJianTitleFont = PdfUtils.setFont(DEFAULT_ZONGJIAN_FONT_SIZE);
+ zongJianTitleFont.setStyle(Font.BOLD);
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -1508,6 +1439,210 @@
} catch (Exception e) {
log.error(String.valueOf(e));
throw new Exception(e);
+ }
+ }
+
+ private void makeZjjyAndQmgzTab(TjOrder tjOrder, TjReportTemplate zongJianYiShiQianMing, Font zongJianFont, Font zongJianTitleFont, String value, Document document2, Font defaultFont) throws IOException, DocumentException {
+ PdfPCell cell;
+ String pdfQzgzpailie = sysConfigService.selectConfigByKey("pdf_qzgzpailie");
+ if (StrUtil.isNotBlank(pdfQzgzpailie) && pdfQzgzpailie.equalsIgnoreCase("h")){
+ zongJianFont = PdfUtils.setFont(DEFAULT_ZONGJIAN_FONT_SIZE - 2);
+ zongJianTitleFont = PdfUtils.setFont(DEFAULT_ZONGJIAN_FONT_SIZE - 2);
+ zongJianTitleFont.setStyle(Font.BOLD);
+ PdfPTable tableQz = new PdfPTable(new float[]{90f, 90f, 60f, 60f, 60f, 60f});
+ tableQz.setTotalWidth(PageSize.A4.getWidth() - 100);
+ tableQz.setLockedWidth(true);
+ tableQz.setHorizontalAlignment(Element.ALIGN_LEFT);
+ tableQz.getDefaultCell().setBorder(1);
+ tableQz.getDefaultCell().setHorizontalAlignment(Element.ALIGN_RIGHT);
+
+ cell = new PdfPCell(new Phrase("浣撴鍗曚綅鐩栫珷:", zongJianTitleFont));
+ cell.setBorder(Rectangle.NO_BORDER);
+ cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+ cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+ cell.setPadding(10);
+ tableQz.addCell(cell);
+
+ File file = new File(value + File.separator + "yinzhang.png");
+ cell = new PdfPCell();
+ cell.setBorder(Rectangle.NO_BORDER);
+ cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+ cell.setHorizontalAlignment(Element.ALIGN_CENTER);
+ cell.setPadding(10);
+ if (!file.exists()) {
+ cell.setPhrase(new Phrase("", zongJianFont));
+ } else {
+ FileInputStream fileInputStream = new FileInputStream(file);
+ byte[] fileBytes = new byte[(int) file.length()];
+ fileInputStream.read(fileBytes);
+ fileInputStream.close();
+ Image image = Image.getInstance(Base64.getDecoder().decode(Base64.getEncoder().encodeToString(fileBytes)));
+ image.scaleToFit(60, 60);
+ cell.addElement(image);
+ }
+ tableQz.addCell(cell);
+
+ cell = new PdfPCell(new Phrase("鎬绘鍖诲笀:", zongJianTitleFont));
+ cell.setBorder(Rectangle.NO_BORDER);
+ cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+ cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+ cell.setPadding(10);
+ tableQz.addCell(cell);
+
+ cell = new PdfPCell();
+ cell.setBorder(Rectangle.NO_BORDER);
+ cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+ cell.setHorizontalAlignment(Element.ALIGN_CENTER);
+ cell.setPadding(10);
+
+ String zongjianysname = sysConfigService.selectConfigByKey("pdf_report_zongjianysname");
+ if (zongJianYiShiQianMing == null && StrUtil.isNotBlank(zongjianysname) && !zongjianysname.equals("鏃�")) {
+ cell.setPhrase(new Phrase(zongjianysname, zongJianFont));
+ } else if (zongJianYiShiQianMing == null && zongjianysname.equals("鏃�")) {
+ String nickName = SecurityUtils.getLoginUser().getUser().getNickName();
+ cell.setPhrase(new Phrase(nickName, zongJianFont));
+ } else {
+ byte[] bytes = Base64.getDecoder().decode(zongJianYiShiQianMing.getTemplate());
+ Image image = Image.getInstance(bytes);
+ image.scaleToFit(60, 60);
+// cell.addElement(image);
+
+// cell.setPaddingTop(5);
+// cell.setPaddingBottom(15);
+ String pdfSfsgqz = sysConfigService.selectConfigByKey("pdf_sfsgqz");
+ if (StrUtil.isNotBlank(pdfSfsgqz) && pdfSfsgqz.equalsIgnoreCase("Y")) {
+ cell.setVerticalAlignment(Element.ALIGN_TOP);
+ }
+ cell.setImage(image);
+ }
+ tableQz.addCell(cell);
+
+ cell = new PdfPCell(new Phrase("鎬绘鏃ユ湡:", zongJianTitleFont));
+ cell.setBorder(Rectangle.NO_BORDER);
+ cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+ cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+ cell.setPadding(10);
+ tableQz.addCell(cell);
+
+ cell = new PdfPCell(new Phrase(new SimpleDateFormat("yyyy-MM-dd").format(tjOrder.getCheckTime()), zongJianFont));
+ cell.setBorder(Rectangle.NO_BORDER);
+ cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+ cell.setHorizontalAlignment(Element.ALIGN_CENTER);
+ cell.setPadding(10);
+ tableQz.addCell(cell);
+ document2.add(tableQz);
+ } else {
+ PdfPTable tableQz = new PdfPTable(new float[]{90f, 90f, 70f});
+ tableQz.setTotalWidth(PageSize.A4.getWidth() - 100);
+ tableQz.setLockedWidth(true);
+ tableQz.setHorizontalAlignment(Element.ALIGN_LEFT);
+// tableQz.getDefaultCell().setBorder(1);
+ tableQz.getDefaultCell().setHorizontalAlignment(Element.ALIGN_RIGHT);
+
+ for (int i = 0; i < 3; i++) {
+ cell = new PdfPCell();
+ cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+ cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+ cell.setPhrase(new Phrase("", defaultFont));
+ cell.setBorder(Rectangle.NO_BORDER);
+ tableQz.addCell(cell);
+ }
+
+
+ cell = new PdfPCell();
+ cell.setBorder(Rectangle.NO_BORDER);
+ cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+ cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+ cell.setPhrase(new Phrase("", defaultFont));
+ cell.setRowspan(3);
+ tableQz.addCell(cell);
+ cell = new PdfPCell();
+ cell.setBorder(Rectangle.NO_BORDER);
+ cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+ cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+ cell.setPaddingTop(10);
+ cell.setPaddingBottom(10);
+// cell.setPaddingRight(50);
+ cell.setPhrase(new Phrase("浣撴鍗曚綅鐩栫珷:", zongJianTitleFont));
+
+ tableQz.addCell(cell);
+
+ File file = new File(value + File.separator + "yinzhang.png");
+ cell = new PdfPCell();
+ cell.setBorder(Rectangle.NO_BORDER);
+ cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+ cell.setHorizontalAlignment(Element.ALIGN_LEFT);
+ cell.setPaddingTop(10);
+ cell.setPaddingBottom(10);
+// cell.setPaddingRight(50);
+ if (!file.exists()) {
+ cell.setPhrase(new Phrase("", zongJianFont));
+ }else {
+ FileInputStream fileInputStream = new FileInputStream(file);
+ byte[] fileBytes = new byte[(int) file.length()];
+ fileInputStream.read(fileBytes);
+ fileInputStream.close();
+ Image image = Image.getInstance(Base64.getDecoder().decode(Base64.getEncoder().encodeToString(fileBytes)));
+ image.scaleToFit(90, 90);
+ cell.addElement(image);
+ }
+ tableQz.addCell(cell);
+
+ cell = new PdfPCell();
+ cell.setBorder(Rectangle.NO_BORDER);
+ cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+ cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+ cell.setPaddingTop(10);
+ cell.setPaddingBottom(10);
+// cell.setPaddingRight(50);
+ cell.setPhrase(new Phrase("鎬绘鍖诲笀:", zongJianTitleFont));
+ tableQz.addCell(cell);
+
+
+ cell = new PdfPCell();
+ cell.setBorder(Rectangle.NO_BORDER);
+ cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+ cell.setHorizontalAlignment(Element.ALIGN_LEFT);
+ cell.setPaddingTop(10);
+ cell.setPaddingBottom(10);
+// cell.setPaddingRight(50);
+ String zongjianysname = sysConfigService.selectConfigByKey("pdf_report_zongjianysname");
+ if (zongJianYiShiQianMing == null && StrUtil.isNotBlank(zongjianysname) && !zongjianysname.equals("鏃�")) {
+ cell.setPhrase(new Phrase(zongjianysname, zongJianFont));
+ tableQz.addCell(cell);
+ } else if (zongJianYiShiQianMing == null && zongjianysname.equals("鏃�")) {
+ String nickName = SecurityUtils.getLoginUser().getUser().getNickName();
+ cell.setPhrase(new Phrase(nickName, zongJianFont));
+ tableQz.addCell(cell);
+ } else {
+ byte[] bytes = Base64.getDecoder().decode(zongJianYiShiQianMing.getTemplate());
+ Image image = Image.getInstance(bytes);
+ image.scaleToFit(100, 100);
+ cell.addElement(image);
+ tableQz.addCell(cell);
+ }
+
+ cell = new PdfPCell();
+ cell.setBorder(Rectangle.NO_BORDER);
+ cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+ cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+ cell.setPaddingTop(10);
+ cell.setPaddingBottom(10);
+// cell.setPaddingRight(50);
+ cell.setPhrase(new Phrase("鎬绘鏃ユ湡:", zongJianTitleFont));
+ tableQz.addCell(cell);
+
+ cell = new PdfPCell();
+ cell.setBorder(Rectangle.NO_BORDER);
+ cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+ cell.setHorizontalAlignment(Element.ALIGN_LEFT);
+ cell.setPaddingTop(10);
+ cell.setPaddingBottom(10);
+// cell.setPaddingRight(50);
+ cell.setPhrase(new Phrase(new SimpleDateFormat("yyyy-MM-dd").format(tjOrder.getCheckTime()), zongJianFont));
+ tableQz.addCell(cell);
+
+ document2.add(tableQz);
}
}
@@ -2423,60 +2558,129 @@
.collect(Collectors.toMap(LtkjHybgd::getJcxm, p -> p, (existing, replacement) -> existing))
.values());
- // hybgds=hybgds.stream().sorted(Comparator.comparing(LtkjHybgd::getJcxm, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
+
+ Map<String, List<LtkjHybgd>> listMap = hybgds.stream().collect(Collectors.groupingBy(LtkjHybgd::getJyjg));
+ boolean isGroupOnce = false;
+ String groupOnceProResult = "";
+ if (listMap.size()==1){
+ String firstKey = listMap.keySet().stream().findFirst().orElse(null);
+ LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(SysDictData::getDictType,"qj_type");
+ wrapper.eq(SysDictData::getDictLabel,firstKey);
+ List<SysDictData> dictList = sysDictDataService.list();
+ if (!dictList.isEmpty()) {
+ isGroupOnce = true;
+ groupOnceProResult = firstKey;
+ }
+ }
+
+ // hybgds=hybgds.stream().sorted(Comparator.comparing(LtkjHybgd::getJcxm, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
// hybgds = hybgds.stream()
// .sorted(Comparator.comparingInt(
// a -> a.getJcxm().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
// ))
// .collect(Collectors.toList());
+ if (!isGroupOnce){
+ // 澶х被椤圭洰鍚嶇О
+ //TODO 鏌ョ湅鏄惁鍙互鍔犳潯鐮佸彿杩涜鍖哄垎 鐜板湪鏄牴鎹」鐩悕绉拌繘琛屽尯鍒�
+ String xmmc = hysqd.getXmmc();
+ ArrayList<List<String>> lists = new ArrayList<>();
+ HashSet<String> hashSet = new HashSet<>();
+ String shsj = "";
+ for (LtkjHybgd hybgd : hybgds) {
+ shsj = hybgd.getShsj();
+ // 妫�鏌ラ」鐩�
+ String jcxm = hybgd.getJcxm() != null ? hybgd.getJcxm().trim() : null;
+ // 妫�楠岀粨鏋�
+ String jyjg = hybgd.getJyjg() != null ? hybgd.getJyjg().trim() : null;
+ // 缁撴灉鍗曚綅
+ String jgdw = hybgd.getJgdw() != null ? hybgd.getJgdw().trim() : null;
+ // 鑼冨洿鍊�
+ String fwz = hybgd.getFwz() != null ? hybgd.getFwz().trim() : null;
+ // 妫�楠屽尰甯�
+ // String jyys = hybgd.getJyys();
+ //瀹℃牳鍖荤敓
+ String shysmc = hybgd.getShysmc() != null ? hybgd.getShysmc().trim() : null;
+ // 瀹℃牳鍖诲笀缂栫爜
+ String shys = hybgd.getShys() != null ? hybgd.getShys().trim() : null;
+ String ycbz = "";
- // 澶х被椤圭洰鍚嶇О
- String xmmc = hysqd.getXmmc();
- ArrayList<List<String>> lists = new ArrayList<>();
- HashSet<String> hashSet = new HashSet<>();
- String shsj = "";
- for (LtkjHybgd hybgd : hybgds) {
+ if (jyjg != null && StrUtil.isNotBlank(jyjg) && fwz != null && StrUtil.isNotBlank(fwz)) {
+ try {
+ String[] fwzs = fwz.split("-");
+ BigDecimal min = new BigDecimal(fwzs[0]);
+ BigDecimal max = new BigDecimal(fwzs[1]);
+ BigDecimal jyjgval = new BigDecimal(jyjg);
+ // 姣旇緝妫�楠岀粨鏋滃拰鑼冨洿鍊�
+ if (jyjgval.compareTo(min) < 0) {
+ // jyjg 灏忎簬鑼冨洿鏈�灏忓�硷紝娣诲姞涓嬬澶�
+ // jyjg = jyjg + " 鈫�";
+ ycbz = "鈫�";
+ } else if (jyjgval.compareTo(max) > 0) {
+ // jyjg 澶т簬鑼冨洿鏈�澶у�硷紝娣诲姞涓婄澶�
+ // jyjg = jyjg + " 鈫�";
+ ycbz = "鈫�";
+ }
+ } catch (Exception ignored) {
+ }
+ }
+ // LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
+ // queryWrapper.eq(SysUser::getUserName,jyys);
+ // List<SysUser> sysUsers = userService.list(queryWrapper);
+ // if (!sysUsers.isEmpty())
+ // hashSet.add(sysUsers.get(0).getNickName());
+ String key = sysConfigService.selectConfigByKey("is_report_pdf_use_ysqm");
+ if (null != shys && null != shysmc && key.equals("Y")) {
+ hashSet.add(shysmc + "|" + shys);
+ } else {
+ if (null != shysmc) hashSet.add(shysmc);
+ }
+ ArrayList<String> strings = new ArrayList<>();
+ strings.add(jcxm);
+ strings.add(jyjg);
+ strings.add(ycbz);
+ strings.add(jgdw);
+ strings.add(fwz);
+ strings.add(hybgd.getJcxmid());
+ strings.add(hysqd.getXmid());
+ lists.add(strings);
+ }
+ if (!lists.isEmpty()) {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("data", lists);
+ map.put("jyys", hashSet);
+ if (StrUtil.isNotBlank(shsj)) {
+ shsj = shsj.split(" ")[0];
+ }
+ map.put("shsj", shsj);
+ data.put(xmmc, map);
+ }
+ }else {
+ String xmmc = hysqd.getXmmc();
+ ArrayList<List<String>> lists = new ArrayList<>();
+ HashSet<String> hashSet = new HashSet<>();
+ LtkjHybgd hybgd = hybgds.get(0);
+ String shsj = "";
shsj = hybgd.getShsj();
- // 妫�鏌ラ」鐩�
- String jcxm = hybgd.getJcxm() != null ? hybgd.getJcxm().trim() : null;
- // 妫�楠岀粨鏋�
- String jyjg = hybgd.getJyjg() != null ? hybgd.getJyjg().trim() : null;
- // 缁撴灉鍗曚綅
String jgdw = hybgd.getJgdw() != null ? hybgd.getJgdw().trim() : null;
- // 鑼冨洿鍊�
String fwz = hybgd.getFwz() != null ? hybgd.getFwz().trim() : null;
- // 妫�楠屽尰甯�
- // String jyys = hybgd.getJyys();
- //瀹℃牳鍖荤敓
String shysmc = hybgd.getShysmc() != null ? hybgd.getShysmc().trim() : null;
- // 瀹℃牳鍖诲笀缂栫爜
String shys = hybgd.getShys() != null ? hybgd.getShys().trim() : null;
String ycbz = "";
-
- if (jyjg != null && StrUtil.isNotBlank(jyjg) && fwz != null && StrUtil.isNotBlank(fwz)) {
+ if (StrUtil.isNotBlank(groupOnceProResult) && fwz != null && StrUtil.isNotBlank(fwz)) {
try {
String[] fwzs = fwz.split("-");
BigDecimal min = new BigDecimal(fwzs[0]);
BigDecimal max = new BigDecimal(fwzs[1]);
- BigDecimal jyjgval = new BigDecimal(jyjg);
- // 姣旇緝妫�楠岀粨鏋滃拰鑼冨洿鍊�
+ BigDecimal jyjgval = new BigDecimal(groupOnceProResult);
if (jyjgval.compareTo(min) < 0) {
- // jyjg 灏忎簬鑼冨洿鏈�灏忓�硷紝娣诲姞涓嬬澶�
- // jyjg = jyjg + " 鈫�";
ycbz = "鈫�";
} else if (jyjgval.compareTo(max) > 0) {
- // jyjg 澶т簬鑼冨洿鏈�澶у�硷紝娣诲姞涓婄澶�
- // jyjg = jyjg + " 鈫�";
ycbz = "鈫�";
}
} catch (Exception ignored) {
}
}
- // LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
- // queryWrapper.eq(SysUser::getUserName,jyys);
- // List<SysUser> sysUsers = userService.list(queryWrapper);
- // if (!sysUsers.isEmpty())
- // hashSet.add(sysUsers.get(0).getNickName());
String key = sysConfigService.selectConfigByKey("is_report_pdf_use_ysqm");
if (null != shys && null != shysmc && key.equals("Y")) {
hashSet.add(shysmc + "|" + shys);
@@ -2484,16 +2688,14 @@
if (null != shysmc) hashSet.add(shysmc);
}
ArrayList<String> strings = new ArrayList<>();
- strings.add(jcxm);
- strings.add(jyjg);
+ strings.add(xmmc);
+ strings.add(groupOnceProResult);
strings.add(ycbz);
strings.add(jgdw);
strings.add(fwz);
strings.add(hybgd.getJcxmid());
strings.add(hysqd.getXmid());
lists.add(strings);
- }
- if (!lists.isEmpty()) {
HashMap<String, Object> map = new HashMap<>();
map.put("data", lists);
map.put("jyys", hashSet);
@@ -2702,31 +2904,66 @@
tjOrderDetails = tjOrderDetails.stream().filter(i -> StrUtil.isNotBlank(i.getProResult())).collect(Collectors.toList());
tjOrderDetails = new ArrayList<>(tjOrderDetails.stream()
.collect(Collectors.toMap(TjOrderDetail::getProId, i -> i, (existing, replacement) -> existing)).values());
- for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
- TjProject tjProject = projectService.getById(String.valueOf(tjOrderDetail.getProId()));
- if (null != tjProject && tjProject.getNeedReport().equals("Y")) {
- tjOrderDetail.setProject(tjProject);
- 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());
- tjPdfVO.setExc(tjOrderDetail.getExceptionDesc());
- if (null != tjProject.getProMetering()) {
- tjPdfVO.setCompany(tjProject.getProMetering());
- } else {
- tjPdfVO.setCompany("/");
- }
- 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()));
- tjPdfVOS.add(tjPdfVO);
+
+ boolean isGroupOnce = false;
+ String groupOnceProResult = "";
+ if (tjOrderDetails.size() > 1) {
+ Map<String, List<TjOrderDetail>> listMap = tjOrderDetails.stream().collect(Collectors.groupingBy(TjOrderDetail::getProResult));
+ if (listMap.size() == 1){
+ String firstKey = listMap.keySet().stream().findFirst().orElse(null);
+ LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(SysDictData::getDictType,"qj_type");
+ wrapper.eq(SysDictData::getDictLabel,firstKey);
+ List<SysDictData> list = sysDictDataService.list();
+ if (!list.isEmpty()) {
+ isGroupOnce = true;
+ groupOnceProResult = firstKey;
}
}
}
+
+ if (!isGroupOnce) {
+ for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
+ TjProject tjProject = projectService.getById(String.valueOf(tjOrderDetail.getProId()));
+ if (null != tjProject && tjProject.getNeedReport().equals("Y")) {
+ tjOrderDetail.setProject(tjProject);
+
+ 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());
+ tjPdfVO.setExc(tjOrderDetail.getExceptionDesc());
+ if (null != tjProject.getProMetering()) {
+ tjPdfVO.setCompany(tjProject.getProMetering());
+ } else {
+ tjPdfVO.setCompany("/");
+ }
+ 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()));
+ tjPdfVOS.add(tjPdfVO);
+ }
+ }
+ }
+ }else {
+ TjOrderRemark orderRemark = entry.getKey();
+ TjProject project = projectService.getById(orderRemark.getProId());
+ if (null != project && project.getNeedReport().equals("Y") && orderRemark.getType() == 1) {
+ TjPdfVO tjPdfVO = new TjPdfVO();
+ tjPdfVO.setProName(project.getProName());
+ tjPdfVO.setProResult(groupOnceProResult);
+ tjPdfVO.setExc(0L);
+ tjPdfVO.setCompany("/");
+ tjPdfVO.setProId(String.valueOf(orderRemark.getProId()));
+ tjPdfVO.setPid(String.valueOf(orderRemark.getProId()));
+ tjPdfVO.setXh(1);
+ tjPdfVOS.add(tjPdfVO);
+ }
+ }
if(!tjPdfVOS.isEmpty()){
// tjPdfVOS=tjPdfVOS.stream().sorted(Comparator.comparing(TjPdfVO::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
// tjPdfVOS = tjPdfVOS.stream()
--
Gitblit v1.8.0