1 Commits

Author SHA1 Message Date
chy
79cb1297db 修改认证 2026-02-22 21:40:47 +08:00
6 changed files with 3 additions and 57 deletions

View File

@@ -7,30 +7,4 @@
表名xxx_demo 表名xxx_demo
字段 类型 长度 字段 类型 长度
xx_aa varchar 20 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
字段 类型 长度 字段说明
search_default_value varchar 150 查询控件默认值
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
日期2026-02-27新增字段
表名yunji_report_field
字段 类型 长度 字段说明
is_hide_search varchar 60 查询控件是否隐藏

View File

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

View File

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

View File

@@ -382,10 +382,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportEntity> i
entity.setIsFixedColumn(vo.getIsFixedColumn()); //2026-02-10 新增 entity.setIsFixedColumn(vo.getIsFixedColumn()); //2026-02-10 新增
entity.setFixedColumnValue(vo.getFixedColumnValue()); //2026-02-10 新增 entity.setFixedColumnValue(vo.getFixedColumnValue()); //2026-02-10 新增
entity.setIsHideCol(vo.getIsHideCol()); //2026.2.10 新增 entity.setIsHideCol(vo.getIsHideCol()); //2026.2.10 新增
entity.setSearchDefaultValue(vo.getSearchDefaultValue());
entity.setIsHideSearch(vo.getIsHideSearch());
entity.setWidth(vo.getWidth());
entity.setIsDynamicGroup(vo.getIsDynamicGroup());
entity.setHasChildren(vo.getHasChildren()); entity.setHasChildren(vo.getHasChildren());
entity.setParentFieldCode(vo.getParentFieldCode()); entity.setParentFieldCode(vo.getParentFieldCode());
entity.setParentFieldName(vo.getParentFieldName()); entity.setParentFieldName(vo.getParentFieldName());

View File

@@ -70,14 +70,13 @@
WHERE WHERE
report.is_deleted = 0 report.is_deleted = 0
AND field.is_deleted = 0 AND field.is_deleted = 0
-- AND field.query_is_db = 'Y' AND field.query_is_db = 'Y'
AND report.id = #{reportId} AND report.id = #{reportId}
ORDER BY ORDER BY
field.sort_num ASC, field.sort_num ASC,
field.id ASC field.id ASC
</select> </select>
<select id="getExcelExportFieldList" resultType="map"> <select id="getExcelExportFieldList" resultType="map">
SELECT SELECT
df.field_code as "field_code", df.field_code as "field_code",

View File

@@ -22,6 +22,7 @@ public interface OAuth2ClientMapper extends BaseMapperX<OAuth2ClientDO> {
return selectPage(reqVO, new LambdaQueryWrapperX<OAuth2ClientDO>() return selectPage(reqVO, new LambdaQueryWrapperX<OAuth2ClientDO>()
.likeIfPresent(OAuth2ClientDO::getName, reqVO.getName()) .likeIfPresent(OAuth2ClientDO::getName, reqVO.getName())
.eqIfPresent(OAuth2ClientDO::getStatus, reqVO.getStatus()) .eqIfPresent(OAuth2ClientDO::getStatus, reqVO.getStatus())
.neIfPresent(OAuth2ClientDO::getClientId, "default")
.inIfPresent(OAuth2ClientDO::getId, reqVO.getIds()) .inIfPresent(OAuth2ClientDO::getId, reqVO.getIds())
.orderByDesc(OAuth2ClientDO::getId)); .orderByDesc(OAuth2ClientDO::getId));
} }