|
@@ -558,9 +558,9 @@ func BuyerProjectMerge(dataMap, projectMap *map[string]map[string]interface{}, s
|
|
|
},
|
|
|
Area: "",
|
|
|
Zbtime: 0,
|
|
|
- IsIgnore: false,
|
|
|
- IsMonitor: false,
|
|
|
- IsCreateCustomer: false,
|
|
|
+ IsIgnore: gconv.Bool(buyerMap["isIgnore"]),
|
|
|
+ IsMonitor: gconv.Bool(buyerMap["isMonitor"]),
|
|
|
+ IsCreateCustomer: gconv.Bool(buyerMap["isCreateCustomer"]),
|
|
|
})
|
|
|
}
|
|
|
connectionsNumber++
|
|
@@ -778,7 +778,7 @@ func ProjectHandle(buyerArr []string, entAccountId int64, entName, area, project
|
|
|
(*projectMap)[buyerName] = map[string]interface{}{
|
|
|
"area": area,
|
|
|
"zbtime": v.Zbtime_count.Value,
|
|
|
- "money": gconv.Int64(common.Float64All(v.Money_count.Value) * 10000),
|
|
|
+ "money": common.RetainDecimal((common.Float64All(v.Money_count.Value) / 10000), 2),
|
|
|
"count": v.Doc_count,
|
|
|
"buyerId": buyerId,
|
|
|
}
|