Browse Source

试验分类添加多个元素

cr 5 days ago
parent
commit
2af5ad628e

+ 10 - 0
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/TrialTableDataInfo.java

@@ -46,6 +46,16 @@ public class TrialTableDataInfo implements java.io.Serializable {
         return UNKNOWN;
     }
 
+    public static Long getElementId(String key) {
+        TrialTableElementEnum[] values = TrialTableElementEnum.values();
+        for (TrialTableElementEnum value : values) {
+            if (value.key.equals(key)) {
+                return value.id;
+            }
+        }
+        return 0L;
+    }
+
     @Getter
     public static enum TrialTableElementEnum {
         RECORD_NO(203700000001001L, "key_301","recordNo", "记录编号"),

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

@@ -222,6 +222,8 @@ public class TrialSummaryClassificationConfigurationController extends BladeCont
                         map.put("id", obj.getId().toString());
                         map.put("tabName", TrialTableDataInfo.TBN_CH);
                         map.put("elementName", TrialTableDataInfo.getElementName(obj.getElementKey()));
+                        map.put("trialTabId",TrialTableDataInfo.LONG_ID+"");
+                        map.put("elementId",TrialTableDataInfo.getElementId(obj.getElementKey())+"");
                         r.add( map);
                     }else {
                         WbsTreePrivate trialTab = wbsTreePrivateServiceImpl.getBaseMapper().getByPKeyId(obj.getTrialTabId());
@@ -231,6 +233,8 @@ public class TrialSummaryClassificationConfigurationController extends BladeCont
                             map.put("id", obj.getId().toString());
                             map.put("tabName", ObjectUtil.isNotEmpty(trialTab.getFullName()) ? trialTab.getFullName() : trialTab.getNodeName());
                             map.put("elementName", element.getEName());
+                            map.put("trialTabId",obj.getTrialTabId()+"");
+                            map.put("elementId",obj.getElementId()+"");
                             r.add(map);
                         }
                     }