wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
疯狂的狮子li 2021-05-24 16:12:46 +08:00
parent 5f584e683a a272ea07a9
commit caa81d1f4d
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
View File

@ -143,6 +143,7 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
.set(cenTableColumn.getIsEdit() == null, GenTableColumn::getIsEdit, null) .set(cenTableColumn.getIsEdit() == null, GenTableColumn::getIsEdit, null)
.set(cenTableColumn.getIsList() == null, GenTableColumn::getIsList, null) .set(cenTableColumn.getIsList() == null, GenTableColumn::getIsList, null)
.set(cenTableColumn.getIsQuery() == null, GenTableColumn::getIsQuery, null) .set(cenTableColumn.getIsQuery() == null, GenTableColumn::getIsQuery, null)
.set(cenTableColumn.getIsRequired() == null, GenTableColumn::getIsRequired, null)
.eq(GenTableColumn::getColumnId,cenTableColumn.getColumnId())); .eq(GenTableColumn::getColumnId,cenTableColumn.getColumnId()));
} }
} }
@ -458,4 +459,4 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
} }
return genPath + File.separator + VelocityUtils.getFileName(template, table); return genPath + File.separator + VelocityUtils.getFileName(template, table);
} }
} }

2
ruoyi-generator/src/main/resources/vm/java/addBo.java.vm
View File

@ -29,10 +29,12 @@ public class ${ClassName}AddBo {
#if($column.javaType == 'Date') #if($column.javaType == 'Date')
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
#end #end
#if($column.isRequired==1)
#if($column.javaType == 'String') #if($column.javaType == 'String')
@NotBlank(message = "$column.columnComment不能为空") @NotBlank(message = "$column.columnComment不能为空")
#else #else
@NotNull(message = "$column.columnComment不能为空") @NotNull(message = "$column.columnComment不能为空")
#end
#end #end
private $column.javaType $column.javaField; private $column.javaType $column.javaField;
#end #end

2
ruoyi-generator/src/main/resources/vm/java/editBo.java.vm
View File

@ -29,10 +29,12 @@ public class ${ClassName}EditBo {
#if($column.javaType == 'Date') #if($column.javaType == 'Date')
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
#end #end
#if($column.isRequired==1)
#if($column.javaType == 'String') #if($column.javaType == 'String')
@NotBlank(message = "$column.columnComment不能为空") @NotBlank(message = "$column.columnComment不能为空")
#else #else
@NotNull(message = "$column.columnComment不能为空") @NotNull(message = "$column.columnComment不能为空")
#end
#end #end
private $column.javaType $column.javaField; private $column.javaType $column.javaField;
#end #end