Merge branch 'dev/v4.8.59_dx' of qmx/jy into feature/v4.8.59

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

@@ -223,7 +223,7 @@ func GetWinnerPortraitSearch(screen *PortraitScreen) (map[string]interface{}, er
 	tBegin := time.Now()
 	doSearchSql := fmt.Sprintf(winnerPortraitSearchSql, strings.Join(mustQueryArr, ","), comminTimeRange, comminTimeRange, bidamountTimeRange)
 	res, docCount := util.GetAggsWithCount("projectset", "projectset", doSearchSql)
-	log.Println("winnerPortraitSql", doSearchSql)
+	//log.Println("winnerPortraitSql", doSearchSql)
 	if res == nil {
 		return nil, errors.New(fmt.Sprintf("%s中标企业画像查询异常\n", screen.Ent))
 	}

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

@@ -417,7 +417,9 @@ func (pwp *PortraitProjectScreen) GetBuyerList() (list []map[string]interface{},
 			title = qutil.ObjToString(rowData["projectname"])
 		}
 		rowData["title"] = util.ClearHtml.ReplaceAllString(title, "")
-
+		if rowData["bidstatus"] == nil || rowData["bidstatus"] == "" {
+			rowData["bidstatus"] = rowData["subtype"]
+		}
 		//处理企业名称
 		rowData["winner"] = strings.Split(qutil.ObjToString(rowData["s_winner"]), ",")
 		//加密企业id
@@ -430,7 +432,7 @@ func (pwp *PortraitProjectScreen) GetBuyerList() (list []map[string]interface{},
 			}
 			rowData["winnerIds"] = idsArr
 		}
-		for _, name := range []string{"s_winner", "entidlist", "list", "projectname"} {
+		for _, name := range []string{"s_winner", "entidlist", "list", "projectname", "_id"} {
 			delete(rowData, name)
 		}
 	}