public/go-admin
1
0
Fork 0
mirror of https://github.com/go-admin-team/go-admin.git synced 2026-09-22 02:27:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

数据库字段风格统一

Browse Source
This commit is contained in:
zhangwenjian
2020-04-08 13:22:52 +08:00
parent 098dfc4d1d
commit 6d187db36a
12 changed files with 128 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
models/dictType.go
+14 -14
View File
@@ -6,17 +6,17 @@ import (
)
type DictType struct {
DictId int64 `gorm:"column:dictId;primary_key" json:"dictId" example:"1"`
DictId int64 `gorm:"column:dict_id;primary_key" json:"dictId" example:"1"`
//字典名称
DictName string `gorm:"column:dictName" json:"dictName"`
DictName string `gorm:"column:dict_name" json:"dictName"`
//字典类型
DictType string `gorm:"column:dictType" json:"dictType"`
DictType string `gorm:"column:dict_type" json:"dictType"`
//状态
Status string `gorm:"column:status" json:"status"`
DataScope string `gorm:"-" json:"dataScope"`
Params string `gorm:"column:params" json:"params"`
Params string `gorm:"-" json:"params"`
//创建者
CreateBy string `gorm:"column:create_by" json:"createBy"`
//创建时间
@@ -27,7 +27,7 @@ type DictType struct {
UpdateTime string `gorm:"column:update_time" json:"updateTime"`
//备注
Remark string `gorm:"column:remark" json:"remark"`
IsDel string `gorm:"column:is_del" json:"isDel"`
IsDel int `gorm:"column:is_del" json:"isDel"`
}
func (e *DictType) Create() (DictType, error) {
@@ -48,13 +48,13 @@ func (e *DictType) Get() (DictType, error) {
table := orm.Eloquent.Table("sys_dict_type")
if e.DictId != 0 {
table = table.Where("dictId = ?", e.DictId)
table = table.Where("dict_id = ?", e.DictId)
}
if e.DictName != "" {
table = table.Where("dictName = ?", e.DictName)
table = table.Where("dict_name = ?", e.DictName)
}
if e.DictType != "" {
table = table.Where("dictType = ?", e.DictType)
table = table.Where("dict_type = ?", e.DictType)
}
if err := table.Where("is_del = 0").First(&doc).Error; err != nil {
@@ -68,13 +68,13 @@ func (e *DictType) GetList() ([]DictType, error) {
table := orm.Eloquent.Table("sys_dict_type")
if e.DictId != 0 {
table = table.Where("dictId = ?", e.DictId)
table = table.Where("dict_id = ?", e.DictId)
}
if e.DictName != "" {
table = table.Where("dictName = ?", e.DictName)
table = table.Where("dict_name = ?", e.DictName)
}
if e.DictType != "" {
table = table.Where("dictType = ?", e.DictType)
table = table.Where("dict_type = ?", e.DictType)
}
if err := table.Where("is_del = 0").Find(&doc).Error; err != nil {
@@ -88,10 +88,10 @@ func (e *DictType) GetPage(pageSize int, pageIndex int) ([]DictType, int32, erro
table := orm.Eloquent.Select("*").Table("sys_dict_type")
if e.DictId != 0 {
table = table.Where("dictId = ?", e.DictId)
table = table.Where("dict_id = ?", e.DictId)
}
if e.DictName != "" {
table = table.Where("dictName = ?", e.DictName)
table = table.Where("dict_name = ?", e.DictName)
}
// 数据权限控制
@@ -127,7 +127,7 @@ func (e *DictType) Delete(id int64) (success bool, err error) {
mp["is_del"] = "1"
mp["update_time"] = utils.GetCurrntTime()
mp["update_by"] = e.UpdateBy
if err = orm.Eloquent.Table("sys_dict_type").Where("dictId = ?", id).Update(mp).Error; err != nil {
if err = orm.Eloquent.Table("sys_dict_type").Where("dict_id = ?", id).Update(mp).Error; err != nil {
success = false
return
}