Merge branch 'BI_Dashboard' into dm

controllers/bi_dashboard.go

@@ -871,17 +871,22 @@ func (this *BIDaShboardController) Public() {
 	}
 
 
-	if opening {
-
-
-	}
-
 	item, err := bi_dashboard.GetDashboardById(req.BiDashboardId)
 	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = "获取数据异常！"
 		br.ErrMsg = "获取数据异常，Err:" + err.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.BiDashboardClassifyId = req.ClassifyId
 
 	err = bi_dashboard.EditDashboard(item)

services/bi_approve/bi_approve.go

@@ -1063,7 +1063,7 @@ func CheckBiCurrState(classifyId, operate int) (state int, err error) {
 }
 
 // SubmitBiApprove 提交审批
-func SubmitBiApprove(biId int, reportTitle string, classifyId int, sysAdminId int, sysAdminName string) (approveId int, err error) {
+func SubmitBiApprove(biId int, biTitle string, classifyId int, sysAdminId int, sysAdminName string) (approveId int, err error) {
 	// 默认内部审批, 如果是走的第三方审批, 那么仅修改状态
 	confMap, e := models.GetBusinessConf()
 	if e != nil {
@@ -1120,7 +1120,7 @@ func SubmitBiApprove(biId int, reportTitle string, classifyId int, sysAdminId in
 	now := time.Now().Local()
 	newApprove := new(biapprove.BiApprove)
 	newApprove.BiId = biId
-	newApprove.BiTitle = reportTitle
+	newApprove.BiTitle = biTitle
 	newApprove.ClassifyId = classifyId
 	newApprove.State = BiApproveStateApproving
 	newApprove.FlowId = flowItem.BiApproveFlowId