From f6b439c8958e7e0520057404b7226c7507f5d1a1 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 11 四月 2024 18:01:23 +0800
Subject: [PATCH] 报告生成功能：支持数据填充，发现单元格合并bug，发现模板重复
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 137 +++++++++++++++++++++++++++++----------------
inspect-server/pom.xml | 5 +
inspect-server/src/main/java/com/yuanchu/mom/service/impl/DetailTablePolicy.java | 12 ++++
inspect-server/src/main/resources/static/template-table.docx | 0
4 files changed, 106 insertions(+), 48 deletions(-)
diff --git a/inspect-server/pom.xml b/inspect-server/pom.xml
index 63ab229..2d00a40 100644
--- a/inspect-server/pom.xml
+++ b/inspect-server/pom.xml
@@ -42,5 +42,10 @@
<artifactId>spire.doc.free</artifactId>
<version>5.2.0</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>5.3.18</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/DetailTablePolicy.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/DetailTablePolicy.java
new file mode 100644
index 0000000..f698ce0
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/DetailTablePolicy.java
@@ -0,0 +1,12 @@
+package com.yuanchu.mom.service.impl;
+
+import com.deepoove.poi.policy.DynamicTableRenderPolicy;
+import org.apache.poi.xwpf.usermodel.XWPFTable;
+
+public class DetailTablePolicy extends DynamicTableRenderPolicy {
+ @Override
+ public void render(XWPFTable xwpfTable, Object data) throws Exception {
+ if (null == data) return;
+
+ }
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index b1c4eeb..f751863 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -16,9 +16,6 @@
import com.deepoove.poi.data.*;
import com.deepoove.poi.data.style.Style;
import com.deepoove.poi.data.style.TableStyle;
-import com.deepoove.poi.render.Render;
-import com.deepoove.poi.xwpf.XWPFHighlightColor;
-import com.spire.doc.Table;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
@@ -32,12 +29,8 @@
import com.yuanchu.mom.utils.GiveCode;
import com.yuanchu.mom.utils.QueryWrappers;
import com.yuanchu.mom.vo.InsOrderPlanVO;
-import lombok.AllArgsConstructor;
-import org.apache.commons.lang3.ArrayUtils;
import org.apache.poi.xwpf.usermodel.TableRowAlign;
-import org.apache.poi.xwpf.usermodel.TextAlignment;
import org.apache.poi.xwpf.usermodel.XWPFTable;
-import org.apache.poi.xwpf.usermodel.XWPFTableCell;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -45,7 +38,6 @@
import javax.annotation.Resource;
import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
@@ -233,78 +225,126 @@
InsOrder insOrder = insOrderMapper.selectById(orderId);
Map<String, String> user = insProductMapper.selectUserById(insOrder.getUserId());
List<SampleProductDto> samples = insSampleMapper.selectSampleProductListByOrderId(orderId);
+ InsReport insReport = new InsReport();
+ insReport.setCode(giveCode.giveCode("JCZX/TX-", "ins_report", "-", "yyMMdd"));
+ insReport.setInsOrderId(orderId);
Set<Integer> set = new HashSet<>();
Map<Integer, String> map2 = new HashMap<>();
- List<TableRenderData> tables = new ArrayList<>();
+ List<Map<String, Object>> tables = new ArrayList<>();
samples.forEach(a -> {
getTemplateThing(set, map2, a);
+ AtomicInteger index = new AtomicInteger();
a.getInsProduct().forEach(b -> {
- if(b.getTemplate().size()==0){
+ if (b.getTemplate().size() == 0) {
return;
}
-// System.out.println(b.getTemplate());
-// System.out.println(b.getStyle());
Set<Integer> set2 = new HashSet<>();
List<RowRenderData> rows = new ArrayList<>();
List<TextRenderData> text = new ArrayList<>();
RowRenderData rowRenderData;
Set<String> delSet = new HashSet<>();
+ String pr = null;
for (JSONObject jo1 : b.getTemplate()) {
JSONObject v = JSON.parseObject(JSON.toJSONString(jo1.get("v")));
- if(v.get("ps")!=null){
-// System.out.println(v);
- if("妫�楠屽��".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value")+"")){
- delSet.add(jo1.get("c")+"");
+ if (v.get("ps") != null) {
+ if ("妫�楠屽��".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "") || "璁惧".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "")) {
+ delSet.add(jo1.get("c") + "");
+ }
+ if ("妫�楠屽瓙椤�".equals(JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "")) {
+ if (v.get("v").equals(b.getInspectionItemSubclass())) {
+ pr = jo1.get("r") + "";
+ }
}
}
}
- for (int i = 0;i<b.getTemplate().size();i++) {
+ for (int i = 0; i < b.getTemplate().size(); i++) {
JSONObject jo1 = b.getTemplate().get(i);
- if (delSet.stream().anyMatch(e->e.equals(jo1.get("c")+""))){
+ if (delSet.stream().anyMatch(e -> e.equals(jo1.get("c") + ""))) {
continue;
}
TextRenderData textRenderData = new TextRenderData();
- if (set2.add(Integer.parseInt(jo1.get("r") + "")) || i == b.getTemplate().size()-1) {
- if(text.size() > 0){
+ if (set2.add(Integer.parseInt(jo1.get("r") + ""))) {
+ if (text.size() > 0) {
TextRenderData[] text2 = text.toArray(new TextRenderData[0]);
- rowRenderData = Rows.of(text2).create();
+ rowRenderData = Rows.of(text2).center().rowAtleastHeight(1).create();
rows.add(rowRenderData);
text = new ArrayList<>();
}
}
JSONObject v = JSON.parseObject(JSON.toJSONString(jo1.get("v")));
- textRenderData.setText(v.get("v")==null?"":v.get("v")+"");
+ if (pr.equals(jo1.get("r") + "") && v.get("ps") != null) {
+ if (JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value").equals("瑕佹眰鍊�")) {
+ textRenderData.setText(b.getAsk());
+ } else if (JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value").equals("鍗曚綅")) {
+ textRenderData.setText(b.getUnit());
+ } else if (JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value").equals("缁撹")) {
+ switch (b.getInsResult()) {
+ case 1:
+ textRenderData.setText("鈭�");
+ break;
+ case 0:
+ textRenderData.setText("脳");
+ break;
+ default:
+ textRenderData.setText("-");
+ break;
+ }
+ } else if (JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value").equals("搴忓彿")) {
+ index.getAndIncrement();
+ textRenderData.setText(index + "");
+ } else if (JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value").equals("璁＄畻鍊�")) {
+ JSONArray jsonArray = JSON.parseArray(b.getInsProductResult().getComValue());
+ textRenderData.setText((JSON.parseObject(JSON.toJSONString(jsonArray.get(0))).get("v") + "").equals("") ? "-" : JSON.parseObject(JSON.toJSONString(jsonArray.get(0))).get("v") + "");
+ } else if (JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value").equals("鏈�缁堝��")) {
+ textRenderData.setText(b.getLastValue());
+ } else {
+ textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
+ }
+ } else if ((!pr.equals(jo1.get("r") + "")) && v.get("ps") != null) {
+ if (JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value").equals("鏈�缁堝��")) {
+ textRenderData.setText(b.getLastValue());
+ } else if (JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value").equals("缁撹")) {
+ switch (b.getInsResult()) {
+ case 1:
+ textRenderData.setText("鉁�");
+ break;
+ case 0:
+ textRenderData.setText("鉁�");
+ break;
+ default:
+ textRenderData.setText("-");
+ break;
+ }
+ } else {
+ textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
+ }
+ } else {
+ textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
+ }
Style style = new Style();
- style.setFontFamily(v.get("ff")==null?"寰蒋闆呴粦":v.get("ff")+"");
+ style.setFontFamily(v.get("ff") == null ? "寰蒋闆呴粦" : v.get("ff") + "");
// style.setFontSize(v.get("fs")==null?14:Integer.parseInt(v.get("fs")+""));
- style.setColor(v.get("fc")==null?"000000":(v.get("fc")+"").replace("#",""));
- /*String align;
- switch (v.get("ht")+""){
- case "0":
- align = "center";
- break;
- case "2":
- align = "right";
- break;
- default:
- align = "left";
- break;
- }*/
+ style.setColor(v.get("fc") == null ? "000000" : (v.get("fc") + "").replace("#", ""));
textRenderData.setStyle(style);
text.add(textRenderData);
+ if (i == b.getTemplate().size() - 1) {
+ TextRenderData[] text2 = text.toArray(new TextRenderData[0]);
+ rowRenderData = Rows.of(text2).rowAtleastHeight(1).center().create();
+ rows.add(rowRenderData);
+ text = new ArrayList<>();
+ }
}
- rows.forEach(System.out::println);
TableRenderData tableRenderData = new TableRenderData();
tableRenderData.setRows(rows);
TableStyle tableStyle = new TableStyle();
JSONObject styleJo = JSON.parseObject(JSON.toJSONString(b.getStyle().get("columnlen")));
List<Integer> colLen = new ArrayList<>();
int colSize = rows.get(0).getCells().size();
- int colOne = Integer.parseInt(b.getTemplate().get(0).get("r")+"");
+ int colOne = Integer.parseInt(b.getTemplate().get(0).get("r") + "");
for (int i = colOne; i < colSize + colOne; i++) {
- if(styleJo.get(i + "") == null){
+ if (styleJo.get(i + "") == null) {
colLen.add(pxToCm(100));
- }else{
+ } else {
int i1 = Integer.parseInt(styleJo.get(i + "") + "");
colLen.add(pxToCm(i1));
}
@@ -313,27 +353,28 @@
tableStyle.setAlign(TableRowAlign.CENTER);
tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
tableRenderData.setTableStyle(tableStyle);
- tables.add(tableRenderData);
+ Map<String, Object> table = new HashMap<>();
+ table.put("table", tableRenderData);
+ table.put("report", insReport);
+ tables.add(table);
});
});
- InsReport insReport = new InsReport();
- insReport.setCode(giveCode.giveCode("JCZX/TX-", "ins_report", "-", "yyMMdd"));
- insReport.setInsOrderId(orderId);
String url;
try {
url = ResourceUtils.getURL("classpath:static/template-table.docx").getPath();
} catch (FileNotFoundException e) {
throw new ErrorException("鎵句笉鍒版ā鏉挎枃浠�");
}
-
- XWPFTemplate template = XWPFTemplate.compile(url).render(
+ ConfigureBuilder builder = Configure.builder();
+ builder.useSpringEL(true);
+ XWPFTemplate template = XWPFTemplate.compile(url, builder.build()).render(
new HashMap<String, Object>() {{
put("order", insOrder);
put("report", insReport);
put("user", user);
put("samples", samples);
put("sampleSize", samples.size() + samples.get(0).getUnit());
- put("tables", tables.get(0));
+ put("tables", tables);
}});
try {
String name = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yy_MM_dd_HH_mm_ss")) + ".docx";
@@ -405,7 +446,7 @@
return 1;
}
- public int pxToCm(int px){
+ public int pxToCm(int px) {
return px / 9;
}
}
diff --git a/inspect-server/src/main/resources/static/template-table.docx b/inspect-server/src/main/resources/static/template-table.docx
index b9d7cb4..de50922 100644
--- a/inspect-server/src/main/resources/static/template-table.docx
+++ b/inspect-server/src/main/resources/static/template-table.docx
Binary files differ
--
Gitblit v1.9.3