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] =?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 +