xiziwen il y a 3 mois
Parent
commit
ddef3fa0f2
1 fichiers modifiés avec 17 ajouts et 18 suppressions
  1. 17 18
      models/bi_dashboard/bi_dashboard.go

+ 17 - 18
models/bi_dashboard/bi_dashboard.go

@@ -6,15 +6,15 @@ import (
 )
 
 type BiDashboard struct {
-	BiDashboardId         int       `gorm:"primaryKey;autoIncrement;column:bi_dashboard_id"` // bi看板id
-	BiDashboardClassifyId int       `gorm:"column:bi_dashboard_classify_id" `                // 看板分类id
-	BiDashboardName       string    `gorm:"column:bi_dashboard_name;size:255"`               // 看板名称
-	SysAdminId            int       `gorm:"column:sys_admin_id" `                            // 创建人ID
-	SysAdminName          string    `gorm:"column:sys_admin_name;size:128" `                 // 创建人姓名
-	Sort                  int       `gorm:"column:sort" `                                    // 排序字段
-	CreateTime            time.Time `gorm:"column:create_time" `                             // 创建时间
-	ModifyTime            time.Time `gorm:"column:modify_time"`                              // 更新时间
-	State                 int       `gorm:"column:state"`                                    // 状态 1:未公开; 4-待审批;5-已驳回;6-已通过
+	BiDashboardId         int       `orm:"column(bi_dashboard_id);pk"`         // bi看板id
+	BiDashboardClassifyId int       `gorm:"column:bi_dashboard_classify_id" `  // 看板分类id
+	BiDashboardName       string    `gorm:"column:bi_dashboard_name;size:255"` // 看板名称
+	SysAdminId            int       `gorm:"column:sys_admin_id" `              // 创建人ID
+	SysAdminName          string    `gorm:"column:sys_admin_name;size:128" `   // 创建人姓名
+	Sort                  int       `gorm:"column:sort" `                      // 排序字段
+	CreateTime            time.Time `gorm:"column:create_time" `               // 创建时间
+	ModifyTime            time.Time `gorm:"column:modify_time"`                // 更新时间
+	State                 int       `gorm:"column:state"`                      // 状态 1:未公开; 4-待审批;5-已驳回;6-已通过
 }
 
 // tableName
@@ -89,9 +89,9 @@ type BiDashboardEditingCache struct {
 // DashboardDetailResp 详情响应体
 type DashboardDetailResp struct {
 	*BiDashboard
-	IsGrant   int                     `description:"是否共享,0:不是,1:是"`
-	Editor    BiDashboardEditingCache `description:"编辑人信息"`
-	List      []*BiDashboardDetail
+	IsGrant int                     `description:"是否共享,0:不是,1:是"`
+	Editor  BiDashboardEditingCache `description:"编辑人信息"`
+	List    []*BiDashboardDetail
 }
 
 type AddDashboardReq struct {
@@ -115,7 +115,7 @@ type EditDashboardReq struct {
 func EditDashboard(item *BiDashboard) (err error) {
 	o := orm.NewOrm()
 	sql := `UPDATE bi_dashboard SET bi_dashboard_name=?,modify_time=?,state=? WHERE bi_dashboard_id=?`
-	_, err = o.Raw(sql, item.BiDashboardName, time.Now(),item.State, item.BiDashboardId).Exec()
+	_, err = o.Raw(sql, item.BiDashboardName, time.Now(), item.State, item.BiDashboardId).Exec()
 	return
 }
 
@@ -145,11 +145,10 @@ func SaveDashboard(item *BiDashboard) (err error) {
 	return
 }
 
-
 // BiDashboardEditingReq 标记编辑中请求体
 type BiDashboardEditingReq struct {
-	BiDashboardId  int `description:"看板主键ID"`
-	Status int `description:"标记状态: 1-编辑中; 2-编辑完成"`
+	BiDashboardId int `description:"看板主键ID"`
+	Status        int `description:"标记状态: 1-编辑中; 2-编辑完成"`
 }
 
 // GetAllMyShareList 获取我共享的看板
@@ -162,9 +161,9 @@ WHERE a.sys_admin_id = ? GROUP BY a.bi_dashboard_id   `
 }
 
 // getByName
-func GetDashboardByName(name string,adminId int) (item *BiDashboard, err error) {
+func GetDashboardByName(name string, adminId int) (item *BiDashboard, err error) {
 	sql := `SELECT * FROM bi_dashboard WHERE bi_dashboard_name = ? and sys_admin_id =? limit 1`
 	o := orm.NewOrm()
 	err = o.Raw(sql, name, adminId).QueryRow(&item)
 	return
-}
+}