Signed-off-by: dongpx <2112323174@qq.com>

lidee-core/src/main/java/com/lideeyunji/core/framework/config/btncommand/receiver/ButtonReceiverReportList.java

@@ -7,6 +7,7 @@ import com.lideeyunji.core.framework.service.IFrameService;
 import com.lideeyunji.tool.framework.yunji.model.ResultDataModel;
 import com.lideeyunji.tool.framework.yunji.tool.spring.SpringUtils;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -33,6 +34,9 @@ public class ButtonReceiverReportList implements IButtonCommandReceiver<ResultDa
         String reportCode = param.getReportCode();
         Page page = param.getPage();
         Map<String, Object> params = param.getParams();
+        // 分组集合--测试数据
+//        String[] Groupbylist={"zonename","customname"};
+//        List<String> Groupbylist=param
 
         IFrameService frameService = SpringUtils.getBean(IFrameService.class);
         ResultDataModel reportDataPage = frameService.getReportDataList(reportCode, page, params);

lidee-core/src/main/java/com/lideeyunji/core/framework/controller/ReportController.java

@@ -57,7 +57,7 @@ public class ReportController extends BaseController {
     @ApiOperationSupport(order = 2)
     @Operation(tags = "报表统计",summary = "数据报表 - 修改")
     public BaseWebResult updateDbFormConfig(@RequestBody ReportAddOrUpdateParam param) {
-        Long reportId = param.getReport().getId();
+         Long reportId = param.getReport().getId();
         ReportEntity oldEntity = reportService.getReportEntityById(reportId);
         String oldJavaConfig = oldEntity.getJavaConfig();
         String newJavaConfig = param.getReport().getJavaConfig();

lidee-core/src/main/java/com/lideeyunji/core/framework/entity/ReportFieldEntity.java

@@ -3,6 +3,7 @@ package com.lideeyunji.core.framework.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.lideeyunji.tool.framework.yunji.model.global.BaseTenantEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -69,10 +70,21 @@ public class ReportFieldEntity extends BaseTenantEntity {
      */
     private String isShowSort;
 
+
+
     /**
      * 国际化配置
      */
     private String labelI18n;
 
+
+    /**
+     * 是否合计 空不合计  非空SQL是要返回的合计字段
+     */
+    private String isAmount;
+
+//    @Schema(description = "是否支持维度；N=不支持 Y=支持")
+    private String isDimension ;
+
 }
 

lidee-core/src/main/java/com/lideeyunji/core/framework/params/vo/ReportFieldVo.java

@@ -39,9 +39,16 @@ public class ReportFieldVo extends ReportFieldIdVo {
     @Schema(description = "字段是否有修改;如果是N并且有id的情况下，不修改")
     private String isModify;
 
+
     /**
      * 国际化配置
      */
     private String labelI18n;
+
+    @Schema(description = "是否合计")
+    private String isAmount ;
+
+    @Schema(description = "是否支持维度；N=不支持 Y=支持")
+    private String isDimension ;
 }
 

lidee-core/src/main/java/com/lideeyunji/core/framework/service/IFrameService.java

@@ -7,6 +7,7 @@ import com.lideeyunji.tool.framework.yunji.model.ExecuteEnhanceModel;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import net.sf.jsqlparser.JSQLParserException;
 
+import javax.swing.*;
 import java.util.List;
 import java.util.Map;
 
@@ -79,4 +80,5 @@ public interface IFrameService {
 
     //获取数据表数据 -分页
     ResultDataModel getReportDataList(String reportCode, Page page, Map<String, Object> params);
+
 }

lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/FrameServiceImpl.java

@@ -42,6 +42,7 @@ import net.sf.jsqlparser.JSQLParserException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.swing.*;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
@@ -650,6 +651,8 @@ public class FrameServiceImpl implements IFrameService {
     }
 
 
+
+
     /**
      * 单个保存
      *

lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/ReportServiceImpl.java

@@ -371,13 +371,14 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportEntity> i
             entity.setFieldName(vo.getFieldName());
             entity.setFieldType(vo.getFieldType());
             entity.setSortNum(++sortNum);
-
             entity.setQueryIsDb(vo.getQueryIsDb());
             entity.setQueryIsWeb(vo.getQueryIsWeb());
             entity.setQueryMode(vo.getQueryMode());
             entity.setDictCode(vo.getDictCode());
             entity.setIsExport(vo.getIsExport());
             entity.setIsShowSort(vo.getIsShowSort());
+            entity.setIsDimension(vo.getIsDimension());
+            entity.setIsAmount(vo.getIsAmount());
             entity.setLabelI18n(vo.getLabelI18n());
             if (FuncBase.isEmpty(vo.getId())) {//新增
                 addList.add(entity);