|
@@ -510,26 +510,28 @@ func BuyerProjectMerge(dataMap, projectMap *map[string]map[string]interface{}, s
|
|
|
count = gconv.Int64(projectMap["count"])
|
|
|
money := gconv.Int64(projectMap["money"])
|
|
|
zbtime := gconv.Int64(projectMap["zbtime"])
|
|
|
+ if count >= 2 {
|
|
|
+ highSuccessNumber++
|
|
|
+ }
|
|
|
if sourceType == "1" {
|
|
|
if count < 2 {
|
|
|
continue
|
|
|
}
|
|
|
- highSuccessNumber++
|
|
|
- returnData = append(returnData, BuyerProject{
|
|
|
- BuyerId: buyerId,
|
|
|
- BuyerName: buyerName,
|
|
|
- Project: ProjectEntity{
|
|
|
- Number: count,
|
|
|
- EstimatedAmount: money,
|
|
|
- Connections: []map[string]interface{}{},
|
|
|
- },
|
|
|
- Area: gconv.String(projectMap["area"]),
|
|
|
- Zbtime: zbtime,
|
|
|
- IsIgnore: gconv.Bool(buyerMap["isIgnore"]),
|
|
|
- IsMonitor: gconv.Bool(buyerMap["isMonitor"]),
|
|
|
- IsCreateCustomer: gconv.Bool(buyerMap["isCreateCustomer"]),
|
|
|
- })
|
|
|
}
|
|
|
+ returnData = append(returnData, BuyerProject{
|
|
|
+ BuyerId: buyerId,
|
|
|
+ BuyerName: buyerName,
|
|
|
+ Project: ProjectEntity{
|
|
|
+ Number: count,
|
|
|
+ EstimatedAmount: money,
|
|
|
+ Connections: []map[string]interface{}{},
|
|
|
+ },
|
|
|
+ Area: gconv.String(projectMap["area"]),
|
|
|
+ Zbtime: zbtime,
|
|
|
+ IsIgnore: gconv.Bool(buyerMap["isIgnore"]),
|
|
|
+ IsMonitor: gconv.Bool(buyerMap["isMonitor"]),
|
|
|
+ IsCreateCustomer: gconv.Bool(buyerMap["isCreateCustomer"]),
|
|
|
+ })
|
|
|
} else {
|
|
|
if sourceType == "1" {
|
|
|
if count < 2 {
|