feat:bigmember 项目明细调整

src/jfw/modules/bigmember/src/entity/report.go

@@ -16,7 +16,7 @@ type ReportProjectInfoParam struct {
 	Items      []string            `json:"items"`      // 订阅关键词组
 	Area       map[string][]string `json:"area"`       // 省份城市
 	Industry   []string            `json:"industry"`   // 行业
-	Buyerclass []string            `json:"buyerclass"` // 采购单位类型
+	BuyerClass []string            `json:"buyerClass"` // 采购单位类型
 	Buyer      string              `json:"buyer"`      // 采购单位
 	Winner     string              `json:"winner"`     // 中标单位
 	Sort       int                 `json:"sort"`       // 排序默认0：成交时间倒序；1：项目金额倒序
@@ -77,11 +77,11 @@ func GetReportProjectInfo(param *ReportProjectInfoParam, positionId int64) (data
 		qstr = append(qstr, fmt.Sprintf("subscopeclass in (%s)", strings.Join(tmpArr, ",")))
 	}
 	// 采购单位类型
-	if param.Buyerclass != nil && len(param.Buyerclass) > 0 {
+	if param.BuyerClass != nil && len(param.BuyerClass) > 0 {
 		tmpArr := []string{}
-		for i := 0; i < len(param.Buyerclass); i++ {
+		for i := 0; i < len(param.BuyerClass); i++ {
 			tmpArr = append(tmpArr, "?")
-			values = append(values, param.Buyerclass[i])
+			values = append(values, param.BuyerClass[i])
 		}
 		qstr = append(qstr, fmt.Sprintf("buyerclass in (%s)", strings.Join(tmpArr, ",")))
 	}
@@ -133,6 +133,7 @@ func ReportProjectInfoFormat(data []map[string]interface{}) []map[string]interfa
 			}
 			winIdArr = append(winIdArr, splitWinnerId[j])
 		}
+		tmp["id"] = encrypt.EncodeArticleId2ByCheck(common.ObjToString(data[i]["source_infoid"]))
 		tmp["winnerId"] = winIdArr
 		tmp["winner"] = strings.Split(tmpWinner, ",")
 		tmp["name"] = common.ObjToString(data[i]["name"])

src/jfw/modules/bigmember/src/service/report/report.go

@@ -203,14 +203,15 @@ func (r *Report) ProjectInfo() {
 		R.InvalidReqParam(r.ResponseWriter, r.Request, "start", "end")
 		return
 	}
+	if param.PageNum*param.PageSize > config.Config.ProjectCount {
+		param.PageNum = config.Config.ProjectCount / param.PageSize
+	}
+	//当前页码
+	param.PageNum = qutil.If(param.PageNum < 1 || param.PageNum > 1000, 1, param.PageNum).(int)
+	//默认每页10条
+	param.PageSize = qutil.If(param.PageSize < 1 || param.PageSize > 100, 50, param.PageSize).(int)
 	// 取positionId
 	positionId := qutil.Int64All(r.GetSession("positionId"))
-	if param.PageSize == 0 {
-		param.PageSize = 10
-	}
-	if param.PageNum == 0 {
-		param.PageNum = 1
-	}
 	m := map[string]interface{}{}
 	list, total := entity.GetReportProjectInfo(&param, positionId)
 	m["list"] = entity.ReportProjectInfoFormat(list)