|
@@ -4,6 +4,7 @@ import (
|
|
"eta_gn/eta_api/models"
|
|
"eta_gn/eta_api/models"
|
|
biapprove "eta_gn/eta_api/models/bi_approve"
|
|
biapprove "eta_gn/eta_api/models/bi_approve"
|
|
"eta_gn/eta_api/models/data_manage/data_manage_permission"
|
|
"eta_gn/eta_api/models/data_manage/data_manage_permission"
|
|
|
|
+ "eta_gn/eta_api/models/knowledge_approve"
|
|
"eta_gn/eta_api/models/report_approve"
|
|
"eta_gn/eta_api/models/report_approve"
|
|
"fmt"
|
|
"fmt"
|
|
)
|
|
)
|
|
@@ -36,7 +37,7 @@ func (c *MessageController) UnReadMessageNum() {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
- var unReadReportNum, unReadDataPermissionNum, unReadBiNum int
|
|
|
|
|
|
+ var unReadReportNum, unReadDataPermissionNum, unReadBiNum, unReadKnowledgeNum int
|
|
|
|
|
|
// 获取报告审批消息
|
|
// 获取报告审批消息
|
|
{
|
|
{
|
|
@@ -92,9 +93,24 @@ func (c *MessageController) UnReadMessageNum() {
|
|
}
|
|
}
|
|
unReadBiNum = unreadTotal
|
|
unReadBiNum = unreadTotal
|
|
}
|
|
}
|
|
|
|
+ // 观点库审批
|
|
|
|
+ {
|
|
|
|
+ messageOb := new(knowledge_approve.KnowledgeResourceApproveMessage)
|
|
|
|
+ pars := make([]interface{}, 0)
|
|
|
|
+ cond := fmt.Sprintf(` AND %s = ? AND %s = ?`, knowledge_approve.KnowledgeResourceApproveMessageCols.ReceiveUserId, knowledge_approve.KnowledgeResourceApproveMessageCols.IsRead)
|
|
|
|
+ pars = append(pars, sysUser.AdminId, 0)
|
|
|
|
+ // 未读消息数
|
|
|
|
+ unreadTotal, e := messageOb.GetCountByCondition(cond, pars)
|
|
|
|
+ if e != nil {
|
|
|
|
+ br.Msg = "获取失败"
|
|
|
|
+ br.ErrMsg = "获取看板消息列表总数失败, Err: " + e.Error()
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ unReadKnowledgeNum = unreadTotal
|
|
|
|
+ }
|
|
|
|
|
|
// 汇总数
|
|
// 汇总数
|
|
- num := unReadReportNum + unReadDataPermissionNum + unReadBiNum
|
|
|
|
|
|
+ num := unReadReportNum + unReadDataPermissionNum + unReadBiNum + unReadKnowledgeNum
|
|
|
|
|
|
br.Data = num
|
|
br.Data = num
|
|
br.Ret = 200
|
|
br.Ret = 200
|