解决试验汇总回显问题、解决新增试验汇总pdf多元素数据获取问题

blade-service/blade-business/src/main/java/org/springblade/business/controller/TrialSummaryController.java

@@ -349,7 +349,12 @@ public class TrialSummaryController {
              for(String mapKey : map.keySet()){
                  for(TrialSummaryExcelTabReflection data: excelTabReflections){
                     if(mapKey.equals(data.getElementKey() + "__" + data.getTrialTabId())){
-                        map2.put(data.getHtmlKeyName().split("__")[0]+"__",map.get(mapKey));
+                        Object obj = map2.get(data.getHtmlKeyName().split("__")[0] + "__");
+                        if(obj == null){
+                            map2.put(data.getHtmlKeyName().split("__")[0]+"__",map.get(mapKey));
+                        } else {
+                            map2.put(data.getHtmlKeyName().split("__")[0]+"__", obj.toString() + "、" + map.get(mapKey));
+                        }
                     }
                  }
              }

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/TrialSummaryClassificationConfigurationController.java

@@ -228,6 +228,7 @@ public class TrialSummaryClassificationConfigurationController extends BladeCont
                         map.put("elementName", TrialTableDataInfo.getElementName(obj.getElementKey()));
                         map.put("trialTabId",TrialTableDataInfo.LONG_ID+"");
                         map.put("elementId",TrialTableDataInfo.getElementId(obj.getElementKey())+"");
+                        map.put("trialTabName",TrialTableDataInfo.TBN);
                         r.add( map);
                     }else {
                         WbsTreePrivate trialTab = wbsTreePrivateServiceImpl.getBaseMapper().getByPKeyId(obj.getTrialTabId());
@@ -239,6 +240,7 @@ public class TrialSummaryClassificationConfigurationController extends BladeCont
                             map.put("elementName", element.getEName());
                             map.put("trialTabId",obj.getTrialTabId()+"");
                             map.put("elementId",obj.getElementId()+"");
+                            map.put("trialTabName",trialTab.getInitTableName());
                             r.add(map);
                         }
                     }