wip:采购单位和中标单位

marketanalysis/common.go

@@ -20,6 +20,8 @@ func WinningAnalysis(thisWinnerRow BuyerWinnerRow, rMap *sync.Map, entArrMap map
 	defer sy.Done()
 	type s_Winner struct {
 		Name        string      `json:"key"`
+		TCount      int         `json:"t_count"`  //项目数量
+		TAmount     float64     `json:"t_amount"` //项目金额
 		TotalAmount interface{} `json:"total_amount"`
 		TotalNumber interface{} `json:"total_number"`
 	}
@@ -47,11 +49,16 @@ func WinningAnalysis(thisWinnerRow BuyerWinnerRow, rMap *sync.Map, entArrMap map
 	for _, v := range Analysis {
 		var data s_Winner
 		data.Name = v
-		if vlu, ok := winnerA[v]; ok && countAll != 0 {
-			data.TotalNumber = float64(vlu.Count) / float64(countAll)
-		}
-		if vlu, ok := winnerA[v]; ok && amountAll != 0 {
-			data.TotalAmount = vlu.Amount / amountAll
+		vlu, ok := winnerA[v]
+		if ok {
+			data.TCount = vlu.Count
+			data.TAmount = vlu.Amount
+			if countAll != 0 {
+				data.TotalNumber = float64(vlu.Count) / float64(countAll)
+			}
+			if amountAll != 0 {
+				data.TotalAmount = vlu.Amount / amountAll
+			}
 		}
 		buyerMap = append(buyerMap, data)
 	}
@@ -196,6 +203,8 @@ func BuyerAnalysis(thisBuyerRow BuyerWinnerRow, rMap *sync.Map, winnerName map[s
 	defer sy.Done()
 	type buyer struct {
 		Name        string      `json:"key"`
+		TCount      int         `json:"t_count"`  //项目数量
+		TAmount     float64     `json:"t_amount"` //金额数量
 		TotalAmount interface{} `json:"total_amount"`
 		TotalNumber interface{} `json:"total_number"`
 	}
@@ -219,11 +228,16 @@ func BuyerAnalysis(thisBuyerRow BuyerWinnerRow, rMap *sync.Map, winnerName map[s
 	for _, v := range Analysis {
 		var data buyer
 		data.Name = v
-		if vlu, ok := buyerA[v]; ok && countAll != 0 {
-			data.TotalNumber = float64(vlu.Count) / float64(countAll)
-		}
-		if vlu, ok := buyerA[v]; ok && amountAll != 0 {
-			data.TotalAmount = vlu.Amount / amountAll
+		vlu, ok := buyerA[v]
+		if ok {
+			data.TAmount = vlu.Amount
+			data.TCount = vlu.Count
+			if countAll != 0 {
+				data.TotalNumber = float64(vlu.Count) / float64(countAll)
+			}
+			if amountAll != 0 {
+				data.TotalAmount = vlu.Amount / amountAll
+			}
 		}
 		buyerMap = append(buyerMap, data)
 	}