BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 526c3867b412698f8ab08f2568a81e95010b462b

Authored by RuoYi
1 parent d452ddf5

代码生成Date字段添加默认格式

Inline Side-by-side
Showing 4 changed files with 7 additions and 5 deletions
ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
  View file @526c386
... ... @@ -196,6 +196,7 @@ public class VelocityUtils
196 196 if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType()))
197 197 {
198 198 importList.add("java.util.Date");
  199 + importList.add("com.fasterxml.jackson.annotation.JsonFormat");
199 200 }
200 201 else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType()))
201 202 {
... ...
ruoyi/src/main/resources/vm/java/domain.java.vm
  View file @526c386
1 1 package ${packageName}.domain;
2 2  
  3 +#foreach ($import in $importList)
  4 +import ${import};
  5 +#end
3 6 import org.apache.commons.lang3.builder.ToStringBuilder;
4 7 import org.apache.commons.lang3.builder.ToStringStyle;
5 8 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
... ... @@ -8,9 +11,6 @@ import com.ruoyi.framework.web.domain.BaseEntity;
8 11 #elseif($table.tree)
9 12 import com.ruoyi.framework.web.domain.TreeEntity;
10 13 #end
11   -#foreach ($import in $importList)
12   -import ${import};
13   -#end
14 14  
15 15 /**
16 16 * ${functionName}对象 ${tableName}
... ... @@ -40,6 +40,7 @@ public class ${ClassName} extends ${Entity}
40 40 #if($parentheseIndex != -1)
41 41 @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
42 42 #elseif($column.javaType == 'Date')
  43 + @JsonFormat(pattern = "yyyy-MM-dd")
43 44 @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
44 45 #else
45 46 @Excel(name = "${comment}")
... ...
ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
  View file @526c386
... ... @@ -88,7 +88,7 @@
88 88 #elseif($column.list && $column.htmlType == "datetime")
89 89 <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
90 90 <template slot-scope="scope">
91   - <span>{{ parseTime(scope.row.${javaField}) }}</span>
  91 + <span>{{ parseTime(scope.row.${javaField}), '{y}-{m}-{d}') }}</span>
92 92 </template>
93 93 </el-table-column>
94 94 #elseif($column.list && "" != $column.dictType)
... ...
ruoyi/src/main/resources/vm/vue/index.vue.vm
  View file @526c386
... ... @@ -112,7 +112,7 @@
112 112 #elseif($column.list && $column.htmlType == "datetime")
113 113 <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
114 114 <template slot-scope="scope">
115   - <span>{{ parseTime(scope.row.${javaField}) }}</span>
  115 + <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
116 116 </template>
117 117 </el-table-column>
118 118 #elseif($column.list && "" != $column.dictType)
... ...