Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzdict
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzdict
提交
a9d1d8ab
提交
a9d1d8ab
编写于
4月 19, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibizdev提交
上级
21b8444e
变更
3
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
20 行增加
和
19 行删除
+20
-19
IBZDict.java
...re/src/main/java/cn/ibizlab/core/dict/domain/IBZDict.java
+6
-6
IBZDictItem.java
...rc/main/java/cn/ibizlab/core/dict/domain/IBZDictItem.java
+13
-13
IBZDictServiceImpl.java
...cn/ibizlab/core/dict/service/impl/IBZDictServiceImpl.java
+1
-0
未找到文件。
ibzdict-core/src/main/java/cn/ibizlab/core/dict/domain/IBZDict.java
浏览文件 @
a9d1d8ab
...
@@ -39,14 +39,14 @@ public class IBZDict implements Serializable {
...
@@ -39,14 +39,14 @@ public class IBZDict implements Serializable {
@DEField
(
isKeyField
=
true
)
@DEField
(
isKeyField
=
true
)
@JSONField
(
name
=
"dictid"
)
@JSONField
(
name
=
"dictid"
)
@JsonProperty
(
"dictid"
)
@JsonProperty
(
"dictid"
)
private
String
dict
I
d
;
private
String
dict
i
d
;
/**
/**
* 字典名称
* 字典名称
*/
*/
@JSONField
(
name
=
"dictname"
)
@JSONField
(
name
=
"dictname"
)
@JsonProperty
(
"dictname"
)
@JsonProperty
(
"dictname"
)
private
String
dict
N
ame
;
private
String
dict
n
ame
;
/**
/**
* 逻辑有效标志
* 逻辑有效标志
...
@@ -63,7 +63,7 @@ public class IBZDict implements Serializable {
...
@@ -63,7 +63,7 @@ public class IBZDict implements Serializable {
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
locale
=
"zh"
,
timezone
=
"GMT+8"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
locale
=
"zh"
,
timezone
=
"GMT+8"
)
@JSONField
(
name
=
"createdate"
,
format
=
"yyyy-MM-dd HH:mm:ss"
)
@JSONField
(
name
=
"createdate"
,
format
=
"yyyy-MM-dd HH:mm:ss"
)
@JsonProperty
(
"createdate"
)
@JsonProperty
(
"createdate"
)
private
Timestamp
create
D
ate
;
private
Timestamp
create
d
ate
;
/**
/**
* 更新时间
* 更新时间
...
@@ -72,7 +72,7 @@ public class IBZDict implements Serializable {
...
@@ -72,7 +72,7 @@ public class IBZDict implements Serializable {
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
locale
=
"zh"
,
timezone
=
"GMT+8"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
locale
=
"zh"
,
timezone
=
"GMT+8"
)
@JSONField
(
name
=
"updatedate"
,
format
=
"yyyy-MM-dd HH:mm:ss"
)
@JSONField
(
name
=
"updatedate"
,
format
=
"yyyy-MM-dd HH:mm:ss"
)
@JsonProperty
(
"updatedate"
)
@JsonProperty
(
"updatedate"
)
private
Timestamp
update
D
ate
;
private
Timestamp
update
d
ate
;
/**
/**
* 建立人
* 建立人
...
@@ -80,7 +80,7 @@ public class IBZDict implements Serializable {
...
@@ -80,7 +80,7 @@ public class IBZDict implements Serializable {
@DEField
(
preType
=
DEPredefinedFieldType
.
CREATEMAN
)
@DEField
(
preType
=
DEPredefinedFieldType
.
CREATEMAN
)
@JSONField
(
name
=
"createman"
)
@JSONField
(
name
=
"createman"
)
@JsonProperty
(
"createman"
)
@JsonProperty
(
"createman"
)
private
String
create
M
an
;
private
String
create
m
an
;
/**
/**
* 更新人
* 更新人
...
@@ -88,7 +88,7 @@ public class IBZDict implements Serializable {
...
@@ -88,7 +88,7 @@ public class IBZDict implements Serializable {
@DEField
(
preType
=
DEPredefinedFieldType
.
UPDATEMAN
)
@DEField
(
preType
=
DEPredefinedFieldType
.
UPDATEMAN
)
@JSONField
(
name
=
"updateman"
)
@JSONField
(
name
=
"updateman"
)
@JsonProperty
(
"updateman"
)
@JsonProperty
(
"updateman"
)
private
String
update
M
an
;
private
String
update
m
an
;
...
...
ibzdict-core/src/main/java/cn/ibizlab/core/dict/domain/IBZDictItem.java
浏览文件 @
a9d1d8ab
...
@@ -31,42 +31,42 @@ public class IBZDictItem implements Serializable {
...
@@ -31,42 +31,42 @@ public class IBZDictItem implements Serializable {
@DEField
(
isKeyField
=
true
)
@DEField
(
isKeyField
=
true
)
@JSONField
(
name
=
"itemid"
)
@JSONField
(
name
=
"itemid"
)
@JsonProperty
(
"itemid"
)
@JsonProperty
(
"itemid"
)
private
String
item
I
d
;
private
String
item
i
d
;
/**
/**
* 栏目显示值
* 栏目显示值
*/
*/
@JSONField
(
name
=
"itemname"
)
@JSONField
(
name
=
"itemname"
)
@JsonProperty
(
"itemname"
)
@JsonProperty
(
"itemname"
)
private
String
item
N
ame
;
private
String
item
n
ame
;
/**
/**
* 栏目值
* 栏目值
*/
*/
@JSONField
(
name
=
"itemval"
)
@JSONField
(
name
=
"itemval"
)
@JsonProperty
(
"itemval"
)
@JsonProperty
(
"itemval"
)
private
String
item
V
al
;
private
String
item
v
al
;
/**
/**
* 字典标识
* 字典标识
*/
*/
@JSONField
(
name
=
"dictid"
)
@JSONField
(
name
=
"dictid"
)
@JsonProperty
(
"dictid"
)
@JsonProperty
(
"dictid"
)
private
String
dict
I
d
;
private
String
dict
i
d
;
/**
/**
* 父栏目值
* 父栏目值
*/
*/
@JSONField
(
name
=
"pitemval"
)
@JSONField
(
name
=
"pitemval"
)
@JsonProperty
(
"pitemval"
)
@JsonProperty
(
"pitemval"
)
private
String
p
ItemV
al
;
private
String
p
itemv
al
;
/**
/**
* 过滤项
* 过滤项
*/
*/
@JSONField
(
name
=
"itemfilter"
)
@JSONField
(
name
=
"itemfilter"
)
@JsonProperty
(
"itemfilter"
)
@JsonProperty
(
"itemfilter"
)
private
String
item
F
ilter
;
private
String
item
f
ilter
;
/**
/**
* 栏目样式
* 栏目样式
...
@@ -74,7 +74,7 @@ public class IBZDictItem implements Serializable {
...
@@ -74,7 +74,7 @@ public class IBZDictItem implements Serializable {
@DEField
(
defaultValue
=
"itemcls"
,
defaultValueType
=
DEFieldDefaultValueType
.
PARAM
)
@DEField
(
defaultValue
=
"itemcls"
,
defaultValueType
=
DEFieldDefaultValueType
.
PARAM
)
@JSONField
(
name
=
"itemcls"
)
@JSONField
(
name
=
"itemcls"
)
@JsonProperty
(
"itemcls"
)
@JsonProperty
(
"itemcls"
)
private
String
item
C
ls
;
private
String
item
c
ls
;
/**
/**
* 图标
* 图标
...
@@ -82,14 +82,14 @@ public class IBZDictItem implements Serializable {
...
@@ -82,14 +82,14 @@ public class IBZDictItem implements Serializable {
@DEField
(
defaultValue
=
"no,png"
)
@DEField
(
defaultValue
=
"no,png"
)
@JSONField
(
name
=
"itemicon"
)
@JSONField
(
name
=
"itemicon"
)
@JsonProperty
(
"itemicon"
)
@JsonProperty
(
"itemicon"
)
private
String
item
I
con
;
private
String
item
i
con
;
/**
/**
* 排序
* 排序
*/
*/
@JSONField
(
name
=
"showorder"
)
@JSONField
(
name
=
"showorder"
)
@JsonProperty
(
"showorder"
)
@JsonProperty
(
"showorder"
)
private
Integer
show
O
rder
;
private
Integer
show
o
rder
;
/**
/**
* 建立时间
* 建立时间
...
@@ -98,7 +98,7 @@ public class IBZDictItem implements Serializable {
...
@@ -98,7 +98,7 @@ public class IBZDictItem implements Serializable {
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
locale
=
"zh"
,
timezone
=
"GMT+8"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
locale
=
"zh"
,
timezone
=
"GMT+8"
)
@JSONField
(
name
=
"createdate"
,
format
=
"yyyy-MM-dd HH:mm:ss"
)
@JSONField
(
name
=
"createdate"
,
format
=
"yyyy-MM-dd HH:mm:ss"
)
@JsonProperty
(
"createdate"
)
@JsonProperty
(
"createdate"
)
private
Timestamp
create
D
ate
;
private
Timestamp
create
d
ate
;
/**
/**
* 更新时间
* 更新时间
...
@@ -107,7 +107,7 @@ public class IBZDictItem implements Serializable {
...
@@ -107,7 +107,7 @@ public class IBZDictItem implements Serializable {
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
locale
=
"zh"
,
timezone
=
"GMT+8"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
locale
=
"zh"
,
timezone
=
"GMT+8"
)
@JSONField
(
name
=
"updatedate"
,
format
=
"yyyy-MM-dd HH:mm:ss"
)
@JSONField
(
name
=
"updatedate"
,
format
=
"yyyy-MM-dd HH:mm:ss"
)
@JsonProperty
(
"updatedate"
)
@JsonProperty
(
"updatedate"
)
private
Timestamp
update
D
ate
;
private
Timestamp
update
d
ate
;
/**
/**
* 建立人
* 建立人
...
@@ -115,7 +115,7 @@ public class IBZDictItem implements Serializable {
...
@@ -115,7 +115,7 @@ public class IBZDictItem implements Serializable {
@DEField
(
preType
=
DEPredefinedFieldType
.
CREATEMAN
)
@DEField
(
preType
=
DEPredefinedFieldType
.
CREATEMAN
)
@JSONField
(
name
=
"createman"
)
@JSONField
(
name
=
"createman"
)
@JsonProperty
(
"createman"
)
@JsonProperty
(
"createman"
)
private
String
create
M
an
;
private
String
create
m
an
;
/**
/**
* 更新人
* 更新人
...
@@ -123,7 +123,7 @@ public class IBZDictItem implements Serializable {
...
@@ -123,7 +123,7 @@ public class IBZDictItem implements Serializable {
@DEField
(
defaultValue
=
"SRFPERSONID"
,
defaultValueType
=
DEFieldDefaultValueType
.
SESSION
,
preType
=
DEPredefinedFieldType
.
UPDATEMAN
)
@DEField
(
defaultValue
=
"SRFPERSONID"
,
defaultValueType
=
DEFieldDefaultValueType
.
SESSION
,
preType
=
DEPredefinedFieldType
.
UPDATEMAN
)
@JSONField
(
name
=
"updateman"
)
@JSONField
(
name
=
"updateman"
)
@JsonProperty
(
"updateman"
)
@JsonProperty
(
"updateman"
)
private
String
update
M
an
;
private
String
update
m
an
;
/**
/**
...
...
ibzdict-core/src/main/java/cn/ibizlab/core/dict/service/impl/IBZDictServiceImpl.java
浏览文件 @
a9d1d8ab
...
@@ -18,6 +18,7 @@ import org.springframework.data.domain.Page;
...
@@ -18,6 +18,7 @@ import org.springframework.data.domain.Page;
import
org.springframework.data.domain.PageImpl
;
import
org.springframework.data.domain.PageImpl
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.transaction.annotation.Transactional
;
import
cn.ibizlab.core.dict.domain.IBZDict
;
import
cn.ibizlab.core.dict.domain.IBZDict
;
import
cn.ibizlab.core.dict.filter.IBZDictSearchContext
;
import
cn.ibizlab.core.dict.filter.IBZDictSearchContext
;
import
cn.ibizlab.core.dict.service.IIBZDictService
;
import
cn.ibizlab.core.dict.service.IIBZDictService
;
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录