dpx20260211 #22

Merged
admin merged 4 commits from dpx20260211 into master 2026-02-25 14:01:31 +08:00
5 changed files with 45 additions and 2 deletions

View File

@@ -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 查询控件默认值

View File

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

View File

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

View File

@@ -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());

View File

@@ -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",