diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm index 2e9430f6..54ed168c 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -329,7 +329,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { #elseif(!$dateFields.contains($column.columnName) and !$column.javaField.equals("isDelete")) model.set${AttrName}(${entityName}Param.get${AttrName}()); #elseif($dateFields.contains($column.columnName)) - model.set${AttrName}(System.currentTimeMillis() / 1000); + model.set${AttrName}(TimeUtil.dateToTimestamp(${entityName}Param.get${AttrName}())); #end #end #end @@ -364,7 +364,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { #elseif(!$dateFields.contains($column.columnName) and !$column.javaField.equals("isDelete")) model.set${AttrName}(${entityName}Param.get${AttrName}()); #elseif($dateFields.contains($column.columnName)) - model.set${AttrName}(System.currentTimeMillis() / 1000); + model.set${AttrName}(TimeUtil.dateToTimestamp(${entityName}Param.get${AttrName}())); #end #end #end diff --git a/server/like-generator/src/main/resources/java/validate.java.vm b/server/like-generator/src/main/resources/java/validate.java.vm index 21840b84..6857bf4f 100644 --- a/server/like-generator/src/main/resources/java/validate.java.vm +++ b/server/like-generator/src/main/resources/java/validate.java.vm @@ -41,7 +41,11 @@ public class ${EntityName}Param implements Serializable { #if(!$column.isPk && $column.javaField.substring(0,2)=="is" && $column.javaType.equals("Integer")) @IntegerContains(values = {0, 1}, message = "${column.javaField}参数值不在符合范围", groups = {#if($column.isInsert)create.class#end#if($column.isInsert&&$column.isEdit), #end#if($column.isEdit)update.class#end}) #end + #if($column.htmlType=="datetime") + private String ${column.javaField}; + #else private ${column.javaType} ${column.javaField}; + #end #end #end