Compare commits
10 Commits
main_hhl02
...
ee7510f41e
| Author | SHA1 | Date | |
|---|---|---|---|
| ee7510f41e | |||
| 44279d9637 | |||
| 860afb9812 | |||
|
|
0ef88ce81d | ||
| 1b81782767 | |||
| 432feb11d2 | |||
|
|
1173de364c | ||
|
|
7fb9543604 | ||
|
|
bac75778ad | ||
|
|
3dd11b9f37 |
@@ -7,4 +7,30 @@
|
|||||||
表名: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 查询控件是否隐藏
|
||||||
@@ -3,6 +3,7 @@ spring:
|
|||||||
name: lideeyunji-server
|
name: lideeyunji-server
|
||||||
profiles:
|
profiles:
|
||||||
active: local # 读取配置
|
active: local # 读取配置
|
||||||
|
#active: prod # 读取配置
|
||||||
main:
|
main:
|
||||||
allow-circular-references: true # 允许循环依赖,因为项目是三层架构,无法避免这个情况。
|
allow-circular-references: true # 允许循环依赖,因为项目是三层架构,无法避免这个情况。
|
||||||
|
|
||||||
|
|||||||
@@ -107,5 +107,17 @@ 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;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -72,5 +72,17 @@ 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;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -382,6 +382,10 @@ 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());
|
||||||
|
|||||||
@@ -70,13 +70,14 @@
|
|||||||
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",
|
||||||
|
|||||||
@@ -160,6 +160,15 @@ public class AuthController {
|
|||||||
return success(authService.refreshToken(refreshToken));
|
return success(authService.refreshToken(refreshToken));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PostMapping("/user-info")
|
||||||
|
@PermitAll
|
||||||
|
@Operation(tags = "根据token获取用户信息",summary = "根据token获取用户信息")
|
||||||
|
@Parameter(name = "refreshToken", description = "根据token获取用户信息", required = true)
|
||||||
|
@OperateLog(enable = false) // 避免 Post 请求被记录操作日志
|
||||||
|
public CommonResult<AuthLoginRespVO> getUerInfo(@RequestParam("refreshToken") String refreshToken) {
|
||||||
|
return success(authService.refreshToken(refreshToken));
|
||||||
|
}
|
||||||
|
|
||||||
@GetMapping("/get-permission-info")
|
@GetMapping("/get-permission-info")
|
||||||
@Operation(tags = "授权管理",summary = "获取登录用户的权限信息")
|
@Operation(tags = "授权管理",summary = "获取登录用户的权限信息")
|
||||||
public CommonResult<AuthPermissionInfoRespVO> getPermissionInfo() {
|
public CommonResult<AuthPermissionInfoRespVO> getPermissionInfo() {
|
||||||
|
|||||||
Reference in New Issue
Block a user