From de3832e6560ead526d2ad86dd1feea39a39e3aef Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 15 三月 2025 17:54:09 +0800
Subject: [PATCH] 报告调整2.0
---
inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java | 89 ++++++++++++++++++++++----------------------
1 files changed, 44 insertions(+), 45 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java b/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
index 8b01a45..6fcbefd 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
@@ -283,7 +283,6 @@
cells.add(cellRenderData);
}
else {
- i=i-1;
if (insOrderState.getVersion() == 1) {
//闈炵數璋冪増鏈�(绠�鍗曠増)
if (inspectionItemSubclass.contains("鐢靛帇椹绘尝姣�") && i <= 2 * portRow) {
@@ -905,7 +904,8 @@
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- } else if (j == bb - 1) {
+ }
+ else if (j == bb - 1) {
//鏈�鍚庝竴鍒�
if (i % (angles + 1) == 1) {
textRenderData.setText("鍒ゅ畾");
@@ -2692,16 +2692,15 @@
List<Map<String, Object>> tables2 = new ArrayList<>();
if (strings.contains("鐢佃矾璇曢獙")) {
/*鍕鹃�夌殑鐢佃矾璇曢獙琛�*/
- for (InsReportDto2 insReportDto2 : insReportDto1.getInsReportDto2s()) {
+ List<InsReportDto2> dto2s = insReportDto1.getInsReportDto2s().stream().filter(insReportDto2 -> insReportDto2.getLaboratory().equals("鐢佃矾璇曢獙")).collect(Collectors.toList());
+ for (InsReportDto2 insReportDto2 : dto2s) {
InsOrderUser insOrderUser = insOrderUserMapper.selectById(insReportDto2.getInsOrderUsersId());
InsOrderState orderState = insOrderStateMapper.selectById(insOrderUser.getInsOrderStateId());
- if (orderState.getLaboratory().equals("鐢佃矾璇曢獙")) {
- orderState.setNum(insOrderUser.getNum());
- if (!insOrder.getSampleType().equals("鏃犳簮鍣ㄤ欢")) {
- getWord1(insOrderUser.getTerm(), orderState, tables2);
- } else {
- getWord2(insOrderUser.getTerm(), orderState, tables2);
- }
+ orderState.setNum(insOrderUser.getNum());
+ if (!insOrder.getSampleType().equals("鏃犳簮鍣ㄤ欢")) {
+ getWord1(insOrderUser.getTerm(), orderState, tables2);
+ } else {
+ getWord2(insOrderUser.getTerm(), orderState, tables2);
}
}
}
@@ -2948,27 +2947,25 @@
/*妫�楠屾牱鍝佷俊鎭�*/
//鏍峰搧鐓х墖
+ List<UrlListDto> urlList = new ArrayList<>();
//鑾峰彇闄勪欢鍥剧墖绫诲瀷
- List<List<Map<String, Object>>> imageRows = new ArrayList<>();
- List<Map<String, Object>> currentRow = new ArrayList<>();
List<InsOrderFile> insOrderFiles = insOrderFileMapper.selectList(Wrappers.<InsOrderFile>lambdaQuery()
.eq(InsOrderFile::getType, 1)
.eq(InsOrderFile::getInsSampleId,insReportDto1.getSampleId())
.eq(InsOrderFile::getInsOrderId, orderId));
if (CollectionUtils.isNotEmpty(insOrderFiles)) {
+ UrlListDto urlListDto = new UrlListDto();
for (int i = 0; i < insOrderFiles.size(); i++) {
- Map<String, Object> image = new HashMap<>();
- PictureRenderData pictureRenderData = Pictures.ofLocal(imgUrl + "/" + insOrderFiles.get(i).getFileUrl()).sizeInCm(8, 10).create();
- image.put("url", pictureRenderData);
- currentRow.add(image);
- if ((i + 1) % 2 == 0 || i == insOrderFiles.size() - 1) {
- imageRows.add(currentRow);
- currentRow = new ArrayList<>();
+ if (i % 2 == 0) {
+ urlListDto = new UrlListDto();
+ urlListDto.setImageOne(Pictures.ofLocal(imgUrl + "/" + insOrderFiles.get(i).getFileUrl()).create());
+ } else {
+ urlListDto.setImageTwo(Pictures.ofLocal(imgUrl + "/" + insOrderFiles.get(i).getFileUrl()).create());
+ urlList.add(urlListDto);
}
- }
- // 濡傛灉鏈�鍚庝竴琛屼笉瓒充袱涓紝涔熸坊鍔犲埌缁撴灉涓�
- if (!currentRow.isEmpty()) {
- imageRows.add(currentRow);
+ if (i == insOrderFiles.size() - 1) {
+ urlList.add(urlListDto);
+ }
}
}
//鏍峰搧缂栧彿鍙傜収涓婅堪sampleCode
@@ -2990,20 +2987,17 @@
String insUser = insUserList.stream().map(insSampleUser -> {
User user = userMapper.selectById(insSampleUser.getUserId());
return user.getName();
- }).collect(Collectors.joining(","));
+ }).distinct().collect(Collectors.joining(","));
insUserDto.setInsUser(insUser);//娴嬭瘯浜哄憳
List<InsSampleUser> checkUserList = entry.getValue().stream().filter(insSampleUser -> insSampleUser.getState() == 1).collect(Collectors.toList());//澶嶆牳浜�
String checkUser = checkUserList.stream().map(insSampleUser -> {
User user = userMapper.selectById(insSampleUser.getUserId());
return user.getName();
- }).collect(Collectors.joining(","));
+ }).distinct().collect(Collectors.joining(","));
insUserDto.setCheckUser(checkUser);//瀹℃牳浜哄憳
insUsers.add(insUserDto);
index2++;
}
-
-
-
/*娴嬭瘯浠〃*/
Set<String> deviceSet = new HashSet<>();
@@ -3048,6 +3042,7 @@
.bind("insProductList", new HackLoopTableRenderPolicy())
.bind("devList", new HackLoopTableRenderPolicy())
.bind("insUsers", new HackLoopTableRenderPolicy())
+ .bind("urlList", new HackLoopTableRenderPolicy())
.build();
List<DevListDto> finalDevList = devList;
String finalTitle = title3;
@@ -3072,7 +3067,7 @@
put("title3", finalTitle); //妫�娴嬬粨鏋�
put("tables3", tables3); //妫�娴嬬粨鏋�
put("tables4", tables4); //妫�娴嬬粨鏋�
- put("images", imageRows); //鏍峰搧鐓х墖
+ put("urlList", urlList); //鏍峰搧鐓х墖
put("insUsers", insUsers); //妫�娴嬩汉鍛樹俊鎭�
put("devList", finalDevList); //娴嬭瘯浠〃
put("writeUrl", null); //鎻愪氦浜�
@@ -3198,19 +3193,19 @@
} catch (IOException e) {
throw new RuntimeException(e);
}
- //鐩綍鏇存柊
- try{
- com.spire.doc.Document document = new com.spire.doc.Document();
- document.loadFromFile(path);
- // 鏇存柊鐩綍
- document.updateTableOfContents();
- // 淇濆瓨鏂囨。
- document.saveToFile(path, FileFormat.Docx);
- document.close();
- }
- catch (Exception e) {
- throw new RuntimeException(e);
- }
+// //鐩綍鏇存柊
+// try{
+// com.spire.doc.Document document = new com.spire.doc.Document();
+// document.loadFromFile(path);
+// // 鏇存柊鐩綍
+// document.updateTableOfContents();
+// // 淇濆瓨鏂囨。
+// document.saveToFile(path, FileFormat.Docx);
+// document.close();
+// }
+// catch (Exception e) {
+// throw new RuntimeException(e);
+// }
}
@@ -3365,7 +3360,7 @@
int qq = 0;
int ss = 0;
//琛ㄦ牸鐨勮鏁�
- for (int i = 0; i <= aa+1; i++) {
+ for (int i = 0; i <= aa+1; i++) {
RowRenderData rowRenderData = new RowRenderData();
RowStyle rowStyle = new RowStyle();
rowStyle.setHeight(40);
@@ -3447,7 +3442,9 @@
paragraphRenderDataList.add(paragraphRenderData);
cellRenderData.setParagraphs(paragraphRenderDataList);
cells.add(cellRenderData);
- } else {
+ }
+ else {
+ int u = i;
i=i-1;
if (insOrderState.getVersion() == 1) {
//闈炵數璋冪増鏈�(绠�鍗曠増)
@@ -4013,7 +4010,8 @@
cells.add(cellRenderData);
}
}
- } else {
+ }
+ else {
//鐢佃皟鐗堟湰(澶嶆潅鐗�)
if (inspectionItemSubclass.contains("鐢靛帇椹绘尝姣�") && i <= (angles + 1) * portRow) {
cc = (angles + 1) * portRow;
@@ -5317,6 +5315,7 @@
}
}
}
+ i=u;
}
}
rowRenderData.setCells(cells);
--
Gitblit v1.9.3