Merge branch 'BI_Dashboard' into dm

controllers/bi_dashboard.go

@@ -1067,3 +1067,68 @@ 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.EditDashboard(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_approve/bi_approve.go

@@ -158,6 +158,7 @@ func GetApprovedBiApprovePageList(cond string, pars []interface{}, orderRule str
 		JOIN bi_approve AS b ON a.bi_approve_id = b.bi_approve_id
 		WHERE 1 = 1 %s %s
 		LIMIT ?,?`, cond, order)
+	pars = append(pars, startSize, pageSize)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }

models/bi_approve/bi_approve_node.go

@@ -78,7 +78,7 @@ func GetBiApproveNodeByCondition(condition string, pars []interface{}) (node []*
 	o := global.DmSQL["rddp"]
 	sql := "SELECT * FROM bi_approve_node WHERE 1=1 "
 	if condition != "" {
-		sql += " AND " + condition
+		sql += condition
 	}
 	err = o.Raw(sql, pars...).Find(&node).Error
 	return

models/bi_approve/bi_approve_record.go

@@ -120,7 +120,7 @@ func (b *BiApproveRecord) UpdateNodeState(biApproveId, nodeId, nodeState, nodeAp
 
 	// 更新条件
 	whereParas := []interface{}{biApproveId, nodeId}
-	pars = append(pars, whereParas)
+	pars = append(pars, whereParas...)
 
 	sql := fmt.Sprintf(`UPDATE %s SET node_state=?,node_approve_user_id=?,node_approve_user_name=?,node_approve_time=? WHERE bi_approve_id = ? AND node_id = ?`, b.TableName())
 	err = global.DmSQL["rddp"].Exec(sql, pars...).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",