diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index a90f0a03..acf72f0f 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -37,15 +37,15 @@ public class ${entityName} implements Serializable { <#-- 生成字典Code --> <#assign list_field_dictCode=""> <#if po.classType='sel_user'> - <#assign list_field_dictCode=', dictTable = "sys_user", dicText = "realname", dicCode = "username"'> - <#elseif po.classType='sel_depart'> - <#assign list_field_dictCode=', dictTable = "sys_depart", dicText = "depart_name", dicCode = "id"'> - <#elseif po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='radio' || po.classType=='checkbox'> - <#if po.dictTable?default("")?trim?length gt 1> - <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'> - <#elseif po.dictField?default("")?trim?length gt 1> - <#assign list_field_dictCode=', dicCode = "${po.dictField}"'> - + <#assign list_field_dictCode=', dictTable = "sys_user", dicText = "realname", dicCode = "username"'> + <#elseif po.classType='sel_depart'> + <#assign list_field_dictCode=', dictTable = "sys_depart", dicText = "depart_name", dicCode = "id"'> + <#elseif po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='radio' || po.classType=='checkbox'> + <#if po.dictTable?default("")?trim?length gt 1> + <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'> + <#elseif po.dictField?default("")?trim?length gt 1> + <#assign list_field_dictCode=', dicCode = "${po.dictField}"'> + /**${po.filedComment}*/ <#if po.fieldName == primaryKeyField> @@ -53,34 +53,34 @@ public class ${entityName} implements Serializable { <#else> <#if po.fieldDbType =='Date'> <#if po.classType=='date'> - <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> + <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode}) - + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @JsonSerialize(using = com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer.class) @DateTimeFormat(pattern="yyyy-MM-dd") <#else> - <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> + <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss"${list_field_dictCode}) - + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonSerialize(using = com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer.class) @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") <#else> - <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> + <#if !excel_ignore_arr?seq_contains("${po.fieldName}")> @Excel(name = "${po.filedComment}", width = 15${list_field_dictCode}) - - - <#if list_field_dictCode?length gt 1> + + + <#if list_field_dictCode?length gt 1> @Dict(${list_field_dictCode?substring(2)}) - + <#-- <#if po.classType!='popup'> - <#if po.dictTable?default("")?trim?length gt 1> + <#if po.dictTable?default("")?trim?length gt 1> @Dict(dicCode="${po.dictField}",dicText="${po.dictText}",dictTable="${po.dictTable}") - <#elseif po.dictField?default("")?trim?length gt 1> + <#elseif po.dictField?default("")?trim?length gt 1> @Dict(dicCode="${po.dictField}") - + --> <#include "/common/blob.ftl">