From 01848c0071968019484acbc085f84af90e5cfc72 Mon Sep 17 00:00:00 2001
From: daiqy88 <daiqiongyao@honeycombis.com>
Date: Sat, 1 Nov 2025 20:04:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/bo/system/office/OfficeProxy.java  | 29 +++++++++++++++++--
 .../bo/system/office/SystemLoadcaseBean.java  |  2 +-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/entity/bo/system/office/OfficeProxy.java b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/entity/bo/system/office/OfficeProxy.java
index 2d5358d..2b8c4e4 100644
--- a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/entity/bo/system/office/OfficeProxy.java
+++ b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/entity/bo/system/office/OfficeProxy.java
@@ -602,8 +602,32 @@ public class OfficeProxy{
             performanceConetents += performance.performanceBean.performanceName +"\n";
         }
         row.add(performanceConetents);
-        row.add(loadcase.loadcaseBean.standard);
-        row.add(softwareMap.get(loadcase.loadcaseBean.analysisSoftware));
+        //填充执行标准
+        String executeStandard = "";
+        if(loadcase.loadcaseBean.standardInfo != null)
+        {
+            for(int index=0; index<loadcase.loadcaseBean.standardInfo.length;index++)
+            {
+                if(index > 0)
+                    executeStandard += ",";
+                executeStandard += loadcase.loadcaseBean.standardInfo[index].fileName;
+            }
+        }
+        row.add(executeStandard);
+
+        //解析逗号连接的多个分析软件
+        String analysisSoftware = "";
+        if(loadcase.loadcaseBean.analysisSoftware != null && !loadcase.loadcaseBean.analysisSoftware.isEmpty())
+        {
+            String[] software = loadcase.loadcaseBean.analysisSoftware.split(",");
+            for(int index=0; index<software.length; index++)
+            {
+                if(index > 0)
+                    analysisSoftware += ",";
+                analysisSoftware  += softwareMap.get(loadcase.loadcaseBean.analysisSoftware);
+            }
+        }
+        row.add(analysisSoftware);
         row.add(loadcase.loadcaseBean.days);
     }
 
@@ -674,6 +698,7 @@ public class OfficeProxy{
                         performance.performanceBean.analysisSoftware = loadcase.loadcaseBean.analysisSoftware;
                         performance.performanceBean.loadcaseName = loadcase.loadcaseBean.loadcaseName;
                         loadcase.children.add(performance);
+
                     }
                 }
             }
diff --git a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/entity/bo/system/office/SystemLoadcaseBean.java b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/entity/bo/system/office/SystemLoadcaseBean.java
index 284046e..ab91c87 100644
--- a/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/entity/bo/system/office/SystemLoadcaseBean.java
+++ b/ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/entity/bo/system/office/SystemLoadcaseBean.java
@@ -31,7 +31,7 @@ public class SystemLoadcaseBean {
     public String analysis;
     public String submitter;
     public String standard;
-    //public String standardInfo[];
+    public  StandardInfo[] standardInfo;
     public String confidence;
     public String nodeType;
     public String code;