From f1dfba79e08806af56359d3db97f70e2b30ac4f1 Mon Sep 17 00:00:00 2001 From: zgxme Date: Sat, 9 Sep 2023 22:59:45 +0800 Subject: [PATCH] [fix](gen) ignore default time type columns in table --- template/v4/dto.go.template | 32 ++++++++++++++++++-------------- template/v4/model.go.template | 32 ++++++++++++++++++-------------- 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/template/v4/dto.go.template b/template/v4/dto.go.template index 507f0c15..428b89ae 100644 --- a/template/v4/dto.go.template +++ b/template/v4/dto.go.template @@ -1,20 +1,24 @@ package dto import ( - - {{- $bb := false -}} - {{- range .Columns -}} - {{$z := .IsQuery}} - {{- if ($z) }} - {{if eq .GoType "time.Time"}}{{- $bb = true -}}{{- end -}} - {{- end -}} - {{- end -}} - {{- range .Columns -}} - {{if eq .GoType "time.Time"}}{{- $bb = true -}}{{- end -}} - {{- end -}} - {{- if eq $bb true -}} - "time" - {{- end }} + {{- $bb := false -}} + {{- range .Columns -}} + {{- $z := .IsQuery -}} + {{- if ($z) -}} + {{- if eq .GoType "time.Time" -}}{{- $bb = true -}}{{- end -}} + {{- end -}} + {{- end -}} + {{- range .Columns -}} + {{- if eq .GoField "CreatedAt" -}} + {{- else if eq .GoField "UpdatedAt" -}} + {{- else if eq .GoField "DeletedAt" -}} + {{- else -}} + {{- if eq .GoType "time.Time" -}}{{- $bb = true -}}{{- end -}} + {{- end -}} + {{- end -}} + {{- if eq $bb true }} + "time" + {{- end }} "go-admin/app/{{.PackageName}}/models" "go-admin/common/dto" diff --git a/template/v4/model.go.template b/template/v4/model.go.template index 1e34cd9b..2f56123d 100644 --- a/template/v4/model.go.template +++ b/template/v4/model.go.template @@ -1,20 +1,24 @@ package models import ( - - {{- $bb := false -}} - {{- range .Columns -}} - {{$z := .IsQuery}} - {{- if ($z) }} - {{if eq .GoType "time.Time"}}{{- $bb = true -}}{{- end -}} - {{- end -}} - {{- end -}} - {{- range .Columns -}} - {{if eq .GoType "time.Time"}}{{- $bb = true -}}{{- end -}} - {{- end -}} - {{- if eq $bb true -}} - "time" - {{- end }} + {{- $bb := false -}} + {{- range .Columns -}} + {{- $z := .IsQuery -}} + {{- if ($z) -}} + {{- if eq .GoType "time.Time" -}}{{- $bb = true -}}{{- end -}} + {{- end -}} + {{- end -}} + {{- range .Columns -}} + {{- if eq .GoField "CreatedAt" -}} + {{- else if eq .GoField "UpdatedAt" -}} + {{- else if eq .GoField "DeletedAt" -}} + {{- else -}} + {{- if eq .GoType "time.Time" -}}{{- $bb = true -}}{{- end -}} + {{- end -}} + {{- end -}} + {{- if eq $bb true }} + "time" + {{- end }} "go-admin/common/models"