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 54ed168c..8b320561 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -328,7 +328,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { model.set${AttrName}(UrlUtil.toRelativeUrl(${entityName}Param.get${AttrName}())); #elseif(!$dateFields.contains($column.columnName) and !$column.javaField.equals("isDelete")) model.set${AttrName}(${entityName}Param.get${AttrName}()); - #elseif($dateFields.contains($column.columnName)) + #elseif($column.htmlType=="datetime") model.set${AttrName}(TimeUtil.dateToTimestamp(${entityName}Param.get${AttrName}())); #end #end @@ -363,7 +363,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { model.set${AttrName}(UrlUtil.toRelativeUrl(${entityName}Param.get${AttrName}())); #elseif(!$dateFields.contains($column.columnName) and !$column.javaField.equals("isDelete")) model.set${AttrName}(${entityName}Param.get${AttrName}()); - #elseif($dateFields.contains($column.columnName)) + #elseif($column.htmlType=="datetime") model.set${AttrName}(TimeUtil.dateToTimestamp(${entityName}Param.get${AttrName}())); #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 6857bf4f..61a1ce76 100644 --- a/server/like-generator/src/main/resources/java/validate.java.vm +++ b/server/like-generator/src/main/resources/java/validate.java.vm @@ -35,7 +35,7 @@ public class ${EntityName}Param implements Serializable { #if(!$column.isPk && $column.javaType.equals("String") && !$column.columnType.equals('text')) @Length(max = ${column.columnLength}, message = "${column.javaField}参数不能超出${column.columnLength}个字符", groups = {#if($column.isInsert)create.class#end#if($column.isInsert&&$column.isEdit), #end#if($column.isEdit)update.class#end}) #end - #if(!$column.isPk && $column.javaField.substring(0,2)!="is" && ($column.javaType.equals("Integer") || $column.javaType.equals("Long"))) + #if(!$column.isPk && $column.javaField.substring(0,2)!="is" && $column.htmlType!="datetime" && ($column.javaType.equals("Integer") || $column.javaType.equals("Long"))) @DecimalMin(value = "0", message = "${column.javaField}参数值不能少于0", groups = {#if($column.isInsert)create.class#end#if($column.isInsert&&$column.isEdit), #end#if($column.isEdit)update.class#end}) #end #if(!$column.isPk && $column.javaField.substring(0,2)=="is" && $column.javaType.equals("Integer"))