wms / wms4_hunanhongwang · Commits

Commit 9c2ef5150969e7dea0f4f899b247a995ca192586

Authored by zhangdaiscott
1 parent 042a6dd8

20210617 【gitee/I3HTFI】自定义树控件的表单里的外键直接显示id不显示name的问题

Inline Side-by-side
Showing 11 changed files with 38 additions and 38 deletions
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
  View file @9c2ef51
... ... @@ -55,13 +55,13 @@ public class ${entityName} implements Serializable {
55 55 <#if po.fieldDbType =='Date'>
56 56 <#if po.classType=='date'>
57 57 <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
58   - @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode})
  58 + @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
59 59 </#if>
60 60 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
61 61 @DateTimeFormat(pattern="yyyy-MM-dd")
62 62 <#else>
63 63 <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
64   - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss"${list_field_dictCode})
  64 + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
65 65 </#if>
66 66 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
67 67 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
  View file @9c2ef51
... ... @@ -39,9 +39,9 @@ public class ${entityName} implements Serializable {
39 39 <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'>
40 40 <#elseif po.dictField?default("")?trim?length gt 1>
41 41 <#assign list_field_dictCode=', dicCode = "${po.dictField}"'>
42   - <#elseif po.classType=='sel_tree'>
43   - <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'>
44   - </#if>
  42 + </#if>
  43 + <#elseif po.classType=='sel_tree'>
  44 + <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'>
45 45 </#if>
46 46 /**${po.filedComment}*/
47 47 <#if po.fieldName == primaryKeyField>
... ... @@ -50,13 +50,13 @@ public class ${entityName} implements Serializable {
50 50 <#if po.fieldDbType =='Date'>
51 51 <#if po.classType=='date'>
52 52 <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
53   - @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode})
  53 + @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
54 54 </#if>
55 55 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
56 56 @DateTimeFormat(pattern="yyyy-MM-dd")
57 57 <#else>
58 58 <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
59   - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss"${list_field_dictCode})
  59 + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
60 60 </#if>
61 61 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
62 62 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
  View file @9c2ef51
... ... @@ -51,13 +51,13 @@ public class ${subTab.entityName} implements Serializable {
51 51 <#if po.fieldDbType =='Date'>
52 52 <#if po.classType=='date'>
53 53 <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
54   - @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode})
  54 + @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
55 55 </#if>
56 56 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
57 57 @DateTimeFormat(pattern="yyyy-MM-dd")
58 58 <#else>
59 59 <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
60   - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss"${list_field_dictCode})
  60 + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
61 61 </#if>
62 62 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
63 63 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
  View file @9c2ef51
... ... @@ -40,9 +40,9 @@ public class ${entityName} implements Serializable {
40 40 <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'>
41 41 <#elseif po.dictField?default("")?trim?length gt 1>
42 42 <#assign list_field_dictCode=', dicCode = "${po.dictField}"'>
43   - <#elseif po.classType=='sel_tree'>
44   - <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'>
45   - </#if>
  43 + </#if>
  44 + <#elseif po.classType=='sel_tree'>
  45 + <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'>
46 46 </#if>
47 47 /**${po.filedComment}*/
48 48 <#if po.fieldName == primaryKeyField>
... ... @@ -51,13 +51,13 @@ public class ${entityName} implements Serializable {
51 51 <#if po.fieldDbType =='Date'>
52 52 <#if po.classType=='date'>
53 53 <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
54   - @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode})
  54 + @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
55 55 </#if>
56 56 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
57 57 @DateTimeFormat(pattern="yyyy-MM-dd")
58 58 <#else>
59 59 <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
60   - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss"${list_field_dictCode})
  60 + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
61 61 </#if>
62 62 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
63 63 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
  View file @9c2ef51
