Forráskód Böngészése

fix(消息):新增进入消息列表页后将该类型消息全部已读掉

Roc 3 éve
szülő
commit
4952a0df4c

+ 3 - 1
controllers/message.go

@@ -39,7 +39,7 @@ func (this *MessageCommon) SummaryMessageList() {
 				return
 			}
 		} else {
-			tmpMessage = fmt.Sprint(messageInfo.RealName, messageInfo.CreateTime, messageInfo.Content)
+			tmpMessage = fmt.Sprint(messageInfo.RealName, " ", messageInfo.CreateTime.Format("2006.01.02"), " ", messageInfo.Content)
 		}
 
 		notReadTotal, err := company_approval_message.GetNotReadMessageTotal(sysUserId, sourceType)
@@ -101,6 +101,8 @@ func (this *MessageCommon) MessageList() {
 		return
 	}
 
+	//将所有未读消息标记为已读
+	_ = company_approval_message.ModifyAllCompanyApprovalMessageStatus(sysUserId, sourceType)
 	companyApprovalIds := make([]string, 0)
 	newApprovalRecordIds := make([]string, 0)
 	companyApprovalMap := make(map[int]*company_approval.CompanyApproval)

+ 11 - 2
models/tables/company_approval_message/company_approval_message.go

@@ -50,7 +50,8 @@ type CompanyApprovalMessageList struct {
 	Remark            string       `description:"备注信息"`
 	Content           string       `description:"消息内容"`
 	CompanyName       string       `description:"客户名称"`
-	CreateTime        string       `description:"创建时间"`
+	CreateTime        time.Time    `description:"创建时间"`
+	CreateTimeStr     string       `json:"CreateTime";description:"创建时间"`
 	RealName          string       `description:"销售名称"`
 	CompanyApprovalId int          `description:"审批单id"`
 	ApprovalInfo      ApprovalInfo `description:"审批单信息"`
@@ -100,7 +101,7 @@ func GetCompanyApprovalMessageList(sysUserId, sourceType, startSize, pageSize in
 func GetLastMessage(sysUserId, sourceType int) (item *CompanyApprovalMessageList, err error) {
 	sql := `SELECT a.*,b.real_name FROM company_approval_message AS a
 			INNER JOIN admin AS b ON a.create_user_id=b.admin_id
-			WHERE receive_user_id=? AND a.operation_status=1 AND message_status !=2 AND source_type=?`
+			WHERE receive_user_id=? AND message_status !=2 AND source_type=?`
 	sql += ` ORDER BY create_time DESC `
 	o := orm.NewOrm()
 	err = o.Raw(sql, sysUserId, sourceType).QueryRow(&item)
@@ -130,6 +131,14 @@ func ModifyCompanyApprovalMessageStatus(companyApprovalMessageId int) (err error
 	return
 }
 
+//变更当前类型下所有未读消息为消息已读状态
+func ModifyAllCompanyApprovalMessageStatus(receiveUserId, sourceType int) (err error) {
+	o := orm.NewOrm()
+	sql := `UPDATE company_approval_message SET message_status=1,modify_time=NOW() WHERE receive_user_id = ? and source_type=? and message_status=0`
+	_, err = o.Raw(sql, receiveUserId, sourceType).Exec()
+	return
+}
+
 //消息作废
 func CancelCompanyApprovalMessage(companyApprovalId, sourceType int) (err error) {
 	o := orm.NewOrm()