日期范围查询

api/v1/common/req.go

@@ -9,11 +9,10 @@ package common
 
 // PageReq 公共请求参数
 type PageReq struct {
-	BeginTime string `p:"beginTime"` //开始时间
-	EndTime   string `p:"endTime"`   //结束时间
-	PageNum   int    `p:"pageNum"`   //当前页码
-	PageSize  int    `p:"pageSize"`  //每页数
-	OrderBy   string //排序方式
+	DateRange []string `p:"dateRange"` //日期范围
+	PageNum   int      `p:"pageNum"`   //当前页码
+	PageSize  int      `p:"pageSize"`  //每页数
+	OrderBy   string   //排序方式
 }
 
 // ListRes 列表公共返回

internal/app/system/service/sys_user.go

@@ -331,11 +331,8 @@ func (s *userImpl) List(ctx context.Context, req *system.UserSearchReq) (total i
 		if req.Mobile != "" {
 			m = m.Where("mobile like ?", "%"+req.Mobile+"%")
 		}
-		if req.BeginTime != "" {
-			m = m.Where("created_at >=?", req.BeginTime)
-		}
-		if req.EndTime != "" {
-			m = m.Where("created_at <=?", req.EndTime)
+		if len(req.DateRange) > 0 {
+			m = m.Where("created_at >=? AND created_at <=?", req.DateRange[0], req.DateRange[1])
 		}
 		if req.PageSize == 0 {
 			req.PageSize = consts.PageSize