fix:修改撤回看板后的状态

services/bi_approve/bi_approve.go

@@ -186,7 +186,7 @@ func PassBiApprove(approveId int, adminId int) (msg string, err error) {
 				err = fmt.Errorf("更新审批当前节点失败, Err: %s", e.Error())
 				return
 			}
-			err = BuildNextNodeRecordAndMsg(nextNode, approveItem.BiApproveId, approveItem.ApplyUserId, approveItem.ApplyUserName)
+			err = BuildNextNodeRecordAndMsg(nextNode, approveItem.BiApproveId, approveItem.ApplyUserId, approveItem.ApplyUserName, approveItem.BiTitle)
 			return
 		} else {
 			// 最后一个节点
@@ -232,7 +232,7 @@ func PassBiApprove(approveId int, adminId int) (msg string, err error) {
 				err = fmt.Errorf("更新审批当前节点失败, Err: %s", e.Error())
 				return
 			}
-			err = BuildNextNodeRecordAndMsg(nextNode, approveItem.BiApproveId, approveItem.ApplyUserId, approveItem.ApplyUserName)
+			err = BuildNextNodeRecordAndMsg(nextNode, approveItem.BiApproveId, approveItem.ApplyUserId, approveItem.ApplyUserName, approveItem.BiTitle)
 			return
 		}
 	}
@@ -268,7 +268,7 @@ func PassBiApprove(approveId int, adminId int) (msg string, err error) {
 				err = fmt.Errorf("更新审批当前节点失败, Err: %s", e.Error())
 				return
 			}
-			err = BuildNextNodeRecordAndMsg(nextNode, approveItem.BiApproveId, approveItem.ApplyUserId, approveItem.ApplyUserName)
+			err = BuildNextNodeRecordAndMsg(nextNode, approveItem.BiApproveId, approveItem.ApplyUserId, approveItem.ApplyUserName, approveItem.BiTitle)
 			return
 		}
 	}
@@ -323,7 +323,7 @@ func toClassifyItem(src []*bi_dashboard.BiDashboardClassify) (dst []*bi_dashboar
 }
 
 // BuildNextNodeRecordAndMsg 生成下一个节点的审批记录并推送消息
-func BuildNextNodeRecordAndMsg(approveNodeItem *biapprove.BiApproveNode, approveId, sysAdminId int, sysAdminName string) (err error) {
+func BuildNextNodeRecordAndMsg(approveNodeItem *biapprove.BiApproveNode, approveId, sysAdminId int, sysAdminName, biTitle string) (err error) {
 	if approveNodeItem == nil {
 		err = fmt.Errorf("approve node nil")
 		return
@@ -380,7 +380,7 @@ func BuildNextNodeRecordAndMsg(approveNodeItem *biapprove.BiApproveNode, approve
 			m.SendUserId = sysAdminId
 			m.ReceiveUserId = v.ApproveUserId
 			m.Content = "您有新的待办任务"
-			m.Remark = fmt.Sprintf("%s提交的【看板审批】需要您审批，请及时处理", sysAdminName)
+			m.Remark = fmt.Sprintf("%s提交的【%s】需要您审批，请及时处理", sysAdminName, biTitle)
 			m.BiApproveId = approveId
 			m.ApproveState = BiApproveStateApproving
 			m.CreateTime = now
@@ -402,7 +402,7 @@ func updateBiApproveState(biId, state int) (err error) {
 	updateCols := []string{"State", "ModifyTime"}
 	BiItem, e := bi_dashboard.GetDashboardById(biId)
 	if e != nil && !utils.IsErrNoRow(e) {
-		err = fmt.Errorf("获取智能看板失败, Err: %s", e.Error())
+		err = fmt.Errorf("获取Bi看板失败, Err: %s", e.Error())
 		return
 	}
 	if BiItem != nil && BiItem.BiDashboardId > 0 {
@@ -795,7 +795,7 @@ func BiApproveRefuse(biApproveId, adminId int, approveRemark string) (msg string
 	}
 
 	// 驳回审批
-	if e = RefuseBiApprove(approveItem, recordItem, approveRemark, adminId); e != nil {
+	if e = refuseBiApprove(approveItem, recordItem, approveRemark, adminId); e != nil {
 		msg = "操作失败"
 		err = fmt.Errorf("RefuseBiApprove err: %s", e.Error())
 		return
@@ -803,8 +803,8 @@ func BiApproveRefuse(biApproveId, adminId int, approveRemark string) (msg string
 	return
 }
 
-// RefuseBiApprove 驳回审批
-func RefuseBiApprove(approveItem *biapprove.BiApprove, recordItem *biapprove.BiApproveRecord, approveRemark string, sysAdminId int) (err error) {
+// refuseBiApprove 驳回审批
+func refuseBiApprove(approveItem *biapprove.BiApprove, recordItem *biapprove.BiApproveRecord, approveRemark string, sysAdminId int) (err error) {
 	if approveItem == nil {
 		err = fmt.Errorf("审批信息有误")
 		return
@@ -860,7 +860,7 @@ func RefuseBiApprove(approveItem *biapprove.BiApprove, recordItem *biapprove.BiA
 		messageItem.SendUserId = sysAdminId
 		messageItem.ReceiveUserId = approveItem.ApplyUserId
 		messageItem.Content = "您提交的审批被驳回"
-		messageItem.Remark = "您提交的【看板审批】已被驳回"
+		messageItem.Remark = fmt.Sprintf("您提交的【%s】已被驳回", approveItem.BiTitle)
 		messageItem.BiApproveId = approveItem.BiApproveId
 		messageItem.ApproveState = BiApproveStateRefuse
 		messageItem.CreateTime = now
@@ -938,7 +938,7 @@ func cancelBiApprove(biId, approveId, sysAdminId int, sysAdminName string) (err
 	}
 
 	// 修改报告状态
-	e = updateBiApproveState(biId, BiStateWaitApprove)
+	e = updateBiApproveState(biId, BiStateUnpublished)
 	if e != nil {
 		err = fmt.Errorf("更新报告审批撤回失败, Err: %s", e.Error())
 		return
@@ -962,7 +962,7 @@ func cancelBiApprove(biId, approveId, sysAdminId int, sysAdminName string) (err
 			m := new(biapprove.BiApproveMessage)
 			m.SendUserId = sysAdminId
 			m.ReceiveUserId = v.ApproveUserId
-			m.Content = fmt.Sprintf("%s提交的【看板审批】已撤回", sysAdminName)
+			m.Content = fmt.Sprintf("您提交的【%s】已撤回", approveItem.BiTitle)
 			m.BiApproveId = approveId
 			m.ApproveState = BiApproveStateCancel
 			m.CreateTime = time.Now().Local()
@@ -1087,7 +1087,7 @@ func SubmitBiApprove(biId int, biTitle string, classifyId int, sysAdminId int, s
 	approveId = newApprove.BiApproveId
 
 	// 生成节点审批记录
-	err = BuildNextNodeRecordAndMsg(firstNodeItem, newApprove.BiApproveId, sysAdminId, sysAdminName)
+	err = BuildNextNodeRecordAndMsg(firstNodeItem, newApprove.BiApproveId, sysAdminId, sysAdminName, newApprove.BiTitle)
 	return
 }