From 20a774f842d6da39c4b4b5d33a7d835fc797fbab Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Sat, 12 Jul 2025 13:47:44 +0800
Subject: [PATCH] update

---
 .../impl/ExperimentDocServiceImpl.java        | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

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 3056233..187ad35 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
@@ -499,7 +499,7 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
                     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(
+                        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(
@@ -558,6 +558,7 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
     private Map<String, Object> assembleSbsyjlb(String experimentId) {
         List<ExperimentDeviationEquipment> equipmentList = experimentDeviationEquipmentService.getByExperimentId(experimentId);
         Experiment experiment = experimentService.getById(experimentId);
+        experimentService.fetchExperimentDetail(experiment);
         List<Map<String, Object>> list = new ArrayList<>();
         for (int i = 0; i < equipmentList.size(); i++) {
             ExperimentDeviationEquipment v = equipmentList.get(i);
@@ -572,6 +573,31 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
             params.put("异常记录", "");
             list.add(params);
         }
+        List<ExperimentTestProcess> experimentTestProcesses = experimentTestProcessService.getByExperimentId(experiment.getId());
+
+        if (CollUtil.isNotEmpty(experimentTestProcesses)) {
+            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);
+                        Map<String, Object> params = new HashMap<>();
+                        params.put("index", (list.size()) + "");
+                        params.put("设备名称", Optional.ofNullable(
+                                o.getString("equipment_name")).orElse(""));
+                        params.put("管理编号", Optional.ofNullable(o.getString("managementNo")).orElse(""));
+                        params.put("使用日期", experiment.getStartDate());
+                        params.put("归还日期", experiment.getEndDate());
+                        params.put("计量有效期", Optional.ofNullable(
+                                o.getString("lifespan")).orElse(""));
+                        params.put("异常记录", "");
+                        list.add(params);
+                    }
+                }
+            }
+
+        }
 
         Map<String, Object> root = new HashMap<>();
         root.put("equipment", list);