crontab: neck_ring_merge update

go.mod

@@ -3,7 +3,7 @@ module kpt-pasture
 go 1.17
 
 require (
-	gitee.com/xuyiping_admin/go_proto v0.0.0-20250306060531-dfa1b97a964b
+	gitee.com/xuyiping_admin/go_proto v0.0.0-20250309141840-4e483354df00
 	gitee.com/xuyiping_admin/pkg v0.0.0-20241108060137-caea58c59f5b
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/eclipse/paho.mqtt.golang v1.4.3

go.sum

@@ -46,6 +46,8 @@ gitee.com/xuyiping_admin/go_proto v0.0.0-20250306030727-9cd4d60bdaa7 h1:s3qKKeND
 gitee.com/xuyiping_admin/go_proto v0.0.0-20250306030727-9cd4d60bdaa7/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20250306060531-dfa1b97a964b h1:KBCoYhktN5Hm2aeYudrU1Qgq3g4GrI7Dnng/aoy+pR0=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20250306060531-dfa1b97a964b/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20250309141840-4e483354df00 h1:ejRZ6U1vTFjo1VzcHpnraCrqZ6IhkqxM7iMgof2jE90=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20250309141840-4e483354df00/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
 gitee.com/xuyiping_admin/pkg v0.0.0-20241108060137-caea58c59f5b h1:w05MxH7yqveRlaRbxHhbif5YjPrJFodRPfOjYhXn7Zk=
 gitee.com/xuyiping_admin/pkg v0.0.0-20241108060137-caea58c59f5b/go.mod h1:8tF25X6pE9WkFCczlNAC0K2mrjwKvhhp02I7o0HtDxY=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=

module/backend/event_base.go

@@ -54,6 +54,10 @@ func (s *StoreEntry) EnterList(ctx context.Context, req *pasturePb.SearchEventRe
 		pref.Where("ear_number = ?", req.EarNumber)
 	}
 
+	if req.StartDayAt > 0 && req.EndDayAt > 0 && req.EndDayAt >= req.StartDayAt {
+		pref.Where("enter_at BETWEEN ? AND ?", req.StartDayAt, req.EndDayAt)
+	}
+
 	if err = pref.Order("id desc").
 		Count(&count).Limit(int(pagination.PageSize)).
 		Offset(int(pagination.PageOffset)).