From 50b7afd25a147dee501ddd9e3c268aaff6bbacba Mon Sep 17 00:00:00 2001 From: eson <9673575+githubcontent@user.noreply.gitee.com> Date: Tue, 6 Jun 2023 17:31:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20fsfont=20=E7=9A=84?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/fscanteentypemodel.go | 3 ++- model/fsfontmodel_gen.go | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/model/fscanteentypemodel.go b/model/fscanteentypemodel.go index e7750cee..6932ead8 100755 --- a/model/fscanteentypemodel.go +++ b/model/fscanteentypemodel.go @@ -30,13 +30,14 @@ func NewFsCanteenTypeModel(conn sqlx.SqlConn) FsCanteenTypeModel { } } +// FsGetTypeCanteenType GetType返回前端的结构 type FsGetTypeCanteenType struct { Id int64 `db:"id" json:"key"` // ID Name string `db:"name" json:"name"` // 餐厅名字 } +// FindGetType 根据status = 1查询出所有,fs_canteen_type 的类型,并排序desc func (m *defaultFsCanteenTypeModel) FindGetType(ctx context.Context) ([]*FsGetTypeCanteenType, error) { - query := fmt.Sprintf("select X.id,X.name from (select %s from %s where status = 1 order by sort desc) X", fsCanteenTypeRows, m.table) var resp []*FsGetTypeCanteenType err := m.conn.QueryRows(&resp, query) diff --git a/model/fsfontmodel_gen.go b/model/fsfontmodel_gen.go index 055de49f..69ddeaec 100755 --- a/model/fsfontmodel_gen.go +++ b/model/fsfontmodel_gen.go @@ -27,7 +27,6 @@ type ( FindOne(ctx context.Context, id int64) (*FsFont, error) Update(ctx context.Context, data *FsFont) error Delete(ctx context.Context, id int64) error - } defaultFsFontModel struct { @@ -71,8 +70,6 @@ func (m *defaultFsFontModel) FindOne(ctx context.Context, id int64) (*FsFont, er } } - - func (m *defaultFsFontModel) Insert(ctx context.Context, data *FsFont) (sql.Result, error) { query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?)", m.table, fsFontRowsExpectAutoSet) ret, err := m.conn.ExecCtx(ctx, query, data.Title, data.LinuxFontname, data.FilePath, data.Sort)