Merge pull request '应用查询按字典排序值排序' (#21) from main_hhl0209 into master

Reviewed-on: #21

doc/新增表和数据字段在此说明.txt

@@ -7,4 +7,25 @@
 表名：xxx_demo
 字段                     类型                   长度
 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
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
+日期：2026-02-13（新增字段）
+表名：yunji_report_field
+字段                        类型                   长度                  字段说明
+width                      varchar                60                  单元格宽度
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
+日期：2026-02-24（新增字段）
+表名：yunji_report_field
+字段                        类型                   长度                  字段说明
+searchDefaultValue        varchar                 150                 查询控件默认值

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

@@ -107,5 +107,14 @@ public class ReportFieldEntity extends BaseTenantEntity {
     //隐藏列的，表单不显示该字段
     private String isHideCol;
 
+    //是否动态分组 Y|N
+    private String isDynamicGroup;
+
+    //单元格宽度
+    private  String width;
+
+    //查询控件默认值
+    private String searchDefaultValue;
+
 }
 

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

@@ -72,5 +72,14 @@ public class ReportFieldVo extends ReportFieldIdVo {
     //隐藏列的，表单不显示该字段
     private String isHideCol;
 
+    //是否动态分组 Y|N
+    private String isDynamicGroup;
+
+    //单元格宽度
+    private  String width;
+
+    //查询控件默认值
+    private String searchDefaultValue;
+
 }
 

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

@@ -382,6 +382,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportEntity> 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());
             entity.setParentFieldCode(vo.getParentFieldCode());
             entity.setParentFieldName(vo.getParentFieldName());

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
   </select>
 
+
     <select id="getExcelExportFieldList" resultType="map">
         SELECT
             df.field_code as "field_code",