From e72766e5c5cceae416c0fa17ef075a01cd3fd396 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 13 八月 2025 09:34:34 +0800
Subject: [PATCH] 检验任务筛选增加人员字段+检验和复核支持样品编号的修改
---
inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java b/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java
index 0b00346..aa972e8 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java
@@ -206,8 +206,8 @@
}
System.out.println(map);
createWord(sonLaboratory, document, exceldata, map, biaozhun, insOrderFile);
- } catch (IOException e) {
- e.printStackTrace();
+ } catch (Exception e) {
+// e.printStackTrace();
} finally {
// 鍏抽棴璧勬簮
try {
@@ -449,8 +449,8 @@
orderFile.setSonLaboratory(sonLaboratory);
insOrderFileMapper.insert(orderFile);
- } catch (IOException e) {
- e.printStackTrace();
+ } catch (Exception e) {
+// e.printStackTrace();
} finally {
// 鍏抽棴璧勬簮
try {
@@ -527,7 +527,7 @@
Map<String, List<Map<String, Object>>> aggregatedMap = new HashMap<>();
Map<String, List<Map<String, Object>>> o1 = (Map<String, List<Map<String, Object>>>) dataRow.get(result);
for (String s2 : collect) {
- if (s2.contains("绔彛")) {
+ if (s2.contains("绔彛")||s2.contains("P")) {
List<Map<String, Object>> mapList = o1.get(s2);
list.addAll(mapList);
}
@@ -543,7 +543,7 @@
}
int rowNum = 2;
for (String s2 : aggregatedMap.keySet()) {
- if (s2.equals("绔彛") || s2.equals("棰戠巼")) {
+ if (s2.equals("绔彛") || s2.equals("棰戠巼") || s2.equals("P")) {
continue;
}
List<Map<String, Object>> mapList = aggregatedMap.get(s2);
@@ -629,7 +629,7 @@
run9.setText("");
for (int i = 0; i < collect.size(); i++) {
String s3 = collect.get(i);
- if (s3.contains("绔彛")) {
+ if (s3.contains("绔彛") ||s3.contains("P")) {
XWPFParagraph paragraph10 = table1.getRow(rowNum + 1).getCell(5 + i).getParagraphArray(0);
paragraph10.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run10 = paragraph10.createRun();
@@ -716,6 +716,9 @@
List<Map<String, Object>> mapList1 = group.get(aDouble);
for (Map<String, Object> stringObjectMap : mapList1) {
String port = stringObjectMap.get("绔彛").toString();
+ if (ObjectUtils.isNull(port)){
+ port = stringObjectMap.get("P").toString();
+ }
for (int i = 5; i < cell - 1; i++) {
String text = table1.getRow(rowNum + 1).getCell(i).getText();
if (text.equals(port)) {
@@ -856,6 +859,7 @@
List<String> collect = Arrays.stream(split).collect(Collectors.toList());
+ collect.remove(collect.size() - 1);
collect.sort((o1, o21) -> Integer.parseInt(o1.substring((o1.length() - 1))) - Integer.parseInt(o21.substring(o21.length() - 1)));
List<Map<String, Object>> list = new ArrayList<>();
@@ -866,7 +870,7 @@
Map<String, List<Map<String, Object>>> o1 = (Map<String, List<Map<String, Object>>>) dataRow.get(result);
for (String s2 : collect) {
- if (s2.contains("绔彛") || s2.contains("P")) {
+ if (s2.contains("绔彛") || s2.contains("P") || s2.contains("骞挎挱") || s2.contains("涓氬姟")) {
List<Map<String, Object>> mapList = o1.get(s2);
list.addAll(mapList);
}
@@ -979,9 +983,9 @@
XWPFRun run9 = paragraph9.createRun();
run9.setText("");
- for (int i = 0; i < collect.size() - 1; i++) {
+ for (int i = 0; i < collect.size(); i++) {
String s3 = collect.get(i);
- if (s3.contains("绔彛") || s3.contains("P")) {
+ if (s3.contains("绔彛") || s3.contains("P") || s3.contains("骞挎挱") || s3.contains("涓氬姟")) {
XWPFParagraph paragraph10 = table1.getRow(rowNum+1).getCell(5 + i).getParagraphArray(0);
paragraph10.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run10 = paragraph10.createRun();
--
Gitblit v1.9.3