|
|
@@ -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提交的【看板审批】需要您审批，请及时处理", sysAdminName)
|
|
|
m.BiApproveId = approveId
|
|
|
m.ApproveState = BiApproveStateApproving
|
|
|
m.CreateTime = now
|
|
|
@@ -402,7 +402,7 @@ func updateBiApproveState(biId, approveId, 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("获取智能看板失败, Err: %s", e.Error())
|
|
|
return
|
|
|
}
|
|
|
if BiItem != nil && BiItem.BiDashboardId > 0 {
|
|
|
@@ -858,7 +858,7 @@ func RefuseBiApprove(approveItem *biapprove.BiApprove, recordItem *biapprove.BiA
|
|
|
messageItem.SendUserId = sysAdminId
|
|
|
messageItem.ReceiveUserId = approveItem.ApplyUserId
|
|
|
messageItem.Content = "您提交的审批被驳回"
|
|
|
- messageItem.Remark = "您提交的【研报审批】已被驳回"
|
|
|
+ messageItem.Remark = "您提交的【看板审批】已被驳回"
|
|
|
messageItem.BiApproveId = approveItem.BiApproveId
|
|
|
messageItem.ApproveState = BiApproveStateRefuse
|
|
|
messageItem.CreateTime = now
|
|
|
@@ -1061,7 +1061,7 @@ func CheckBiCurrState(classifyId, operate int) (state int, err error) {
|
|
|
}
|
|
|
|
|
|
// SubmitBiApprove 提交审批
|
|
|
-func SubmitBiApprove(reportId int, reportTitle string, classifyId int, sysAdminId int, sysAdminName string) (approveId int, err error) {
|
|
|
+func SubmitBiApprove(biId int, reportTitle string, classifyId int, sysAdminId int, sysAdminName string) (approveId int, err error) {
|
|
|
// 默认内部审批, 如果是走的第三方审批, 那么仅修改状态
|
|
|
confMap, e := models.GetBusinessConf()
|
|
|
if e != nil {
|
|
|
@@ -1117,7 +1117,7 @@ func SubmitBiApprove(reportId int, reportTitle string, classifyId int, sysAdminI
|
|
|
// 审批信息
|
|
|
now := time.Now().Local()
|
|
|
newApprove := new(biapprove.BiApprove)
|
|
|
- newApprove.BiId = reportId
|
|
|
+ newApprove.BiId = biId
|
|
|
newApprove.BiTitle = reportTitle
|
|
|
newApprove.ClassifyId = classifyId
|
|
|
newApprove.State = BiApproveStateApproving
|
zqbao