From 3dd11b9f37c040355d7a56d7472e3f8300d13eef Mon Sep 17 00:00:00 2001 From: dongpx <2112323174@qq.com> Date: Thu, 12 Feb 2026 08:38:19 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/新增表和数据字段在此说明.txt | 6 ++++++ .../lideeyunji/core/framework/entity/ReportFieldEntity.java | 3 +++ .../lideeyunji/core/framework/params/vo/ReportFieldVo.java | 3 +++ .../core/framework/service/impl/ReportServiceImpl.java | 1 + 4 files changed, 13 insertions(+) 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()); -- 2.52.0.windows.1 From bac75778addbe61bf78dad7cb9e1a5fb74965c9a Mon Sep 17 00:00:00 2001 From: dongpx <2112323174@qq.com> Date: Thu, 12 Feb 2026 11:45:36 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/新增表和数据字段在此说明.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/新增表和数据字段在此说明.txt b/doc/新增表和数据字段在此说明.txt index 5567c50..20f137a 100644 --- a/doc/新增表和数据字段在此说明.txt +++ b/doc/新增表和数据字段在此说明.txt @@ -8,9 +8,15 @@ 字段 类型 长度 xx_aa varchar 20 ---------------------------------------------------------------------------------------------------------------------------------- +----------------------------------------------------------------------------------------------------------------------------------------------------------------------- 日期：2026-02-11（新增字段） 表名：yunji_report_field 字段 类型 长度 字段说明 is_dynamic_group varchar 60 是否动态分组 Y|N +----------------------------------------------------------------------------------------------------------------------------------------------------------------------- + +日期：2026-02-12（修改字段长度） +表名：yunji_report_field +字段 类型 长度 字段说明 +is_hide_dimension varchar 255 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- \ No newline at end of file -- 2.52.0.windows.1 From 7fb954360461c0e792b352850cf3fc9c776f88ef Mon Sep 17 00:00:00 2001 From: dongpx <2112323174@qq.com> Date: Sat, 14 Feb 2026 00:38:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/新增表和数据字段在此说明.txt | 6 +++++- .../lideeyunji/core/framework/entity/ReportFieldEntity.java | 3 +++ .../lideeyunji/core/framework/params/vo/ReportFieldVo.java | 3 +++ .../core/framework/service/impl/ReportServiceImpl.java | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/doc/新增表和数据字段在此说明.txt b/doc/新增表和数据字段在此说明.txt index 20f137a..91165fb 100644 --- a/doc/新增表和数据字段在此说明.txt +++ b/doc/新增表和数据字段在此说明.txt @@ -19,4 +19,8 @@ is_dynamic_group varchar 60 是否动 表名：yunji_report_field 字段 类型 长度 字段说明 is_hide_dimension varchar 255 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ \ No newline at end of file +----------------------------------------------------------------------------------------------------------------------------------------------------------------------- +日期：2026-02-13（新增字段） +表名：yunji_report_field +字段 类型 长度 字段说明 +width int 60 单元格宽度 \ 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 48bdb66..49ebcfd 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 @@ -110,5 +110,8 @@ public class ReportFieldEntity extends BaseTenantEntity { //是否动态分组 Y|N private String isDynamicGroup; + //单元格宽度 + private String width; + } 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 5c52e17..9bfcdfe 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 @@ -75,5 +75,8 @@ public class ReportFieldVo extends ReportFieldIdVo { //是否动态分组 Y|N private String isDynamicGroup; + //单元格宽度 + private String width; + } 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 0c3224e..3329817 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.setWidth(vo.getWidth()); entity.setIsDynamicGroup(vo.getIsDynamicGroup()); entity.setHasChildren(vo.getHasChildren()); entity.setParentFieldCode(vo.getParentFieldCode()); -- 2.52.0.windows.1 From 1173de364cbdf713d1c97acc8d16e255105b4e63 Mon Sep 17 00:00:00 2001 From: dongpx <2112323174@qq.com> Date: Wed, 25 Feb 2026 10:06:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/新增表和数据字段在此说明.txt | 7 ++++++- .../core/framework/entity/ReportFieldEntity.java | 3 +++ .../lideeyunji/core/framework/params/vo/ReportFieldVo.java | 3 +++ .../core/framework/service/impl/ReportServiceImpl.java | 1 + .../main/resources/mapper/framework/JeeLowCodeMapper.xml | 3 ++- 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/doc/新增表和数据字段在此说明.txt b/doc/新增表和数据字段在此说明.txt index 91165fb..48a5bca 100644 --- a/doc/新增表和数据字段在此说明.txt +++ b/doc/新增表和数据字段在此说明.txt @@ -23,4 +23,9 @@ is_hide_dimension varchar 255 日期：2026-02-13（新增字段） 表名：yunji_report_field 字段 类型 长度 字段说明 -width int 60 单元格宽度 \ No newline at end of file +width varchar 60 单元格宽度 +----------------------------------------------------------------------------------------------------------------------------------------------------------------------- +日期：2026-02-24（新增字段） +表名：yunji_report_field +字段 类型 长度 字段说明 +searchDefaultValue varchar 150 查询控件默认值 \ 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 49ebcfd..155828b 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 @@ -113,5 +113,8 @@ public class ReportFieldEntity extends BaseTenantEntity { //单元格宽度 private String width; + //查询控件默认值 + private String searchDefaultValue; + } 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 9bfcdfe..0ec8da1 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 @@ -78,5 +78,8 @@ public class ReportFieldVo extends ReportFieldIdVo { //单元格宽度 private String width; + //查询控件默认值 + private String searchDefaultValue; + } 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 3329817..65bae87 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.setSearchDefaultValue(vo.getSearchDefaultValue()); entity.setWidth(vo.getWidth()); entity.setIsDynamicGroup(vo.getIsDynamicGroup()); entity.setHasChildren(vo.getHasChildren()); diff --git a/lidee-core/src/main/resources/mapper/framework/JeeLowCodeMapper.xml b/lidee-core/src/main/resources/mapper/framework/JeeLowCodeMapper.xml index db8dc85..b17f293 100644 --- a/lidee-core/src/main/resources/mapper/framework/JeeLowCodeMapper.xml +++ b/lidee-core/src/main/resources/mapper/framework/JeeLowCodeMapper.xml @@ -70,13 +70,14 @@ WHERE report.is_deleted = 0 AND field.is_deleted = 0 - AND field.query_is_db = 'Y' +-- AND field.query_is_db = 'Y' AND report.id = #{reportId} ORDER BY field.sort_num ASC, field.id ASC +