Merge branch 'BI_Dashboard' into dm

controllers/bi_dashboard.go

@@ -75,7 +75,7 @@ func (this *BIDaShboardController) AddDashboard() {
 		//BiDashboardClassifyId: req.ClassifyId,
 		BiDashboardName: req.BiDashboardName,
 		SysAdminId:      this.SysUser.AdminId,
-		SysAdminName:    this.SysUser.AdminName,
+		SysAdminName:    this.SysUser.RealName,
 		//Sort:                  0,
 		CreateTime: time.Now(),
 		ModifyTime: time.Now(),
@@ -1141,3 +1141,62 @@ func (this *BIDaShboardController) PublicCancel() {
 	br.IsAddLog = true
 	br.Msg = "撤销成功"
 }
+
+// GroupList
+// @Title 获取我的首页看板
+// @Description 获取我的首页看板接口
+// @Success 200 {object} models.RespGroupList
+// @router /home_page [get]
+func (this *BIDaShboardController) HomePage() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	item, err := bi_dashboard.GetBiDashboardHomePageById(this.SysUser.AdminId)
+	if err != nil {
+		br.Msg = "数据不存在"
+		br.ErrMsg = "数据不存在，Err:" + err.Error()
+		return
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "查询成功"
+	br.Data = item
+	return
+}
+
+// GroupList
+// @Title 保存我的看板首页
+// @Description保存我的看板首页接口
+// @Success 200 {object} models.RespGroupList
+// @router /home_page/save [post]
+func (this *BIDaShboardController) HomePageSave() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	var req bi_dashboard.SaveHomePageReq
+
+	item := &bi_dashboard.BiDashboardHomePage{
+		BiDashboardID:         req.BiDashboardId,
+		AdminID:               this.SysUser.AdminId,
+		CreateTime:            time.Now(),
+		ModifyTime:            time.Now(),
+	}
+	err := bi_dashboard.SaveBiDashboardHomePage(item)
+	if err != nil {
+		br.Msg = "保存失败"
+		br.ErrMsg = "保存失败,Err:" + err.Error()
+		return
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "保存成功"
+	br.Data = item
+	return
+}

models/bi_dashboard/bi_dashboard_home_page.go

@@ -0,0 +1,34 @@
+package bi_dashboard
+
+import (
+	"eta_gn/eta_api/global"
+	"time"
+)
+
+type BiDashboardHomePage struct {
+	BiDashboardHomePageID int `gorm:"primaryKey;autoIncrement;comment:'bi首页看板id'"`
+	BiDashboardID         int `gorm:"type:int(10);default:null;comment:'看板id'"`
+	AdminID               int `gorm:"type:int(10);default:null;comment:'1图表 2表格'"`
+	CreateTime            time.Time `gorm:"type:datetime;comment:'创建时间'"`
+	ModifyTime            time.Time `gorm:"type:datetime;comment:'更新时间'"`
+}
+
+// tableName
+func (m *BiDashboardHomePage) TableName() string {
+	return "bi_dashboard_home_page"
+}
+
+// get
+func GetBiDashboardHomePageById(id int) (item *BiDashboardHomePage, err error) {
+	err = global.DEFAULT_DmSQL.Where("admin_id = ?", id).First(&item).Error
+	return
+}
+
+// save
+func SaveBiDashboardHomePage(item *BiDashboardHomePage) (err error) {
+	return global.DEFAULT_DmSQL.Save(item).Error
+}
+
+type SaveHomePageReq struct {
+	BiDashboardId int `description:"看板id"`
+}

routers/commentsRouter.go

@@ -8566,6 +8566,24 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta_gn/eta_api/controllers:BIDaShboardController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:BIDaShboardController"],
+        beego.ControllerComments{
+            Method: "HomePage",
+            Router: `/home_page`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta_gn/eta_api/controllers:BIDaShboardController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:BIDaShboardController"],
+        beego.ControllerComments{
+            Method: "HomePageSave",
+            Router: `/home_page/save`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta_gn/eta_api/controllers:BIDaShboardController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:BIDaShboardController"],
         beego.ControllerComments{
             Method: "MyList",

services/bi_approve/bi_approve.go

@@ -995,13 +995,10 @@ func CheckBiOpenApprove(classifyId int) (opening bool, err error) {
 	flowPars := make([]interface{}, 0)
 	flowPars = append(flowPars, classifyId)
 	flowItem, e := flowOb.GetItemByCondition(flowCond, flowPars, "")
-	if e != nil && !utils.IsErrNoRow(e) {
+	if e != nil {
 		err = fmt.Errorf("ApproveFlow GetItemByCondition err: %s", e.Error())
 		return
 	}
-	if utils.IsErrNoRow(e) {
-		return
-	}
 
 	// 开启审批/有审批流
 	if openApprove && (flowItem != nil) {