... ... @@ -39,9 +39,9 @@ public class ${entityName} implements Serializable {
39 39 <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'>
40 40 <#elseif po.dictField?default("")?trim?length gt 1>
41 41 <#assign list_field_dictCode=', dicCode = "${po.dictField}"'>
42   - <#elseif po.classType=='sel_tree'>
43   - <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'>
44   - </#if>
  42 + </#if>
  43 + <#elseif po.classType=='sel_tree'>
  44 + <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'>
45 45 </#if>
46 46 /**${po.filedComment}*/
47 47 <#if po.fieldName == primaryKeyField>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
  View file @9c2ef51
... ... @@ -39,9 +39,9 @@ public class ${entityName} implements Serializable {
39 39 <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'>
40 40 <#elseif po.dictField?default("")?trim?length gt 1>
41 41 <#assign list_field_dictCode=', dicCode = "${po.dictField}"'>
42   - <#elseif po.classType=='sel_tree'>
43   - <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'>
44   - </#if>
  42 + </#if>
  43 + <#elseif po.classType=='sel_tree'>
  44 + <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'>
45 45 </#if>
46 46 /**${po.filedComment}*/
47 47 <#if po.fieldName == primaryKeyField>
... ... @@ -50,13 +50,13 @@ public class ${entityName} implements Serializable {
50 50 <#if po.fieldDbType =='Date'>
51 51 <#if po.classType=='date'>
52 52 <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
53   - @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode})
  53 + @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
54 54 </#if>
55 55 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
56 56 @DateTimeFormat(pattern="yyyy-MM-dd")
57 57 <#else>
58 58 <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
59   - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss"${list_field_dictCode})
  59 + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
60 60 </#if>
61 61 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
62 62 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
  View file @9c2ef51
... ... @@ -52,13 +52,13 @@ public class ${subTab.entityName} implements Serializable {
52 52 <#if po.fieldDbType =='Date'>
53 53 <#if po.classType=='date'>
54 54 <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
55   - @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode})
  55 + @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
56 56 </#if>
57 57 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
58 58 @DateTimeFormat(pattern="yyyy-MM-dd")
59 59 <#else>
60 60 <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
61   - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss"${list_field_dictCode})
  61 + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
62 62 </#if>
63 63 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
64 64 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
  View file @9c2ef51
... ... @@ -39,9 +39,9 @@ public class ${entityName} implements Serializable {
39 39 <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'>
40 40 <#elseif po.dictField?default("")?trim?length gt 1>
41 41 <#assign list_field_dictCode=', dicCode = "${po.dictField}"'>
42   - <#elseif po.classType=='sel_tree'>
43   - <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'>
44   - </#if>
  42 + </#if>
  43 + <#elseif po.classType=='sel_tree'>
  44 + <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'>
45 45 </#if>
46 46 /**${po.filedComment}*/
47 47 <#if po.fieldName == primaryKeyField>
... ... @@ -50,13 +50,13 @@ public class ${entityName} implements Serializable {
50 50 <#if po.fieldDbType =='Date'>
51 51 <#if po.classType=='date'>
52 52 <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
53   - @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode})
  53 + @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
54 54 </#if>
55 55 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
56 56 @DateTimeFormat(pattern="yyyy-MM-dd")
57 57 <#else>
58 58 <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
59   - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss"${list_field_dictCode})
  59 + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
60 60 </#if>
61 61 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
62 62 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
  View file @9c2ef51
... ... @@ -51,13 +51,13 @@ public class ${subTab.entityName} implements Serializable {
51 51 <#if po.fieldDbType =='Date'>
52 52 <#if po.classType=='date'>
53 53 <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
54   - @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode})
  54 + @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
55 55 </#if>
56 56 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
57 57 @DateTimeFormat(pattern="yyyy-MM-dd")
58 58 <#else>
59 59 <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
60   - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss"${list_field_dictCode})
  60 + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
61 61 </#if>
62 62 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
63 63 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
  View file @9c2ef51
... ... @@ -39,9 +39,9 @@ public class ${entityName} implements Serializable {
39 39 <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'>
40 40 <#elseif po.dictField?default("")?trim?length gt 1>
41 41 <#assign list_field_dictCode=', dicCode = "${po.dictField}"'>
42   - <#elseif po.classType=='sel_tree'>
43   - <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'>
44   - </#if>
  42 + </#if>
  43 + <#elseif po.classType=='sel_tree'>
  44 + <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'>
45 45 </#if>
46 46 /**${po.filedComment}*/
47 47 <#if po.fieldName == primaryKeyField>
... ... @@ -50,13 +50,13 @@ public class ${entityName} implements Serializable {
50 50 <#if po.fieldDbType =='Date'>
51 51 <#if po.classType=='date'>
52 52 <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
53   - @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode})
  53 + @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
54 54 </#if>
55 55 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
56 56 @DateTimeFormat(pattern="yyyy-MM-dd")
57 57 <#else>
58 58 <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
59   - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss"${list_field_dictCode})
  59 + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
60 60 </#if>
61 61 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
62 62 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
  View file @9c2ef51
... ... @@ -51,13 +51,13 @@ public class ${subTab.entityName} implements Serializable {
51 51 <#if po.fieldDbType =='Date'>
52 52 <#if po.classType=='date'>
53 53 <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
54   - @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode})
  54 + @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
55 55 </#if>
56 56 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
57 57 @DateTimeFormat(pattern="yyyy-MM-dd")
58 58 <#else>
59 59 <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
60   - @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss"${list_field_dictCode})
  60 + @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
61 61 </#if>
62 62 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
63 63 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
... ...