fix：时间非必传，最大数量限制为100，不允许超过100

controllers/base_auth.go

@@ -71,6 +71,10 @@ func (c *BaseAuth) Prepare() {
 	if pageSize <= 0 {
 		pageSize = utils.PageSize20
 	}
+	//如果超过最大分页数，那么就是按照最大分页数返回
+	if pageSize > utils.PageMaxSize{
+		pageSize = utils.PageMaxSize
+	}
 	if currentIndex <= 0 {
 		currentIndex = 1
 	}

controllers/company_user.go

@@ -29,32 +29,41 @@ func (c *CompanyUser) GetUserReportList()  {
 	email:=c.GetString("email","")
 	startDate:=c.GetString("start_date","")
 	endDate:=c.GetString("end_date","")
-	if startDate == ""{
-		c.FailWithMessage("start_date必传")
-		return
-	}
-	if endDate == ""{
-		c.FailWithMessage("end_date必传")
-		return
-	}
-	startDateTime,err := time.Parse(utils.FormatDate,startDate)
-	if err != nil{
-		c.FailWithMessage("start_date格式异常")
-		return
-	}
-	endDateTime,err := time.Parse(utils.FormatDate,endDate)
-	if err != nil{
-		c.FailWithMessage("end_date格式异常")
-		return
+
+	//}
+	//	return
+	//	c.FailWithMessage("end_date必传")
+	//if endDate == ""{
+	//}
+	//	return
+	//	c.FailWithMessage("start_date必传")
+	//if startDate == ""{
+
+	startTime := ``
+	endTime := ``
+	if startDate != "" && endDate != ""{
+		startDateTime,err := time.Parse(utils.FormatDate,startDate)
+		if err != nil{
+			c.FailWithMessage("start_date格式异常")
+			return
+		}
+		endDateTime,err := time.Parse(utils.FormatDate,endDate)
+		if err != nil{
+			c.FailWithMessage("end_date格式异常")
+			return
+		}
+		startTime = startDateTime.Format(utils.FormatDate)+" 00:00:00"
+		endTime = endDateTime.Format(utils.FormatDate)+" 23:59:59"
 	}
 
+
 	pageSize := c.PageSize
 	startSize := c.StartSize
 	currentIndex := c.StartPage
 
 
 
-	total,list, err := tables.GetViewReportList(mobile,email,startDateTime.Format(utils.FormatDate)+" 00:00:00",endDateTime.Format(utils.FormatDate)+" 23:59:59",startSize,pageSize)
+	total,list, err := tables.GetViewReportList(mobile,email,startTime,endTime,startSize,pageSize)
 	if err != nil {
 		c.FailWithMessage("获取失败")
 		return

models/tables/company_user.go

@@ -265,12 +265,15 @@ func GetViewReportList(mobile,email,startDate,endDate string, startSize, pageSiz
 		pars = append(pars,email,email,email)
 	}
 
-	sql1 = ` and uvh.created_time >= ? and uvh.created_time <= ?  `
-	pars = append(pars,startDate,endDate)
-	sql2 = ` and rvr.create_time >= ? and rvr.create_time <= ?  `
-	pars = append(pars,startDate,endDate)
-	sql3 = ` and auc.create_time >= ? and auc.create_time <= ?  `
-	pars = append(pars,startDate,endDate)
+	//时间筛选
+	if startDate != ""&& endDate !=""{
+		sql1 = ` and uvh.created_time >= ? and uvh.created_time <= ?  `
+		pars = append(pars,startDate,endDate)
+		sql2 = ` and rvr.create_time >= ? and rvr.create_time <= ?  `
+		pars = append(pars,startDate,endDate)
+		sql3 = ` and auc.create_time >= ? and auc.create_time <= ?  `
+		pars = append(pars,startDate,endDate)
+	}
 
 	if utils.RunMode == "debug" {
 		dataName = "test_v2_hongze_rddp"

utils/constants.go

@@ -16,6 +16,7 @@ const (
 	PageSize10            = 10
 	PageSize20            = 20
 	PageSize30            = 30
+	PageMaxSize            = 100	//每页最大数据数
 )
 
 const (