项目库基础表studio+认证工程师中英名拼接显示,数据字典枚举类修改
This commit is contained in:
-1
@@ -5,7 +5,6 @@ public enum FixedFieldEnum {
|
||||
NON_FIXED_FIELD_ENUM("非固定字段","0"),
|
||||
FIXED_FIELD_ENUM("固定字段","1"),
|
||||
CONFIGURABLE_FIELD("字段固定,内部可配","2"),
|
||||
SYS_DICT_SYSTEM("系统数据字典标志值","0"),
|
||||
;
|
||||
String name;
|
||||
String value;
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
package com.jero.modules.enums;
|
||||
|
||||
|
||||
public enum IsTagDict {
|
||||
|
||||
SYS_DICT_SYSTEM("系统数据字典标志值","0"),
|
||||
;
|
||||
String name;
|
||||
String value;
|
||||
|
||||
private IsTagDict(String name, String value) {
|
||||
this.name = name;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
public void setValue(String value) {
|
||||
this.value = value;
|
||||
}
|
||||
}
|
||||
+2
-1
@@ -17,6 +17,7 @@ import com.jero.common.util.ImportExcelUtil;
|
||||
import com.jero.common.util.SqlInjectionUtil;
|
||||
import com.jero.common.util.oConvertUtils;
|
||||
import com.jero.modules.enums.FixedFieldEnum;
|
||||
import com.jero.modules.enums.IsTagDict;
|
||||
import com.jero.modules.system.entity.SysDict;
|
||||
import com.jero.modules.system.entity.SysDictItem;
|
||||
import com.jero.modules.system.entity.SysUser;
|
||||
@@ -81,7 +82,7 @@ public class SysDictController {
|
||||
Result<IPage<SysDict>> result = new Result<IPage<SysDict>>();
|
||||
QueryWrapper<SysDict> queryWrapper = QueryGenerator.initQueryWrapper(sysDict, req.getParameterMap());
|
||||
queryWrapper.eq("del_flag",CommonConstant.DEL_FLAG_0);
|
||||
queryWrapper.eq("is_tag_dict",FixedFieldEnum.SYS_DICT_SYSTEM.getValue());
|
||||
queryWrapper.eq("is_tag_dict", IsTagDict.SYS_DICT_SYSTEM.getValue());
|
||||
Page<SysDict> page = new Page<SysDict>(pageNo, pageSize);
|
||||
IPage<SysDict> pageList = sysDictService.page(page, queryWrapper);
|
||||
log.debug("查询当前页:"+pageList.getCurrent());
|
||||
|
||||
Reference in New Issue
Block a user