修改代码

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

@@ -7,7 +7,6 @@ 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;
 
 /**
@@ -34,9 +33,6 @@ 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

@@ -1,4 +1,3 @@
-
 package com.lideeyunji.core.framework.controller;
 
 import com.lideeyunji.core.framework.config.aspect.enhancereport.enums.RefreshPluginEnums;
@@ -57,7 +56,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,7 +3,6 @@ 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;
 
@@ -95,9 +94,8 @@ public class ReportFieldEntity extends BaseTenantEntity {
     //父字段名称
     private String parentFieldName;
 
-
-
-
+    //是否隐藏维度
+    private String isHideDimension;
 
 }
 

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

@@ -1,4 +1,3 @@
-
 package com.lideeyunji.core.framework.params.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -59,5 +58,8 @@ public class ReportFieldVo extends ReportFieldIdVo {
 
     //父字段名称
     private String parentFieldName;
+
+    //是否隐藏维度
+    private String isHideDimension;
 }
 

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

@@ -7,7 +7,6 @@ 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;
 
@@ -80,5 +79,4 @@ 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

@@ -651,8 +651,6 @@ public class FrameServiceImpl implements IFrameService {
     }
 
 
-
-
     /**
      * 单个保存
      *

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

@@ -1,4 +1,3 @@
-
 package com.lideeyunji.core.framework.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
@@ -377,7 +376,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportEntity> i
             entity.setDictCode(vo.getDictCode());
             entity.setIsExport(vo.getIsExport());
             entity.setIsShowSort(vo.getIsShowSort());
+            entity.setIsShowSort(vo.getIsDimension());
             entity.setIsDimension(vo.getIsDimension());
+            entity.setIsHideDimension(vo.getIsHideDimension());
             entity.setHasChildren(vo.getHasChildren());
             entity.setParentFieldCode(vo.getParentFieldCode());
             entity.setParentFieldName(vo.getParentFieldName());