修复提取并发问题 & 修复接口时区问题

web/handlers/batch.go

@@ -29,13 +29,20 @@ func PageBatch(ctx *fiber.Ctx) error {
 	// 查询批次
 	conds := q.LogsUserUsage.Where(q.LogsUserUsage.UserID.Eq(authCtx.User.ID))
 	if req.TimeStart != nil {
-		conds.Where(q.LogsUserUsage.Time.Gte(*req.TimeStart))
+		start := u.DateHead(*req.TimeStart)
+		conds.Where(q.LogsUserUsage.Time.Gte(start))
 	}
 	if req.TimeEnd != nil {
-		conds.Where(q.LogsUserUsage.Time.Lte(*req.TimeEnd))
+		end := u.DateTail(*req.TimeEnd)
+		conds.Where(q.LogsUserUsage.Time.Lte(end))
+	}
+	if req.ResourceNo != nil {
+		conds.Where(q.Resource.As("Resource").ResourceNo.Eq(*req.ResourceNo))
 	}
 
-	list, total, err := q.LogsUserUsage.Where(conds).
+	list, total, err := q.LogsUserUsage.Debug().
+		Joins(q.LogsUserUsage.Resource).
+		Where(conds).
 		Order(q.LogsUserUsage.Time.Desc()).
 		FindByPage(req.GetOffset(), req.GetLimit())
 	if err != nil {
@@ -53,8 +60,9 @@ func PageBatch(ctx *fiber.Ctx) error {
 
 type PageResourceBatchReq struct {
 	c.PageReq
-	TimeStart *time.Time `json:"time_start"`
-	TimeEnd   *time.Time `json:"time_end"`
+	ResourceNo *string    `json:"resource_no"`
+	TimeStart  *time.Time `json:"time_start"`
+	TimeEnd    *time.Time `json:"time_end"`
 }
 
 // PageBatchByAdmin 分页查询所有提取记录