完善 admin 接口筛选机制

web/handlers/batch.go

@@ -1,6 +1,7 @@
 package handlers
 
 import (
+	"platform/pkg/u"
 	"platform/web/auth"
 	"platform/web/core"
 	c "platform/web/core"
@@ -63,18 +64,48 @@ func PageBatchByAdmin(c *fiber.Ctx) error {
 		return err
 	}
 
-	req := new(struct{ core.PageReq })
-	if err = g.Validator.ParseBody(c, req); err != nil {
+	var req PageBatchByAdminReq
+	if err = g.Validator.ParseBody(c, &req); err != nil {
 		return err
 	}
 
+	do := q.LogsUserUsage.Where()
+	if req.UserPhone != nil {
+		do = do.Where(q.User.Phone.Eq(*req.UserPhone))
+	}
+	if req.ResourceNo != nil {
+		do = do.Where(q.Resource.ResourceNo.Eq(*req.ResourceNo))
+	}
+	if req.BatchNo != nil {
+		do = do.Where(q.LogsUserUsage.BatchNo.Eq(*req.BatchNo))
+	}
+	if req.Prov != nil {
+		do = do.Where(q.LogsUserUsage.Prov.Eq(*req.Prov))
+	}
+	if req.City != nil {
+		do = do.Where(q.LogsUserUsage.City.Eq(*req.City))
+	}
+	if req.Isp != nil {
+		do = do.Where(q.LogsUserUsage.ISP.Eq(*req.Isp))
+	}
+	if req.CreatedAtStart != nil {
+		time := u.DateHead(*req.CreatedAtStart)
+		do = do.Where(q.LogsUserUsage.Time.Gte(time))
+	}
+	if req.CreatedAtEnd != nil {
+		time := u.DateTail(*req.CreatedAtEnd)
+		do = do.Where(q.LogsUserUsage.Time.Lte(time))
+	}
+
 	list, total, err := q.LogsUserUsage.
-		Joins(q.LogsUserUsage.User).
+		Joins(q.LogsUserUsage.User, q.LogsUserUsage.Resource).
 		Select(
 			q.LogsUserUsage.ALL,
 			q.User.As("User").Phone.As("User__phone"),
 			q.User.As("User").Name.As("User__name"),
+			q.Resource.As("Resource").ResourceNo.As("Resource__resource_no"),
 		).
+		Where(do).
 		FindByPage(req.GetOffset(), req.GetLimit())
 
 	return c.JSON(core.PageResp{
@@ -84,3 +115,15 @@ func PageBatchByAdmin(c *fiber.Ctx) error {
 		Size:  req.GetSize(),
 	})
 }
+
+type PageBatchByAdminReq struct {
+	c.PageReq
+	UserPhone      *string    `json:"user_phone"`
+	ResourceNo     *string    `json:"resource_no"`
+	BatchNo        *string    `json:"batch_no"`
+	Prov           *string    `json:"prov"`
+	City           *string    `json:"city"`
+	Isp            *string    `json:"isp"`
+	CreatedAtStart *time.Time `json:"created_at_start"`
+	CreatedAtEnd   *time.Time `json:"created_at_end"`
+}