瀏覽代碼

feat:xiugai

wangchuanjin 9 月之前
父節點
當前提交
ae65a73982
共有 2 個文件被更改,包括 6 次插入5 次删除
  1. 3 3
      api/internal/service/network.go
  2. 3 2
      api/internal/service/network_test.go

+ 3 - 3
api/internal/service/network.go

@@ -993,7 +993,7 @@ func (n *network) Introduce_Supplier(values []string, businessType []string) map
 	repeat := map[string]bool{}
 	whRepeat := map[string]map[string]bool{}
 	buyers := []string{}
-	q := `select winner_id,buyer_id,buyer from information.transaction_info_all where hasAny(winner_id,[` + wh + `]) and project_bidstatus>1`
+	q := `select winner_id,buyer_id,buyer from information.transaction_info_all where hasAny(winner_id,[` + wh + `])`
 	rows, err := ClickhouseConn.Query(context.Background(), q, args...)
 	if err != nil {
 		logx.Error(err)
@@ -1043,7 +1043,7 @@ func (n *network) Introduce_Agency(values []string, businessType []string) map[s
 		return map[string]*projectInfo{}
 	}
 	wh, args := NetworkCom.WhArgs(values)
-	q := `select DISTINCT agency_id,buyer_id,buyer from information.transaction_info_all where agency_id in (` + wh + `) and project_bidstatus>1`
+	q := `select DISTINCT agency_id,buyer_id,buyer from information.transaction_info_all where agency_id in (` + wh + `)`
 	rows, err := ClickhouseConn.Query(context.Background(), q, args...)
 	if err != nil {
 		logx.Error(err)
@@ -1088,7 +1088,7 @@ func (n *network) Introduce_Middleman(values []string, businessType []string) ma
 		return result
 	}
 	wh, args := NetworkCom.WhArgs(values)
-	q := `select DISTINCT project_id,project_money from information.transaction_info_all where project_id in (` + wh + `) and project_bidstatus>1`
+	q := `select DISTINCT project_id,project_money from information.transaction_info_all where project_id in (` + wh + `)`
 	if len(businessType) > 0 {
 		newWh, newArgs := NetworkCom.WhArgs(businessType)
 		q += ` and hasAny(topscopeclass,[` + newWh + `])`

+ 3 - 2
api/internal/service/network_test.go

@@ -123,13 +123,14 @@ func TestAllProject(t *testing.T) {
 func TestOwner(t *testing.T) {
 	InitConf()
 	ownerService := &OwnerService{
-		PartyA:      "30604a74c36f47daa532503ac496914c",
+		//PartyA:      "30604a74c36f47daa532503ac496914c",
+		Heterotophy: "ffe7b3b526f048f9999b803a4241ce77",
 		PositionId:  935,
 		PageIndex:   1,
 		PageSize:    100,
 		ProjectType: "1",
 		EntId:       221,
-		SourceType:  "2",
+		//SourceType:  "2",
 	}
 	data := ownerService.OwnerlList()
 	b, _ := json.Marshal(data)