From 983d95bdcbb273b4a78efd0058a2a35141be1b51 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 08 四月 2025 18:00:12 +0800
Subject: [PATCH] zjh20250408
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 462 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 305 insertions(+), 157 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 5377e42..e1032bd 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
@@ -34,8 +34,10 @@
import com.ltkj.system.service.ISysUserService;
import com.ltkj.web.config.pdfutils.PdfUtils;
import com.ltkj.web.controller.system.SysDeptController;
+import jodd.util.StringUtil;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
+import net.sf.ehcache.search.aggregator.Count;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@@ -995,138 +997,250 @@
// List<Map<String, Object>> jiancha = new ArrayList<>();
- paragraph = PdfUtils.setParagraph(defaultTitleFont, "妫�鏌ョ患杩帮細");
- paragraph.setSpacingBefore(3f);
- paragraph.setSpacingAfter(2f);
- document2.add(paragraph);
int xmXh = 1;
-
-// orderDetails=orderDetails.stream().sorted(Comparator.comparing(TjOrderDetail::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
-// orderDetails = orderDetails.stream()
-// .sorted(Comparator.comparingInt(
-// tjPdfVO -> tjPdfVO.getProName().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
-// ))
-// .collect(Collectors.toList());
-
Map<Long, List<TjOrderDetail>> collect = orderDetails.stream().collect(Collectors.groupingBy(TjOrderDetail::getProId));
- for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) {
- List<CsProVo> proVos = deptEntry.getValue();
- if (proVos.size() > 1) {
- proVos = proVos.stream()
- .sorted(Comparator.comparingLong(CsProVo::getProId))
- .collect(Collectors.toList());
- }
- // 宸茬粡閬嶅巻杩囩殑
- ArrayList<String> jianYanYiDa = new ArrayList<>();
- for (CsProVo proVo : proVos) {
+ LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderYcxm::getTjh, tjOrder.getTjNumber());
+ List<TjOrderYcxm> ycxms = ycxmService.list(wq);
+ boolean isBr = false;
+ if (null != ycxms && !ycxms.isEmpty()) {
- // 妫�鏌�
- for (Map.Entry<Long, List<TjOrderDetail>> entry : collect.entrySet()) {
- if (!entry.getKey().equals(proVo.getProId())) continue;
- List<TjOrderDetail> details = entry.getValue();
- String xmmc = proVo.getProName();
-// String xmmc = details.get(0).getProName();
- boolean isXmWrite = false;
+ paragraph = PdfUtils.setParagraph(defaultTitleFont, "妫�鏌ョ患杩帮細");
+ paragraph.setSpacingBefore(3f);
+ paragraph.setSpacingAfter(2f);
+ document2.add(paragraph);
+ isBr = true;
-// details=details.stream().sorted(Comparator.comparing(TjOrderDetail::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
-// details = details.stream()
-// .sorted(Comparator.comparingInt(
-// tjPdfVO -> tjPdfVO.getProName().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
-// ))
-// .collect(Collectors.toList());
- int index = 1;
- for (TjOrderDetail detail : details) {
-// if (!entry.getKey().equals(detail.getProId())) continue;
- if (!isXmWrite) {
- paragraph = new Paragraph(xmXh + ". " + xmmc, defaultFont);
- paragraph.setAlignment(Element.ALIGN_LEFT);
- document2.add(paragraph);
- isXmWrite = true;
- }
- String result = detail.getProResult();
- if (StrUtil.isNotBlank(result)) {
- result = result.replaceAll("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�", "");
-// result = result.replaceAll("", "");
-// String[] split = result.split("\n");
-// StringBuilder builder = new StringBuilder();
-// for (String s : split) {
-// if (StrUtil.isBlank(s.replaceAll("\n", "").trim())) continue;
-// builder.append(" (").append(index).append(")").append(s).append("\n");
-// index++;
-// }
- StringBuilder builder = new StringBuilder();
- if (StrUtil.isBlank(result.replaceAll("\n", "").trim())) continue;
- builder.append(" (").append(index).append(")").append(detail.getProName()).append(": ").append(result).append("\n");
- index++;
+ Map<String, List<TjOrderYcxm>> stringListMap = ycxms.stream().collect(Collectors.groupingBy(TjOrderYcxm::getParentName));
- result = builder.toString();
- }
- paragraph = new Paragraph(result, defaultFont);
+ for (Map.Entry<String, List<TjOrderYcxm>> entry : stringListMap.entrySet()) {
+ List<TjOrderYcxm> details = entry.getValue();
+ String xmmc = entry.getKey();
+ boolean isXmWrite = false;
+ int index = 1;
+ for (TjOrderYcxm detail : details) {
+ if (!isXmWrite) {
+ paragraph = new Paragraph(xmXh + ". " + xmmc, defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
+ isXmWrite = true;
}
- if (isXmWrite) {
- paragraph = PdfUtils.setParagraph(defaultFont, "");
- paragraph.setLeading(0f);
- paragraph.setSpacingBefore(0f);
- paragraph.setSpacingAfter(5f);
- document2.add(paragraph);
- xmXh++;
- }
- }
+ String result = detail.getJcjg();
+ if (StrUtil.isNotBlank(result)) {
+ result = result.replaceAll("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�", "");
+ StringBuilder builder = new StringBuilder();
+ if (StrUtil.isBlank(result.replaceAll("\n", "").trim())) continue;
- // 妫�楠�
- for (Map.Entry<String, Object> item : map.entrySet()) {
- String xmmc = item.getKey();
- HashMap<String, Object> entryValue = (HashMap<String, Object>) item.getValue();
- ArrayList<List<String>> lists = (ArrayList<List<String>>) entryValue.get("data");
- boolean isXmWrite = false;
- int index = 1;
- for (List<String> i : lists) {
- if (!i.get(6).contains(String.valueOf(proVo.getProId()))) continue;
- if (i.contains("鈫�") || i.contains("鈫�")) {
- if (jianYanYiDa.contains(i.get(5))) continue;
- jianYanYiDa.add(i.get(5));
+ builder.append(" (").append(index).append(")").append(detail.getJcxm()).append(": ")
+ .append(result.replaceAll("\n", "").trim()).append("\n");
+ index++;
+
+ result = builder.toString();
+ }
+ paragraph = new Paragraph(result, defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ }
+ if (isXmWrite) {
+ paragraph = PdfUtils.setParagraph(defaultFont, "");
+ paragraph.setLeading(0f);
+ paragraph.setSpacingBefore(0f);
+ paragraph.setSpacingAfter(5f);
+ document2.add(paragraph);
+ xmXh++;
+ }
+ }
+ }
+ /* else {
+
+ if (!collect.isEmpty() || !map.isEmpty()){
+ paragraph = PdfUtils.setParagraph(defaultTitleFont, "妫�鏌ョ患杩帮細");
+ paragraph.setSpacingBefore(3f);
+ paragraph.setSpacingAfter(2f);
+ document2.add(paragraph);
+ isBr = true;
+ }
+
+ for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) {
+ List<CsProVo> proVos = deptEntry.getValue();
+ if (proVos.size() > 1) {
+ proVos = proVos.stream()
+ .sorted(Comparator.comparingLong(CsProVo::getProId))
+ .collect(Collectors.toList());
+ }
+ // 宸茬粡閬嶅巻杩囩殑
+ ArrayList<String> jianYanYiDa = new ArrayList<>();
+ for (CsProVo proVo : proVos) {
+
+ // 妫�鏌�
+ for (Map.Entry<Long, List<TjOrderDetail>> entry : collect.entrySet()) {
+ if (!entry.getKey().equals(proVo.getProId())) continue;
+ List<TjOrderDetail> details = entry.getValue();
+ String xmmc = proVo.getProName();
+// String xmmc = details.get(0).getProName();
+ boolean isXmWrite = false;
+ int index = 1;
+ for (TjOrderDetail detail : details) {
+// if (!entry.getKey().equals(detail.getProId())) continue;
if (!isXmWrite) {
paragraph = new Paragraph(xmXh + ". " + xmmc, defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
isXmWrite = true;
}
- String content = " (" + index + ") " + i.get(0) + "锛�" + i.get(1) + " " + i.get(3) + " " + i.get(4) + " " + i.get(2);
- paragraph = new Paragraph(content, defaultFont);
+ String result = detail.getProResult();
+ if (StrUtil.isNotBlank(result)) {
+ result = result.replaceAll("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�", "");
+ StringBuilder builder = new StringBuilder();
+ if (StrUtil.isBlank(result.replaceAll("\n", "").trim())) continue;
+ builder.append(" (").append(index).append(")").append(detail.getProName()).append(": ").append(result).append("\n");
+ index++;
+
+ result = builder.toString();
+ }
+ paragraph = new Paragraph(result, defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
- index++;
+ }
+ if (isXmWrite) {
+ paragraph = PdfUtils.setParagraph(defaultFont, "");
+ paragraph.setLeading(0f);
+ paragraph.setSpacingBefore(0f);
+ paragraph.setSpacingAfter(5f);
+ document2.add(paragraph);
+ xmXh++;
}
}
- if (isXmWrite) {
- paragraph = PdfUtils.setParagraph(defaultFont, "");
- paragraph.setSpacingBefore(0f);
- paragraph.setSpacingAfter(5f);
- document2.add(paragraph);
- xmXh++;
+
+ // 妫�楠�
+ for (Map.Entry<String, Object> item : map.entrySet()) {
+ String xmmc = item.getKey();
+ HashMap<String, Object> entryValue = (HashMap<String, Object>) item.getValue();
+ ArrayList<List<String>> lists = (ArrayList<List<String>>) entryValue.get("data");
+ boolean isXmWrite = false;
+ int index = 1;
+ for (List<String> i : lists) {
+ if (!i.get(6).contains(String.valueOf(proVo.getProId()))) continue;
+ if (i.contains("鈫�") || i.contains("鈫�")) {
+ if (jianYanYiDa.contains(i.get(5))) continue;
+ jianYanYiDa.add(i.get(5));
+ if (!isXmWrite) {
+ paragraph = new Paragraph(xmXh + ". " + xmmc, defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ isXmWrite = true;
+ }
+ String content = " (" + index + ") " + i.get(0) + "锛�" + i.get(1) + " " + i.get(3) + " " + i.get(4) + " " + i.get(2);
+ paragraph = new Paragraph(content, defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ index++;
+ }
+ }
+ if (isXmWrite) {
+ paragraph = PdfUtils.setParagraph(defaultFont, "");
+ paragraph.setSpacingBefore(0f);
+ paragraph.setSpacingAfter(5f);
+ document2.add(paragraph);
+ xmXh++;
+ }
}
}
}
+ } */
+
+
+
+ if(isBr) {
+ paragraph = PdfUtils.setParagraph(defaultFont, "");
+ paragraph.setLeading(0f);
+ paragraph.setSpacingBefore(10f);
+ paragraph.setSpacingAfter(10f);
+ document2.add(paragraph);
}
- paragraph = PdfUtils.setParagraph(defaultFont, "");
- paragraph.setLeading(0f);
- paragraph.setSpacingBefore(10f);
- paragraph.setSpacingAfter(10f);
- document2.add(paragraph);
- paragraph = PdfUtils.setParagraph(defaultTitleFont, "鍖荤敓寤鸿锛�");
- paragraph.setSpacingBefore(3f);
- paragraph.setSpacingAfter(2f);
- document2.add(paragraph);
+
xmXh = 0;
- LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
- wq.eq(TjOrderYcxm::getTjh, tjOrder.getTjNumber());
- List<TjOrderYcxm> ycxms = ycxmService.list(wq);
if (null != ycxms && !ycxms.isEmpty()) {
- for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) {
+
+ paragraph = PdfUtils.setParagraph(defaultTitleFont, "鍖荤敓寤鸿锛�");
+ paragraph.setSpacingBefore(3f);
+ paragraph.setSpacingAfter(2f);
+ document2.add(paragraph);
+
+ Map<String, List<TjOrderYcxm>> stringListMap = ycxms.stream().collect(Collectors.groupingBy(TjOrderYcxm::getParentName));
+
+ for (Map.Entry<String, List<TjOrderYcxm>> entry : stringListMap.entrySet()) {
+ List<TjOrderYcxm> details = entry.getValue();
+ if(null !=details && !details.isEmpty()){
+ details= details.stream()
+ .sorted(Comparator.comparing(TjOrderYcxm::getJcxm))
+ .collect(Collectors.toList());
+ boolean isXmWrite = false;
+ int index = 1;
+ int index1 = 1;
+ for (TjOrderYcxm detail : details) {
+ String xmmc = entry.getKey().toString();
+ if (!isXmWrite) {
+ xmXh++;
+ paragraph = new Paragraph("銆�" + xmXh + "." + xmmc + "銆�", defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ isXmWrite = true;
+ }
+ String result = detail.getJcjg();
+ 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.replaceAll("\n", "").trim()).append("\n");
+ index1++;
+
+ result = builder.toString();
+ }
+ if (StrUtil.isNotBlank(result)) {
+ paragraph = new Paragraph(result, defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ } else {
+ paragraph = new Paragraph("寤鸿瀹氭湡澶嶆煡", defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ }
+ String str = " ";
+ List<Map<String, Object>> maps = new ArrayList<>();
+
+ String jynr = detail.getJynr();
+ JSONArray array = JSONUtil.parseArray(jynr);
+ for (Object object : array) {
+ Map<String,Object> objectMap=new HashMap<>();
+ JSONObject jsonObject = (JSONObject) object;
+ String bt = jsonObject.getStr("bt");
+ String nr = jsonObject.getStr("nr");
+ objectMap.put("bt",bt);
+ objectMap.put("nr",nr);
+ if(null !=bt || null !=nr) maps.add(objectMap);
+ }
+ 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);
+ }
+ index++;
+ paragraph = PdfUtils.setParagraph(defaultFont, "");
+ paragraph.setLeading(0f);
+ paragraph.setSpacingBefore(0f);
+ paragraph.setSpacingAfter(5f);
+ document2.add(paragraph);
+ }
+ }
+ }
+
+ /*for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) {
List<CsProVo> proVos = deptEntry.getValue();
if (proVos.size() > 1) {
proVos = proVos.stream()
@@ -1278,8 +1392,17 @@
}
}
}
+ }*/
+ }
+ /* else {
+
+ if (!collect.isEmpty() || !map.isEmpty()){
+ paragraph = PdfUtils.setParagraph(defaultTitleFont, "鍖荤敓寤鸿锛�");
+ paragraph.setSpacingBefore(3f);
+ paragraph.setSpacingAfter(2f);
+ document2.add(paragraph);
}
- } else {
+
for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) {
List<CsProVo> proVos = deptEntry.getValue();
if (proVos.size() > 1) {
@@ -1306,9 +1429,6 @@
}
String result = detail.getProResult();
if (StrUtil.isNotBlank(result)) {
-// result = result.replaceAll(" ","").replaceAll("\t","");
-// result = result.replaceAll("\n鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�", "");
-// result = "\n " + result.replaceAll("\n", "\n ");
int index1 = 1;
String[] split = result.split("\n");
// boolean contains = result.contains("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�");
@@ -1319,15 +1439,8 @@
builder.append(" (").append(index1).append(")").append(s).append("\n");
index1++;
}
-// if (!contains) builder.append(" (").append(index1).append(")").append("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�");
-// if (!contains) builder.append(" (").append(index1).append(")").append(" ");
-// else builder.substring(0,builder.length() - 1);
result = builder.toString();
}
-// String content = " (" + index + ") " + detail.getProName() + "锛�" + result;
-// content = content.replaceAll("[\\n\\r]+$", "");
-// content = content.replaceAll("\\s+$", "");
-// paragraph = new Paragraph(content, defaultFont);
if (StrUtil.isNotBlank(result)) {
paragraph = new Paragraph(result, defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
@@ -1338,15 +1451,11 @@
document2.add(paragraph);
}
String str = " ";
-// List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(entry.getKey().toString(),"",
-// detail.getYcbz(),tjOrder.getTjNumber(),detail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
-// .replaceAll("[ 娴嬪畾妫�娴媇",""),detail.getProResult());
List<Map<String, Object>> maps = new ArrayList<>();
if (detail.getDeptId().equals("2")) {
String[] split = result.split("銆倈,|锛�");
for (String s : split) {
s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "");
-// Map<String,Object> mapss= tjRulesService.getyichangxiangmujianyiguizeJianCha(s);
Map<String, Object> mapss = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(detail.getKs(), s, "0");
if (null != mapss) {
Object bt = mapss.get("bt");
@@ -1359,7 +1468,6 @@
for (Map<String, Object> objectMap : collect1) {
String content = str + objectMap.get("bt").toString() + objectMap.get("nr").toString();
-// if (StrUtil.isBlank(content)) content = " 鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
if (StrUtil.isBlank(content)) content = " ";
paragraph = new Paragraph(content, defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
@@ -1396,38 +1504,14 @@
paragraph = new Paragraph(content, defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
- // 绗叚浣嶆槸lis椤圭洰id
-// LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
-// wrapper.eq(TjProject::getLisXmbm,i.get(5));
-// TjProject project = projectService.getOne(wrapper);
-// if (project != null) {
-// LambdaQueryWrapper<TjRules> queryWrapper = new LambdaQueryWrapper<>();
-// queryWrapper.eq(TjRules::getProId,project.getProId());
-// List<TjRules> rules = tjRulesService.list(queryWrapper);
-// if (!rules.isEmpty()){
-//
-// }
String str = " ";
- List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(i.get(5), "",
- i.get(2), tjOrder.getTjNumber(), i.get(0).replaceAll("[锛�(][^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇", ""), i.get(1));
+ List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(i.get(5), i.get(0).replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", ""),
+ i.get(2), tjOrder.getTjNumber(), i.get(0).replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", ""), i.get(1));
+
if (!maps.isEmpty()) {
for (Map<String, Object> objectMap : maps) {
-// paragraph = new Paragraph(str+"寤鸿鏍囬",defaultFont);
-// paragraph.setAlignment(Element.ALIGN_LEFT);
-// document2.add(paragraph);
-//
-// paragraph = new Paragraph(str+objectMap.get("bt").toString(),defaultFont);
-// paragraph.setAlignment(Element.ALIGN_LEFT);
-// document2.add(paragraph);
-//
-// paragraph = new Paragraph(str+"寤鸿鍐呭",defaultFont);
-// paragraph.setAlignment(Element.ALIGN_LEFT);
-// document2.add(paragraph);
-//
-// paragraph = new Paragraph(str+objectMap.get("nr").toString(),defaultFont);
-// paragraph.setAlignment(Element.ALIGN_LEFT);
-// document2.add(paragraph);
Object bt = objectMap.get("bt");
Object nr = objectMap.get("nr");
if (null != bt && null != nr) {
@@ -1435,7 +1519,6 @@
if (StrUtil.isBlank(content)) content1 = " ";
paragraph = new Paragraph(content1, defaultFont);
}
-// if (StrUtil.isBlank(content)) content1 = " 鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
}
@@ -1457,7 +1540,7 @@
}
}
}
- }
+ } */
for (int i = 0; i < 1; i++) {
paragraph = PdfUtils.setParagraph(defaultFont, "");
@@ -1538,7 +1621,10 @@
tableQz.addCell(cell);
- File file = new File(value + File.separator + "yinzhang.png");
+ String keyId = DataSourceContextHolder.getDataSourceKey();
+ keyId = keyId.replace("ltkjpeis10_","");
+
+ File file = new File(value + File.separator + keyId + File.separator + "yinzhang.png");
cell = new PdfPCell();
cell.setBorder(Rectangle.NO_BORDER);
cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
@@ -2143,7 +2229,61 @@
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);
@@ -2532,10 +2672,18 @@
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()
+ .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());
// hybgds = hybgds.stream()
// .sorted(Comparator.comparingInt(
--
Gitblit v1.8.0