Merge branch 'dev/v4.8.28_dx' of qmx/jy into release/v4.8.28

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

@@ -26,7 +26,7 @@ var (
 )
 
 const (
-	PSearch_DecField    = `"projectname","_id","buyer","firsttime","area","city","s_winner","review_experts","budget","bidamount","project_rate","bidtype","ids","winnerorder","entidlist","bidtype","bidcycle","buyerclass","jgtime"`
+	PSearch_DecField    = `"projectname","_id","buyer","firsttime","area","city","s_winner","review_experts","budget","bidamount","project_rate","bidtype","ids","winnerorder","entidlist","bidtype","bidcycle","buyerclass","jgtime","list"`
 	PSearch_DecMust     = `"bidstatus": ["中标","成交","合同"]`
 	PSearch_DecSimCount = 100                 //决策分析类似项目明细数据量
 	PSearch_DecSort     = `{"jgtime":"desc"}` //决策分析类似项目明细排序
@@ -320,6 +320,12 @@ func Sequence(seqData []map[string]interface{}) []map[string]interface{} {
 		if len(review_experts) > 0 {
 			score += review_experts_score
 		}
+		list, _ := v["list"].([]interface{})
+		if len(list) > 0 {
+			listMap, _ := list[0].(map[string]interface{})
+			v["subtype"] = listMap["subtype"]
+			delete(v, "list")
+		}
 		//采购方式
 		if v["bidtype"] != nil && qutil.ObjToString(v["bidtype"].(string)) != "" {
 			score += bidtype_score

src/jfw/modules/bigmember/src/service/analysis/decision.go

@@ -35,7 +35,7 @@ type DecParam struct {
 	AppVersion    string                 //app版本号
 	LimitTime     string                 //检索日期
 	ProjectScope  int                    //0 同类项目（默认搜索） 1 全部项目
-	HotWinnerType int                    // 热门中标企业top10 排序 0 默认数量排序 1：金额
+	HotWinnerType int                    // 热门中标企业top10 排序 0 默认金额排序 1：数量
 }
 
 /*已选条件--关键词*/
@@ -357,9 +357,9 @@ func (this *Analysis) HotWinnerTop() {
 							v.Doc_count = qutil.Float64All(v1)
 						}
 					}
-					sortkey := "total_project" //默认金额
+					sortkey := "doc_count" //默认金额
 					if getRes.HotWinnerType == 0 {
-						sortkey = "doc_count"
+						sortkey = "total_project"
 					}
 					util.SortData(&winnerAmount, sortkey, true) //排序
 					aggsArr["winnerAmount"] = winnerAmount