test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-12-01 11:18:08 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[FIX] fix bug

Browse Source
This commit is contained in:
zhoujunhao 2018-08-07 17:23:05 +08:00
parent 6d4010ea64
commit c5aed6ad1c
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
db/mysql/dao/event.go
View File

@ -25,6 +25,7 @@ import (
"github.com/Sirupsen/logrus"
"github.com/goodrain/rainbond/db/model"
"github.com/jinzhu/gorm"
"fmt"
)
//AddModel AddModel
@ -196,8 +197,6 @@ func (c *NotificationEventDaoImpl) GetNotificationEventByTime(start, end time.Ti
}
return nil, err
}
c.DB.Table("notification_event").Select("*").Group("kind_id").Order("last_time DESC").Limit(1).Scan(&result)
c.DB.Where("last_time>? and last_time<?", start, end).Group("kind_id").Order("last_time DESC").Limit(1).Find(&result)
return result, nil
}
@ -206,20 +205,24 @@ func (c *NotificationEventDaoImpl) GetNotificationEventGrouping(start, end time.
var result []*model.NotificationEvent
if !start.IsZero() && !end.IsZero() {
if err := c.DB.Where("last_time>? and last_time<?", start, end).Group("kind_id").Order("last_time DESC").Limit(1).Find(&result).Error; err != nil {
if err := c.DB.Where("last_time>? and last_time<?", start, end).Group("kind_id").Order("last_time DESC").Find(&result).Error; err != nil {
if err == gorm.ErrRecordNotFound {
return result, nil
fmt.Println("=======1")
}
return nil, err
}
fmt.Println("=======2")
return result, nil
}
if err := c.DB.Where("last_time>? and last_time<?", start, end).Group("kind_id").Order("last_time DESC").Limit(1).Find(&result).Error; err != nil {
if err := c.DB.Where("last_time>? and last_time<?", start, end).Group("kind_id").Order("last_time DESC").Find(&result).Error; err != nil {
if err == gorm.ErrRecordNotFound {
return result, nil
fmt.Println("=======1.1")
}
return nil, err
}
fmt.Println("=======2.2")
return result, nil
}
@ -227,20 +230,24 @@ func (c *NotificationEventDaoImpl) GetNotificationEventGrouping2(start, end time
var result []*model.NotificationEvent
if !start.IsZero() && !end.IsZero() {
if err := c.DB.Table("notification_event").Select("*").Where("last_time>? and last_time<?", start, end).Group("kind_id").Order("last_time DESC").Limit(1).Scan(&result).Error; err != nil {
if err := c.DB.Table("notification_event").Select("*").Where("last_time>? and last_time<?", start, end).Group("kind_id").Order("last_time DESC").Scan(&result).Error; err != nil {
if err == gorm.ErrRecordNotFound {
return result, nil
fmt.Println("=======1")
}
return nil, err
}
fmt.Println("=======2")
return result, nil
}
if err := c.DB.Table("notification_event").Select("*").Where("last_time>? and last_time<?", start, end).Group("kind_id").Order("last_time DESC").Limit(1).Scan(&result).Error; err != nil {
if err := c.DB.Table("notification_event").Select("*").Where("last_time>? and last_time<?", start, end).Group("kind_id").Order("last_time DESC").Scan(&result).Error; err != nil {
if err == gorm.ErrRecordNotFound {
return result, nil
fmt.Println("=======1.1")
}
return nil, err
}
fmt.Println("=======2.2")
return result, nil
}