|
|
@@ -5,6 +5,7 @@ import (
|
|
|
"encoding/json"
|
|
|
"fmt"
|
|
|
elastic1 "gopkg.in/olivere/elastic.v1"
|
|
|
+ "log"
|
|
|
"math"
|
|
|
qutil "qfw/util"
|
|
|
"strings"
|
|
|
@@ -600,11 +601,13 @@ func (mae *MarketAnalysisEntity) BuyerWinnerAnalysis() map[string]interface{} {
|
|
|
//中标单位-项目数量 中标单位-项目金额
|
|
|
datas = append(datas, winner_procurement_scale, winner_count, winner_sortprice)
|
|
|
finalSql := fmt.Sprintf(mae.GetCommonQuerySqlWithAggs(), strings.Join(datas, ","))
|
|
|
- //log.Printf("final PurchasingAnalysiseQuery sql: %s", finalSql)
|
|
|
+ log.Printf("final PurchasingAnalysiseQuery sql: %s", finalSql)
|
|
|
+ t := time.Now()
|
|
|
res, _ := util.GetAggs("projectset", "projectset", finalSql)
|
|
|
if res == nil || len(res) == 0 {
|
|
|
return nil
|
|
|
}
|
|
|
+ log.Println("采购单位-中标单位分析报告es查询耗时===", time.Since(t))
|
|
|
var thisBuyerWinnerRow BuyerWinnerRow
|
|
|
for name, object := range res {
|
|
|
bArr, err := object.MarshalJSON()
|
|
|
@@ -670,6 +673,7 @@ func (mae *MarketAnalysisEntity) BuyerWinnerAnalysis() map[string]interface{} {
|
|
|
go BuyerAnalysis(thisBuyerWinnerRow, &rMap, winnerName, &sy)
|
|
|
go WinningAnalysis(thisBuyerWinnerRow, &rMap, winnerName, &sy)
|
|
|
sy.Wait()
|
|
|
+ log.Println("采购单位-中标单位分析报告程序计算耗时===", time.Since(t))
|
|
|
rMaps := make(map[string]interface{})
|
|
|
rMap.Range(func(key, value interface{}) bool {
|
|
|
rMaps[qutil.InterfaceToStr(key)] = value
|
