Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
RuoYi Vue
Commits
526c3867
Commit
526c3867
authored
Apr 21, 2020
by
RuoYi
Browse files
代码生成Date字段添加默认格式
parent
d452ddf5
Changes
4
Hide whitespace changes
Inline
Side-by-side
ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
View file @
526c3867
...
...
@@ -196,6 +196,7 @@ public class VelocityUtils
if
(!
column
.
isSuperColumn
()
&&
GenConstants
.
TYPE_DATE
.
equals
(
column
.
getJavaType
()))
{
importList
.
add
(
"java.util.Date"
);
importList
.
add
(
"com.fasterxml.jackson.annotation.JsonFormat"
);
}
else
if
(!
column
.
isSuperColumn
()
&&
GenConstants
.
TYPE_BIGDECIMAL
.
equals
(
column
.
getJavaType
()))
{
...
...
ruoyi/src/main/resources/vm/java/domain.java.vm
View file @
526c3867
package
${
packageName
}
.domain;
#
foreach
($
import
in
$
importList
)
import
${
import
}
;
#
end
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
...
...
@@ -8,9 +11,6 @@ import com.ruoyi.framework.web.domain.BaseEntity;
#
elseif
($
table
.
tree
)
import com.ruoyi.framework.web.domain.TreeEntity;
#
end
#
foreach
($
import
in
$
importList
)
import
${
import
}
;
#
end
/**
*
${
functionName
}
对象
${
tableName
}
...
...
@@ -40,6 +40,7 @@ public class ${ClassName} extends ${Entity}
#
if
($
parentheseIndex
!=
-
1
)
@Excel(name = "
${
comment
}
", readConverterExp = "
$
column
.
readConverterExp
()
")
#
elseif
($
column
.
javaType
==
'Date'
)
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "
${
comment
}
", width = 30, dateFormat = "yyyy-MM-dd")
#
else
@Excel(name = "
${
comment
}
")
...
...
ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
View file @
526c3867
...
...
@@ -88,7 +88,7 @@
#
elseif
($
column
.
list
&&
$
column
.
htmlType
==
"datetime"
)
<el-table-column
label=
"
${
comment
}
"
align=
"center"
prop=
"
${
javaField
}
"
width=
"180"
>
<template
slot-scope=
"scope"
>
<span>
{{
parseTime(scope.row.
${
javaField
}
) }}
</span>
<span>
{{
parseTime(scope.row.
${
javaField
}
)
, '
{
y}-
{
m}-
{
d}')
}}
</span>
</template>
</el-table-column>
#
elseif
($
column
.
list
&&
""
!=
$
column
.
dictType
)
...
...
ruoyi/src/main/resources/vm/vue/index.vue.vm
View file @
526c3867
...
...
@@ -112,7 +112,7 @@
#
elseif
($
column
.
list
&&
$
column
.
htmlType
==
"datetime"
)
<el-table-column
label=
"
${
comment
}
"
align=
"center"
prop=
"
${
javaField
}
"
width=
"180"
>
<template
slot-scope=
"scope"
>
<span>
{{
parseTime(scope.row.
${
javaField
}
) }}
</span>
<span>
{{
parseTime(scope.row.
${
javaField
}
, '
{
y}-
{
m}-
{
d}'
) }}
</span>
</template>
</el-table-column>
#
elseif
($
column
.
list
&&
""
!=
$
column
.
dictType
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment