From 28935880f9db90d60e17553182557ff46b66d6c0 Mon Sep 17 00:00:00 2001 From: yxh Date: Thu, 9 Sep 2021 10:25:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=A0=91?= =?UTF-8?q?=E5=BD=A2=E8=8F=9C=E5=8D=95bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/vm/go/dao.template | 13 +++++++++++++ template/vm/go/service.template | 17 +++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/template/vm/go/dao.template b/template/vm/go/dao.template index 581946e..5f633f7 100644 --- a/template/vm/go/dao.template +++ b/template/vm/go/dao.template @@ -87,11 +87,24 @@ type {{$.table.ClassName}}{{$column.GoField}}Req struct { // {{.table.ClassName}}ListRes 列表返回结果 type {{.table.ClassName}}ListRes struct { + {{if eq .table.TplCategory "tree"}} + {{range $index, $column := .table.Columns}} + {{if or (eq $column.HtmlField $.table.TreeCode) (eq $column.HtmlField $.table.TreeParentCode) (eq $column.HtmlField $.table.TreeName) }} + {{$column.GoField}} {{if eq $column.GoType "Time"}}*gtime.Time{{else if eq $column.HtmlType "images" "file" "files"}}[]*comModel.UpFile{{else}}{{$column.GoType}}{{end}} `json:"{{$column.HtmlField}}"` + {{end}} + {{end}} + {{range $index, $column := .table.Columns}} + {{if and (eq $column.IsList "1") (ne $column.HtmlField $.table.TreeCode) (ne $column.HtmlField $.table.TreeParentCode) (ne $column.HtmlField $.table.TreeName) }} + {{$column.GoField}} {{if eq $column.GoType "Time"}}*gtime.Time{{else if eq $column.HtmlType "images" "file" "files"}}[]*comModel.UpFile{{else}}{{$column.GoType}}{{end}} `json:"{{$column.HtmlField}}"` + {{end}} + {{end}} + {{else}} {{range $index, $column := .table.Columns}} {{if eq $column.IsList "1" }} {{$column.GoField}} {{if eq $column.GoType "Time"}}*gtime.Time{{else if eq $column.HtmlType "images" "file" "files"}}[]*comModel.UpFile{{else}}{{$column.GoType}}{{end}} `json:"{{$column.HtmlField}}"` {{end}} {{end}} + {{end}} } // {{.table.ClassName}}InfoRes 数据返回结果 diff --git a/template/vm/go/service.template b/template/vm/go/service.template index b5483ca..96a6066 100644 --- a/template/vm/go/service.template +++ b/template/vm/go/service.template @@ -132,6 +132,22 @@ func (s *{{$structName}}) GetList(req *dao.{{.table.ClassName}}SearchReq) (total {{end}} {{end}} list[k] = &dao.{{.table.ClassName}}ListRes{ + {{if eq .table.TplCategory "tree"}} + {{range $index, $column := .table.Columns}} + {{if or (eq $column.HtmlField $.table.TreeCode) (eq $column.HtmlField $.table.TreeParentCode) (eq $column.HtmlField $.table.TreeName) }} + {{$column.GoField}} : v.{{$column.GoField}}, + {{end}} + {{end}} + {{range $index, $column := .table.Columns}} + {{if and (eq $column.IsList "1") (ne $column.HtmlField $.table.TreeCode) (ne $column.HtmlField $.table.TreeParentCode) (ne $column.HtmlField $.table.TreeName) }} + {{if eq $column.HtmlType "images" "file" "files"}} + {{$column.GoField}} : {{$column.HtmlField}}, + {{else}} + {{$column.GoField}} : v.{{$column.GoField}}, + {{end}} + {{end}} + {{end}} + {{else}} {{range $index, $column := .table.Columns}} {{if eq $column.IsList "1"}} {{if eq $column.HtmlType "images" "file" "files"}} @@ -141,6 +157,7 @@ func (s *{{$structName}}) GetList(req *dao.{{.table.ClassName}}SearchReq) (total {{end}} {{end}} {{end}} + {{end}} } } return