修改分页数

db/project.go

@@ -72,7 +72,7 @@ func GetFullProjectList(ctx context.Context, enterpriseID int64, pageSize, pageN
 	return fullProjects, total, nil
 }
 
-func GetProjectTaskList(ctx context.Context, projectID string, pageSize, pageNum int32, conditions *common_model.TaskConditions) ([]*gorm_model.ProjectTaskInfo, int64, error) {
+func GetProjectTaskList(ctx context.Context, projectID string, pageSize, pageNum int64, conditions *common_model.TaskConditions) ([]*gorm_model.ProjectTaskInfo, int64, error) {
 	db := GetReadDB(ctx)
 	// 查询task表信息
 	db = db.Debug().Model(gorm_model.YoungeeTaskInfo{})
@@ -97,14 +97,7 @@ func GetProjectTaskList(ctx context.Context, projectID string, pageSize, pageNum
 		logrus.WithContext(ctx).Errorf("[GetProjectTaskList] error query mysql total, err:%+v", err)
 		return nil, 0, err
 	}
-	// 查询该页数据
-	limit := pageSize
-	offset := pageSize * pageNum // assert pageNum start with 0
-	err := db.Order("task_id").Limit(int(limit)).Offset(int(offset)).Find(&taskInfos).Error
-	if err != nil {
-		logrus.WithContext(ctx).Errorf("[GetProjectTaskList] error query mysql total, err:%+v", err)
-		return nil, 0, err
-	}
+	db.Order("task_id").Find(&taskInfos)
 
 	// 查询账号id
 	var accountIds []int
@@ -134,6 +127,22 @@ func GetProjectTaskList(ctx context.Context, projectID string, pageSize, pageNum
 		logrus.WithContext(ctx).Errorf("[GetProjectTaskList] error query mysql total, err:%+v", err)
 		return nil, 0, err
 	}
+	var misNum int64
+	if totalAccount > totalTask {
+		misNum = totalAccount - totalTask
+	} else {
+		misNum = totalTask - totalAccount
+	}
+	logrus.Println("misNum:", misNum)
+	// 查询该页数据
+	limit := pageSize + misNum
+	offset := pageSize * pageNum // assert pageNum start with 0
+	err := db.Order("task_id").Limit(int(limit)).Offset(int(offset)).Error
+	if err != nil {
+		logrus.WithContext(ctx).Errorf("[GetProjectTaskList] error query mysql total, err:%+v", err)
+		return nil, 0, err
+	}
+
 	accountMap := make(map[int]gorm_model.YoungeePlatformAccountInfo)
 	for _, accountInfo := range accountInfos {
 		accountMap[accountInfo.AccountID] = accountInfo

model/http_model/project_taskList.go

@@ -1,8 +1,8 @@
 package http_model
 
 type ProjectTaskListRequest struct {
-	PageSize         int32  `json:"page_size"`
-	PageNum          int32  `json:"page_num"`
+	PageSize         int64  `json:"page_size"`
+	PageNum          int64  `json:"page_num"`
 	ProjectId        string `json:"project_id"`        // 项目ID
 	TaskId           string `json:"task_id"`           // 任务ID
 	StrategyId       string `json:"strategy_id"`       // 策略ID

service/project.go

@@ -167,7 +167,7 @@ func (*project) GetFullProjectList(ctx context.Context, enterpriseID int64, page
 	return fullProjectListData, nil
 }
 
-func (*project) GetProjectTaskList(ctx context.Context, projectID string, pageSize, pageNum int32, conditions *common_model.TaskConditions) (*http_model.ProjectTaskListData, error) {
+func (*project) GetProjectTaskList(ctx context.Context, projectID string, pageSize, pageNum int64, conditions *common_model.TaskConditions) (*http_model.ProjectTaskListData, error) {
 	projectTasks, total, err := db.GetProjectTaskList(ctx, projectID, pageSize, pageNum, conditions)
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[project service] call GetProjectTaskList error,err:%+v", err)