|
@@ -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()
|