|
|
@@ -908,7 +908,7 @@ func (n *network) Introduce_Firstparty(fpn map[string][]*firstpartyNetwork, entM
|
|
|
q += ` and hasAny(property_form,[` + newWh + `])`
|
|
|
args = append(args, newArgs...)
|
|
|
}
|
|
|
- q += ` group by buyer_id`
|
|
|
+ q += ` and project_bidstatus>1 group by buyer_id`
|
|
|
rows, err := ClickhouseConn.Query(context.Background(), q, args...)
|
|
|
if err != nil {
|
|
|
logx.Error(err)
|
|
|
@@ -967,7 +967,7 @@ func (n *network) Introduce_Supplier(values []string, entMonitor map[string]bool
|
|
|
repeat := map[string]bool{}
|
|
|
whRepeat := map[string]map[string]bool{}
|
|
|
buyers := []string{}
|
|
|
- q := `select winner_id,buyer_id,buyer from information.transaction_info where hasAny(winner_id,[` + wh + `])`
|
|
|
+ q := `select winner_id,buyer_id,buyer from information.transaction_info where hasAny(winner_id,[` + wh + `]) and project_bidstatus>1`
|
|
|
rows, err := ClickhouseConn.Query(context.Background(), q, args...)
|
|
|
if err != nil {
|
|
|
logx.Error(err)
|
|
|
@@ -1017,7 +1017,7 @@ func (n *network) Introduce_Agency(values []string, entMonitor map[string]bool,
|
|
|
return map[string]*projectInfo{}
|
|
|
}
|
|
|
wh, args := NetworkCom.WhArgs(values)
|
|
|
- q := `select DISTINCT agency_id,buyer_id,buyer from information.transaction_info where agency_id in (` + wh + `)`
|
|
|
+ q := `select DISTINCT agency_id,buyer_id,buyer from information.transaction_info where agency_id in (` + wh + `) and project_bidstatus>1`
|
|
|
rows, err := ClickhouseConn.Query(context.Background(), q, args...)
|
|
|
if err != nil {
|
|
|
logx.Error(err)
|
|
|
@@ -1062,7 +1062,7 @@ func (n *network) Introduce_Middleman(values []string, entMonitor map[string]boo
|
|
|
return result
|
|
|
}
|
|
|
wh, args := NetworkCom.WhArgs(values)
|
|
|
- q := `select DISTINCT project_id,project_money from information.transaction_info where project_id in (` + wh + `)`
|
|
|
+ q := `select DISTINCT project_id,project_money from information.transaction_info where project_id in (` + wh + `) and project_bidstatus>1`
|
|
|
if len(probusfors) > 0 {
|
|
|
newWh, newArgs := NetworkCom.WhArgs(probusfors)
|
|
|
q += ` and hasAny(property_form,[` + newWh + `])`
|
|
|
@@ -1168,7 +1168,7 @@ func (n *network) BuyerProjectInfo(ids []string, probusfors []string) map[string
|
|
|
return vm
|
|
|
}
|
|
|
wh, args := NetworkCom.WhArgs(ids)
|
|
|
- q := `select buyer_id,count(DISTINCT project_id) AS project_count,sum(project_money) AS project_amount,groupUniqArray(project_id) from information.transaction_info where buyer_id in (` + wh + `)`
|
|
|
+ q := `select buyer_id,count(DISTINCT project_id) AS project_count,sum(project_money) AS project_amount,groupUniqArray(project_id) from information.transaction_info where buyer_id in (` + wh + `) and project_bidstatus>1`
|
|
|
if len(probusfors) > 0 {
|
|
|
newWh, newArgs := NetworkCom.WhArgs(probusfors)
|
|
|
q += ` and hasAny(property_form,[` + newWh + `])`
|
