feat:分页

jyBXCore/api/bxcore.api

@@ -149,7 +149,7 @@ type (
 		Keywords      string `json:"keywords,optional"`         //查询项目名称 关键词；多个空格隔开
 		EntUserIds    string `json:"entUserIds,optional"`       //企业参标人企业用户id集合，多个,号隔开
 		PageSize      int64  `json:"pageSize,default=10"`       //每页数据量
-		PageNum       int64  `json:"pageNum,default=0"`         //当前页码
+		PageNum       int64  `json:"pageNum,default=1"`         //当前页码
 		Identity      string `path:"identity,options=mine|ent"` //我的：mine；企业：ent
 		OrderNum      int64  `json:"orderNum,default=0"`        //排序：0:投标截止日期正序、1:开标时间正序、2:更新状态时间倒叙
 	}

jyBXCore/api/internal/types/types.go

@@ -141,7 +141,7 @@ type ParticipateListReq struct {
 	Keywords      string `json:"keywords,optional"`         //查询项目名称 关键词；多个空格隔开
 	EntUserIds    string `json:"entUserIds,optional"`       //企业参标人企业用户id集合，多个,号隔开
 	PageSize      int64  `json:"pageSize,default=10"`       //每页数据量
-	PageNum       int64  `json:"pageNum,default=0"`         //当前页码
+	PageNum       int64  `json:"pageNum,default=1"`         //当前页码
 	Identity      string `path:"identity,options=mine|ent"` //我的：mine；企业：ent
 	OrderNum      int64  `json:"orderNum,default=0"`        //排序：0:投标截止日期正序、1:开标时间正序、2:更新状态时间倒叙
 }

jyBXCore/rpc/model/mysql/participateBid.go

@@ -631,7 +631,8 @@ func AdminParticipateList(in *bxcore.ParticipateListReq, conditionSql string) (d
 	count := IC.BaseMysql.CountBySql(adminCountSql, in.EntId)
 	if count > 0 {
 		data.Count = count
-		adminListSql := fmt.Sprintf(adminSql, "pt.*, pug.ent_user_id,pug.update_date") + conditionSql
+		in.PageNum = (in.PageNum - 1) * in.PageSize
+		adminListSql := fmt.Sprintf(adminSql, " pt.*, pug.ent_user_id,pug.update_date ") + conditionSql + fmt.Sprintf(" LIMIT %d,%d", in.PageNum, in.PageSize)
 		list := IC.BaseMysql.SelectBySql(adminListSql, in.EntId)
 		if list != nil && len(*list) > 0 {
 			for _, v := range *list {

jyBXCore/rpc/service/participate.go

@@ -23,6 +23,12 @@ func ParticipateList(in *bxcore.ParticipateListReq) (*bxcore.ParticipateListRes,
 			in.EntUserIds = ""
 		}
 	}
+	if in.PageNum < 1 {
+		in.PageNum = 1
+	}
+	if in.PageSize < 1 {
+		in.PageSize = 10
+	}
 	switch in.Identity {
 	case "mine": //员工|个人列表
 		r, e := mysql.SingleParticipateList(in, mysql.ParticipateListSql(in))