增加dim数据集合报表查询

ibzdst-core/src/main/java/cn/ibizlab/core/extensions/dto/FetchParam.java

@@ -119,6 +119,8 @@ public class FetchParam {
     @JSONField(serialize = false)
     private Catalog dict;
 
+    private List<Option> dimItems;
+
     @JsonIgnore
     @JSONField(serialize = false)
     private Option dimItem;

ibzdst-core/src/main/java/cn/ibizlab/core/extensions/service/BuildResultService.java

@@ -186,7 +186,7 @@ public class BuildResultService {
             fetchParam.setMetrics(metricMap);
         }
 
-        if(!StringUtils.isEmpty(fetchParam.getDimDict()))
+        if(!StringUtils.isEmpty(fetchParam.getDimDict())&&ObjectUtils.isEmpty(fetchParam.getDimItems())&&ObjectUtils.isEmpty(fetchParam.getDimValues()))
         {
             List<String> dimValues = new ArrayList<>();
             Catalog dict = dictDstService.getDictCatalog(fetchParam.getDimDict());
@@ -220,6 +220,30 @@ public class BuildResultService {
                 dimValues.add(fetchParam.getDimValue());
             fetchParam.setDimValues(dimValues);
         }
+        else if(!ObjectUtils.isEmpty(fetchParam.getDimItems())){
+            String dimValue=fetchParam.getDimValue()==null?"%":fetchParam.getDimValue();
+            Option dimItem = new Option().setValue(dimValue).setLabel("合计").setChildren(fetchParam.getDimItems());
+            List<String> dimValues = new ArrayList<>();
+            fetchParam.getDimItems().forEach(codeItem -> {
+                dimValues.add(codeItem.getValue().toString());
+            });
+            fetchParam.setDimItem(dimItem);
+            if(dimValues.size()==0)
+                dimValues.add(fetchParam.getDimValue());
+            fetchParam.setDimValues(dimValues);
+        }
+        else if(!ObjectUtils.isEmpty(fetchParam.getDimValues())){
+            String dimValue=fetchParam.getDimValue()==null?"%":fetchParam.getDimValue();
+            Option dimItem = new Option().setValue(dimValue).setLabel("合计");
+            for(String dim:fetchParam.getDimValues()) {
+                Option item = new Option().setValue(dim).setLabel(dim);
+                if(dimItem.getChildren()==null)
+                    dimItem.setChildren(new ArrayList<>());
+                dimItem.getChildren().add(item);
+            }
+            fetchParam.setDimItem(dimItem);
+
+        }
 
         if(builds!=null)
         {