|
@@ -264,7 +264,7 @@ func (e *Entry) FirstFilterUpdate(pastureId int64, xToDay *XToday) (processIds [
|
|
|
Where("id > ?", xToDay.LastMaxHabitId).
|
|
Where("id > ?", xToDay.LastMaxHabitId).
|
|
|
Where("pasture_id = ?", pastureId).
|
|
Where("pasture_id = ?", pastureId).
|
|
|
Where("is_show = ?", pasturePb.IsShow_No).
|
|
Where("is_show = ?", pasturePb.IsShow_No).
|
|
|
- Where("record_count = ?", model.DefaultRecordCount).
|
|
|
|
|
|
|
+ //Where("record_count = ?", model.DefaultRecordCount).
|
|
|
Where(e.DB.Where("high >= ?", xToDay.High).Or("rumina >= ?", xToDay.Rumina)).
|
|
Where(e.DB.Where("high >= ?", xToDay.High).Or("rumina >= ?", xToDay.Rumina)).
|
|
|
Order("heat_date,neck_ring_number,frameid").
|
|
Order("heat_date,neck_ring_number,frameid").
|
|
|
Limit(int(defaultLimit)).
|
|
Limit(int(defaultLimit)).
|
Yi