更新董潘祥代码

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

@@ -69,10 +69,18 @@ public class ReportFieldEntity extends BaseTenantEntity {
      */
     private String isShowSort;
 
+
+
     /**
      * 国际化配置
      */
     private String labelI18n;
 
+
+    /**
+     * 是否合计 空不合计  非空SQL是要返回的合计字段
+     */
+    private String isAmount;
+
 }
 

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/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.setIsShowSort(vo.getIsDimension());
+            entity.setIsAmount(vo.getIsAmount());
             entity.setLabelI18n(vo.getLabelI18n());
             if (FuncBase.isEmpty(vo.getId())) {//新增
                 addList.add(entity);