修改

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);
+
                     }
                 }
             }

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;