Merge branch 'BI_Dashboard' of http://8.136.199.33:3000/eta_gn_server/eta_api into BI_Dashboard

controllers/bi_dashboard.go

@@ -608,7 +608,7 @@ func (this *BIDaShboardController) PublicList() {
 			Children:  make([]*bi_dashboard.RespPublicGroupListItem, 0),
 		}
 		if _, ok := publicDashboardClassifyIdMap[c.BiDashboardClassifyId]; ok {
-			for _, v := range publicAdminIdList {
+			for _, v := range adminIdList {
 				systemAdmin, ok := systemAdminMap[v]
 				if !ok {
 					continue
@@ -625,6 +625,7 @@ func (this *BIDaShboardController) PublicList() {
 					GroupId:   int64(systemAdmin.AdminId),
 					GroupName: systemAdmin.RealName,
 					AdminId:   systemAdmin.AdminId,
+					DashboardList: make([]*bi_dashboard.BiDashboard, 0),
 				}
 
 				for _, vv := range respGroupNameListItemList {
@@ -633,7 +634,6 @@ func (this *BIDaShboardController) PublicList() {
 						tmpItem.Children = append(tmpItem.Children, tmpRespGroupListItem)
 					}
 				}
-
 			}
 		}
 		resp = append(resp, tmpItem)
@@ -1067,3 +1067,69 @@ func (this *BIDaShboardController) GrantInfo() {
 	br.Data = adminIdStr
 	br.Msg = "查询成功"
 }
+
+// Public
+// @Title
+// @Description 撤销公共看板
+// @Param	request	body models.GrantPptReq true "type json string"
+// @Success 200 Ret=200 分配成功
+// @router /public/cancel [post]
+func (this *BIDaShboardController) PublicCancel() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	var req bi_dashboard.DelDashboardReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+
+
+	item, err := bi_dashboard.GetDashboardById(req.BiDashboardId)
+	if err != nil && !utils.IsErrNoRow(err) {
+		br.Msg = "获取数据异常！"
+		br.ErrMsg = "获取数据异常，Err:" + err.Error()
+		return
+	}
+
+
+	//// 校验是否开启了审批流
+	//opening, e := biapprove.CheckBiOpenApprove(item.BiDashboardClassifyId)
+	//if e != nil {
+	//	br.Msg = "操作失败"
+	//	br.ErrMsg = "校验报告是否开启审批流失败, Err: " + e.Error()
+	//	return
+	//}
+	//
+	//if opening {
+	//	_, err = biapprove.SubmitBiApprove(req.BiDashboardId, item.BiDashboardName, req.ClassifyId, this.SysUser.AdminId, this.SysUser.RealName)
+	//	if err != nil {
+	//		br.Msg = "提交审批失败"
+	//		br.ErrMsg = "提交审批失败, Err: " + err.Error()
+	//		return
+	//	}
+	//	item.State = 4
+	//} else {
+	//	item.State = 6
+	//}
+
+	
+	item.BiDashboardClassifyId = 0
+	item.State = 1
+
+	err = bi_dashboard.SaveDashboard(item)
+	if err != nil {
+		br.Msg = "编辑失败"
+		br.ErrMsg = "编辑失败,Err:" + err.Error()
+		return
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.IsAddLog = true
+	br.Msg = "撤销成功"
+}

models/bi_dashboard/bi_dashboard.go

@@ -125,3 +125,7 @@ func GetAllGrantList(sysUserId int) (list []*BiDashboard, err error) {
 	err = global.DEFAULT_DmSQL.Raw(sql, sysUserId, sysUserId).Find(&list).Error
 	return
 }
+
+func SaveDashboard(item *BiDashboard) (err error) {
+	return global.DEFAULT_DmSQL.Save(item).Error
+}

routers/commentsRouter.go

@@ -8359,6 +8359,15 @@ 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: "PublicCancel",
+            Router: `/public/cancel`,
+            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: "PublicList",