From d7d22f058f63e3920411a951015adb9495da6e90 Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Fri, 11 Jul 2025 23:58:33 +0800
Subject: [PATCH] update

---
 .../impl/ExperimentDocServiceImpl.java        | 41 +++++++++++++++----
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java
index b2469d2..3056233 100755
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java
@@ -476,19 +476,42 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
         }
 
         List<ExperimentDeviationEquipment> deviationEquipmentList = experiment.getDeviationEquipmentList();
-        String[][] strings = new String[deviationEquipmentList.size() + 1][5];
-        strings[0] = new String[] {"序号", "名称", "编号", "计量有效期", "备注"};
+        List<String[]> strings = new ArrayList<>();
+        strings.add(new String[] {"序号", "名称", "编号", "计量有效期", "备注"});
 
         if (CollUtil.isNotEmpty(deviationEquipmentList)) {
             for (int i = 0; i < deviationEquipmentList.size(); i++) {
                 ExperimentDeviationEquipment deviationEquipment = deviationEquipmentList.get(i);
-                strings[i + 1] = new String[] {(i + 1) + "", Optional.ofNullable(deviationEquipment.getEquipmentName()).orElse(""),
+                strings.add(new String[] {(i + 1) + "", Optional.ofNullable(deviationEquipment.getEquipmentName()).orElse(""),
                         Optional.ofNullable(deviationEquipment.getManagementNo()).orElse(""), Optional.ofNullable(
                         deviationEquipment.getMeasurementValidity()).orElse(""), Optional.ofNullable(deviationEquipment.getRoomNo()).orElse(
-                        ""),};
+                        ""),});
             }
         }
-        params.put("装置表格", Tables.of(strings).border(BorderStyle.DEFAULT).create());
+
+        if (CollUtil.isNotEmpty(experimentTestProcesses)) {
+            List testParametersList = new ArrayList<>();
+            List EnvironmentalTemperature = new ArrayList<>();
+            List EnvironmentalHumidity = new ArrayList<>();
+            for (ExperimentTestProcess experimentTestProcess : experimentTestProcesses) {
+                String testEquipment = experimentTestProcess.getTestEquipment();
+                if (StringUtils.isNotBlank(testEquipment)) {
+                    List<JSONObject> jsonArray = JSON.parseArray(testEquipment, JSONObject.class);
+                    for (int i = 0; i < jsonArray.size(); i++) {
+                        JSONObject o = jsonArray.get(i);
+                        strings.add(new String[] {(strings.size() ) + "", Optional.ofNullable(
+                                o.getString("equipment_name")).orElse(""),
+                                Optional.ofNullable(o.getString("managementNo")).orElse(""), Optional.ofNullable(
+                                o.getString("lifespan")).orElse(""), Optional.ofNullable(
+                                o.getString("roomNo")).orElse(
+                                ""),});
+                    }
+                }
+            }
+
+        }
+        String[][] array = strings.toArray(new String[strings.size()][]);
+        params.put("装置表格", Tables.of(array).border(BorderStyle.DEFAULT).create());
         return params;
     }
 
@@ -849,8 +872,12 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
     }
 
     public static void main(String[] args) {
-        System.out.println(fixChineseName("张三"));
-        System.out.println(fixChineseName("张站三"));
+        List<String[]> strings = new ArrayList<>();
+        strings.add(new String[] {"序号", "名称", "编号", "计量有效期", "备注"});
+        strings.add(new String[] {"1", "2", "3", "4", "5"});
+
+        String[][] array = strings.toArray(new String[strings.size()][]);
+        System.out.println(array.toString());
     }
 }