From 81f49e5b5444eadfc7cf68baf430280ef1168753 Mon Sep 17 00:00:00 2001 From: HuangZhi Date: Thu, 6 Jul 2023 14:09:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=96=B0=E5=A2=9E=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bean/entity/dictionary.go | 1 + src/bean/vo/request/dict.go | 2 ++ src/bean/vo/response/dict.go | 1 + src/service/component_dict.go | 5 +++-- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/bean/entity/dictionary.go b/src/bean/entity/dictionary.go index f8016cb..a046185 100644 --- a/src/bean/entity/dictionary.go +++ b/src/bean/entity/dictionary.go @@ -37,6 +37,7 @@ type Dict struct { UpdatedAt jsontime.Time `json:"updated_time" xorm:"updated_at"` //修改时间 MinVal string `json:"min_val" xorm:"min_val"` //最大值 MaxVal string `json:"max_val" xorm:"max_val"` //最小值 + Unit string `json:"unit" xorm:"unit"` //单位 Sort int `json:"sort" xorm:"sort autoincr"` //排序字段 降序排列 } diff --git a/src/bean/vo/request/dict.go b/src/bean/vo/request/dict.go index c28fb6b..cf79837 100644 --- a/src/bean/vo/request/dict.go +++ b/src/bean/vo/request/dict.go @@ -24,6 +24,7 @@ type AddDictReq struct { Description string `json:"description" form:"description" binding:"lte=200"` //描述 MinVal string `json:"min_val" form:"min_val"` //最大值 MaxVal string `json:"max_val" form:"max_val"` //最小值 + Unit string `json:"unit" form:"unit"` //最小值 } type UpdateDictReq struct { @@ -34,6 +35,7 @@ type UpdateDictReq struct { Description string `json:"description" form:"description" binding:"lte=200"` //描述 MinVal string `json:"min_val" form:"min_val"` //最大值 MaxVal string `json:"max_val" form:"max_val"` //最小值 + Unit string `json:"unit" form:"unit"` //最小值 UpdatedBy int `json:"updated_by" ` //修改人 UpdatedAt jsontime.Time `json:"updated_at"` //修改时间 } diff --git a/src/bean/vo/response/dict.go b/src/bean/vo/response/dict.go index 1968355..c1eef53 100644 --- a/src/bean/vo/response/dict.go +++ b/src/bean/vo/response/dict.go @@ -12,6 +12,7 @@ type DictListRes struct { UpdatedAt jsontime.Time `json:"updated_at"` MinVal string `json:"min_val" ` //最大值 MaxVal string `json:"max_val"` + Unit string `json:"unit"` Sort int `json:"sort"` Children []*DictListRes `json:"children,omitempty"` } diff --git a/src/service/component_dict.go b/src/service/component_dict.go index 56ad4dd..a41e761 100644 --- a/src/service/component_dict.go +++ b/src/service/component_dict.go @@ -64,7 +64,7 @@ func (c *Dict) List(req request.DictReq) (dictListRes []*response.DictListRes, c } session := db.NewSession() - session.Select("id,class,name,parent_id,status,min_val,max_val,sort,description,updated_at").Table("dict") + session.Select("id,class,name,parent_id,status,min_val,max_val,sort,description,updated_at,unit").Table("dict") session.Where("is_delete = 0 ") if req.Id != "" { @@ -148,6 +148,7 @@ func (c *Dict) Add(req request.AddDictReq) (err error) { UpdatedAt: jsontime.Time(time.Now()), MinVal: req.MinVal, MaxVal: req.MaxVal, + Unit: req.Unit, } db, err := client.GetDbClient() @@ -185,7 +186,7 @@ func (c *Dict) Update(req request.UpdateDictReq) (err error) { req.UpdatedAt = jsontime.Time(time.Now()) _, err = session.Table("dict"). - Cols("name,status,description,updated_by,updated_at,min_val,max_val"). + Cols("name,status,description,updated_by,updated_at,min_val,max_val,unit"). Where("id = ? and is_delete = 0", req.Id).Update(&req) if err != nil { err = errors.Wrap(err, "修改字典失败！") -- 2.26.0