Переглянути джерело

修复统计条数没过滤软删除的问题

zhangqian 2 роки тому
батько
коміт
9cb1a4989b
5 змінених файлів з 13 додано та 13 видалено
  1. 2 2
      models/audio.go
  2. 2 2
      models/audio_text.go
  3. 2 2
      models/text.go
  4. 2 2
      models/train.go
  5. 5 5
      request/audio.go

+ 2 - 2
models/audio.go

@@ -271,7 +271,7 @@ func (slf *AudioSearch) Find() ([]*Audio, int, error) {
 		db      = slf.build()
 	)
 
-	if err := db.Count(&total).Error; err != nil {
+	if err := db.Where("deleted_at IS NULL").Count(&total).Error; err != nil {
 		return records, int(total), fmt.Errorf("find count err: %v", err)
 	}
 	if slf.PageNum*slf.PageSize > 0 {
@@ -308,7 +308,7 @@ func (slf *AudioSearch) FindByQuery(query string, args []interface{}) ([]*Audio,
 		db      = slf.Orm.Table(slf.TableName()).Where(query, args...)
 	)
 
-	if err := db.Count(&total).Error; err != nil {
+	if err := db.Where("deleted_at IS NULL").Count(&total).Error; err != nil {
 		return records, total, fmt.Errorf("find by query count err: %v", err)
 	}
 	if slf.PageNum*slf.PageSize > 0 {

+ 2 - 2
models/audio_text.go

@@ -160,7 +160,7 @@ func (slf *AudioTextSearch) Find() ([]*AudioText, int, error) {
 		db      = slf.build()
 	)
 
-	if err := db.Count(&total).Error; err != nil {
+	if err := db.Where("deleted_at IS NULL").Count(&total).Error; err != nil {
 		return records, int(total), fmt.Errorf("find count err: %v", err)
 	}
 	if slf.PageNum*slf.PageSize > 0 {
@@ -197,7 +197,7 @@ func (slf *AudioTextSearch) FindByQuery(query string, args []interface{}) ([]*Au
 		db      = slf.Orm.Table(slf.TableName()).Where(query, args...)
 	)
 
-	if err := db.Count(&total).Error; err != nil {
+	if err := db.Where("deleted_at IS NULL").Count(&total).Error; err != nil {
 		return records, total, fmt.Errorf("find by query count err: %v", err)
 	}
 	if slf.PageNum*slf.PageSize > 0 {

+ 2 - 2
models/text.go

@@ -190,7 +190,7 @@ func (slf *WordSearch) Find() ([]*Word, int, error) {
 		db      = slf.build()
 	)
 
-	if err := db.Count(&total).Error; err != nil {
+	if err := db.Where("deleted_at IS NULL").Count(&total).Error; err != nil {
 		return records, int(total), fmt.Errorf("find count err: %v", err)
 	}
 	if slf.PageNum*slf.PageSize > 0 {
@@ -227,7 +227,7 @@ func (slf *WordSearch) FindByQuery(query string, args []interface{}) ([]*Word, i
 		db      = slf.Orm.Table(slf.TableName()).Where(query, args...)
 	)
 
-	if err := db.Count(&total).Error; err != nil {
+	if err := db.Where("deleted_at IS NULL").Count(&total).Error; err != nil {
 		return records, total, fmt.Errorf("find by query count err: %v", err)
 	}
 	if slf.PageNum*slf.PageSize > 0 {

+ 2 - 2
models/train.go

@@ -201,7 +201,7 @@ func (slf *TrainInfoSearch) Find() ([]*TrainInfo, int, error) {
 		db      = slf.build()
 	)
 
-	if err := db.Count(&total).Error; err != nil {
+	if err := db.Where("deleted_at IS NULL").Count(&total).Error; err != nil {
 		return records, int(total), fmt.Errorf("find count err: %v", err)
 	}
 	if slf.PageNum*slf.PageSize > 0 {
@@ -238,7 +238,7 @@ func (slf *TrainInfoSearch) FindByQuery(query string, args []interface{}) ([]*Tr
 		db      = slf.Orm.Table(slf.TableName()).Where(query, args...)
 	)
 
-	if err := db.Count(&total).Error; err != nil {
+	if err := db.Where("deleted_at IS NULL").Count(&total).Error; err != nil {
 		return records, total, fmt.Errorf("find by query count err: %v", err)
 	}
 	if slf.PageNum*slf.PageSize > 0 {

+ 5 - 5
request/audio.go

@@ -7,14 +7,14 @@ import (
 
 type GetAudioList struct {
 	PageInfo
-	Keyword          string            `form:"keyword"`                                                                            // 关键字
+	Keyword          string            `form:"keyword"`                                                                         // 关键字
 	LocomotiveNumber string            `gorm:"index;type:varchar(255);not null;default:'';comment:机车号" form:"locomotiveNumber"` // 机车号
-	TrainNumber      string            `gorm:"index;type:varchar(255);not null;default:'';comment:车次" form:"trainNumber"`        // 车次
+	TrainNumber      string            `gorm:"index;type:varchar(255);not null;default:'';comment:车次" form:"trainNumber"`       // 车次
 	DriverNumber     string            `gorm:"index;type:varchar(255);not null;default:'';comment:司机号" form:"driverNumber"`     // 司机号
 	StationNumber    string            `gorm:"index;type:varchar(255);not null;default:'';comment:车站号" form:"stationNumber"`    // 车站号
-	BeginTime        time.Time         `form:"beginTime"`                                                                          //开始时间
-	EndTime          time.Time         `form:"endTime"`                                                                            //结束时间
-	IsFollowed       constvar.BoolType `form:"isFollowed"`                                                                         //是否关注 1关注 2未关注
+	BeginTime        time.Time         `form:"beginTime"`                                                                       //开始时间
+	EndTime          time.Time         `form:"endTime"`                                                                         //结束时间
+	IsFollowed       constvar.BoolType `form:"isFollowed"`                                                                      //是否关注 1关注 2未关注
 }
 
 type ProcessAudio struct {