标签修改
This commit is contained in:
+3
@@ -73,6 +73,9 @@ public class SysDictController {
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
|
||||
Result<IPage<SysDict>> result = new Result<IPage<SysDict>>();
|
||||
QueryWrapper<SysDict> queryWrapper = QueryGenerator.initQueryWrapper(sysDict, req.getParameterMap());
|
||||
if(StringUtils.isNotBlank("create_time")) {
|
||||
queryWrapper.orderByDesc("create_time");
|
||||
}
|
||||
Page<SysDict> page = new Page<SysDict>(pageNo, pageSize);
|
||||
IPage<SysDict> pageList = sysDictService.page(page, queryWrapper);
|
||||
log.debug("查询当前页:"+pageList.getCurrent());
|
||||
|
||||
+6
-2
@@ -91,8 +91,7 @@ public class SysDict implements Serializable {
|
||||
/**
|
||||
* 是否为标签内容-数据字典(1是 0否)
|
||||
*/
|
||||
@Excel(name = "是否为标签内容", width = 15)/*, dictTable = "sys_dict", dicText = "is_tag_dict", dicCode = "is_tag_dict")
|
||||
@Dict(dictTable = "onl_cgform_field", dicText = "is_tag_dict", dicCode = "is_tag_dict")*/
|
||||
@Excel(name = "是否为标签内容", width = 15)
|
||||
private java.lang.Integer isTagDict;
|
||||
|
||||
/**
|
||||
@@ -110,4 +109,9 @@ public class SysDict implements Serializable {
|
||||
@ApiModelProperty(value = "标签类型 1下拉选择 2树形结构")
|
||||
@Dict(dicCode = "attribute_type")
|
||||
private java.lang.String attributeType;
|
||||
|
||||
/**逻辑删除标识 0未删 1已删*/
|
||||
@Excel(name = "逻辑删除标识 0未删 1已删", width = 15)
|
||||
@ApiModelProperty(value = "逻辑删除标识 0未删 1已删")
|
||||
private Integer isDelete;
|
||||
}
|
||||
+6
-3
@@ -64,7 +64,6 @@ public class SysDictItem implements Serializable {
|
||||
@Excel(name = "排序", width = 15,type=4)
|
||||
private Integer sortOrder;
|
||||
|
||||
|
||||
@TableField(exist = false)
|
||||
private String dictCode;
|
||||
|
||||
@@ -83,8 +82,7 @@ public class SysDictItem implements Serializable {
|
||||
private Date updateTime;
|
||||
|
||||
/**是否为标签内容-数据字典(1是 0否)*/
|
||||
@Excel(name = "是否为标签内容", width = 15)/*, dictTable = "sys_dict", dicText = "is_tag_dict", dicCode = "is_tag_dict")
|
||||
@Dict(dictTable = "onl_cgform_field", dicText = "is_tag_dict", dicCode = "is_tag_dict")*/
|
||||
@Excel(name = "是否为标签内容", width = 15)
|
||||
private java.lang.Integer isTagDict;
|
||||
|
||||
/**是否是只读(2字段固定,内部可配1固定字段 0非固定字段)*/
|
||||
@@ -98,4 +96,9 @@ public class SysDictItem implements Serializable {
|
||||
@ApiModelProperty(value = "标签类型 1下拉选择 2树形结构")
|
||||
@Dict(dicCode = "attribute_type")
|
||||
private java.lang.String attributeType;
|
||||
|
||||
/**逻辑删除标识 0未删 1已删*/
|
||||
@Excel(name = "逻辑删除标识 0未删 1已删", width = 15)
|
||||
@ApiModelProperty(value = "逻辑删除标识 0未删 1已删")
|
||||
private Integer isDelete;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user