正在显示
4 个修改的文件
包含
7 行增加
和
5 行删除
| @@ -196,6 +196,7 @@ public class VelocityUtils | @@ -196,6 +196,7 @@ public class VelocityUtils | ||
| 196 | if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType())) | 196 | if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType())) |
| 197 | { | 197 | { |
| 198 | importList.add("java.util.Date"); | 198 | importList.add("java.util.Date"); |
| 199 | + importList.add("com.fasterxml.jackson.annotation.JsonFormat"); | ||
| 199 | } | 200 | } |
| 200 | else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType())) | 201 | else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType())) |
| 201 | { | 202 | { |
| 1 | package ${packageName}.domain; | 1 | package ${packageName}.domain; |
| 2 | 2 | ||
| 3 | +#foreach ($import in $importList) | ||
| 4 | +import ${import}; | ||
| 5 | +#end | ||
| 3 | import org.apache.commons.lang3.builder.ToStringBuilder; | 6 | import org.apache.commons.lang3.builder.ToStringBuilder; |
| 4 | import org.apache.commons.lang3.builder.ToStringStyle; | 7 | import org.apache.commons.lang3.builder.ToStringStyle; |
| 5 | import com.ruoyi.framework.aspectj.lang.annotation.Excel; | 8 | import com.ruoyi.framework.aspectj.lang.annotation.Excel; |
| @@ -8,9 +11,6 @@ import com.ruoyi.framework.web.domain.BaseEntity; | @@ -8,9 +11,6 @@ import com.ruoyi.framework.web.domain.BaseEntity; | ||
| 8 | #elseif($table.tree) | 11 | #elseif($table.tree) |
| 9 | import com.ruoyi.framework.web.domain.TreeEntity; | 12 | import com.ruoyi.framework.web.domain.TreeEntity; |
| 10 | #end | 13 | #end |
| 11 | -#foreach ($import in $importList) | ||
| 12 | -import ${import}; | ||
| 13 | -#end | ||
| 14 | 14 | ||
| 15 | /** | 15 | /** |
| 16 | * ${functionName}对象 ${tableName} | 16 | * ${functionName}对象 ${tableName} |
| @@ -40,6 +40,7 @@ public class ${ClassName} extends ${Entity} | @@ -40,6 +40,7 @@ public class ${ClassName} extends ${Entity} | ||
| 40 | #if($parentheseIndex != -1) | 40 | #if($parentheseIndex != -1) |
| 41 | @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") | 41 | @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") |
| 42 | #elseif($column.javaType == 'Date') | 42 | #elseif($column.javaType == 'Date') |
| 43 | + @JsonFormat(pattern = "yyyy-MM-dd") | ||
| 43 | @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") | 44 | @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") |
| 44 | #else | 45 | #else |
| 45 | @Excel(name = "${comment}") | 46 | @Excel(name = "${comment}") |
| @@ -88,7 +88,7 @@ | @@ -88,7 +88,7 @@ | ||
| 88 | #elseif($column.list && $column.htmlType == "datetime") | 88 | #elseif($column.list && $column.htmlType == "datetime") |
| 89 | <el-table-column label="${comment}" align="center" prop="${javaField}" width="180"> | 89 | <el-table-column label="${comment}" align="center" prop="${javaField}" width="180"> |
| 90 | <template slot-scope="scope"> | 90 | <template slot-scope="scope"> |
| 91 | - <span>{{ parseTime(scope.row.${javaField}) }}</span> | 91 | + <span>{{ parseTime(scope.row.${javaField}), '{y}-{m}-{d}') }}</span> |
| 92 | </template> | 92 | </template> |
| 93 | </el-table-column> | 93 | </el-table-column> |
| 94 | #elseif($column.list && "" != $column.dictType) | 94 | #elseif($column.list && "" != $column.dictType) |
| @@ -112,7 +112,7 @@ | @@ -112,7 +112,7 @@ | ||
| 112 | #elseif($column.list && $column.htmlType == "datetime") | 112 | #elseif($column.list && $column.htmlType == "datetime") |
| 113 | <el-table-column label="${comment}" align="center" prop="${javaField}" width="180"> | 113 | <el-table-column label="${comment}" align="center" prop="${javaField}" width="180"> |
| 114 | <template slot-scope="scope"> | 114 | <template slot-scope="scope"> |
| 115 | - <span>{{ parseTime(scope.row.${javaField}) }}</span> | 115 | + <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span> |
| 116 | </template> | 116 | </template> |
| 117 | </el-table-column> | 117 | </el-table-column> |
| 118 | #elseif($column.list && "" != $column.dictType) | 118 | #elseif($column.list && "" != $column.dictType) |
-
请 注册 或 登录 后发表评论