diff --git a/doc/新增表和数据字段在此说明.txt b/doc/新增表和数据字段在此说明.txt index 94dc006..5567c50 100644 --- a/doc/新增表和数据字段在此说明.txt +++ b/doc/新增表和数据字段在此说明.txt @@ -7,4 +7,10 @@ 表名:xxx_demo 字段 类型 长度 xx_aa varchar 20 + +--------------------------------------------------------------------------------------------------------------------------------- +日期:2026-02-11(新增字段) +表名:yunji_report_field +字段 类型 长度 字段说明 +is_dynamic_group varchar 60 是否动态分组 Y|N ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- \ No newline at end of file diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/ReportFieldEntity.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/ReportFieldEntity.java index d6d7dd0..48bdb66 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/ReportFieldEntity.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/entity/ReportFieldEntity.java @@ -107,5 +107,8 @@ public class ReportFieldEntity extends BaseTenantEntity { //隐藏列的,表单不显示该字段 private String isHideCol; + //是否动态分组 Y|N + private String isDynamicGroup; + } diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/params/vo/ReportFieldVo.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/params/vo/ReportFieldVo.java index 7a4695e..5c52e17 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/params/vo/ReportFieldVo.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/params/vo/ReportFieldVo.java @@ -72,5 +72,8 @@ public class ReportFieldVo extends ReportFieldIdVo { //隐藏列的,表单不显示该字段 private String isHideCol; + //是否动态分组 Y|N + private String isDynamicGroup; + } diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/ReportServiceImpl.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/ReportServiceImpl.java index 7de9cf1..0c3224e 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/ReportServiceImpl.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/ReportServiceImpl.java @@ -382,6 +382,7 @@ public class ReportServiceImpl extends ServiceImpl i entity.setIsFixedColumn(vo.getIsFixedColumn()); //2026-02-10 新增 entity.setFixedColumnValue(vo.getFixedColumnValue()); //2026-02-10 新增 entity.setIsHideCol(vo.getIsHideCol()); //2026.2.10 新增 + entity.setIsDynamicGroup(vo.getIsDynamicGroup()); entity.setHasChildren(vo.getHasChildren()); entity.setParentFieldCode(vo.getParentFieldCode()); entity.setParentFieldName(vo.getParentFieldName());