|
|
@@ -364,6 +364,7 @@ where
|
|
|
"count": gconv.Int64(m["count"]),
|
|
|
"personName": gconv.String(m["personName"]),
|
|
|
"list": m["list"],
|
|
|
+ "zbtime": m["zbtime"],
|
|
|
})
|
|
|
}
|
|
|
for _, m := range agencyMap {
|
|
|
@@ -377,11 +378,16 @@ where
|
|
|
"personName": gconv.String(m["personName"]),
|
|
|
"count": gconv.Int64(m["count"]),
|
|
|
"list": m["list"],
|
|
|
+ "zbtime": m["zbtime"],
|
|
|
})
|
|
|
}
|
|
|
}
|
|
|
sort.Slice(returnData, func(i, j int) bool {
|
|
|
- return gconv.Int64(returnData[i]["zbtime"]) > gconv.Int64(returnData[j]["zbtime"])
|
|
|
+ aa := fmt.Sprintf("%s%s", gconv.String(returnData[i]["zbtime"]),
|
|
|
+ gconv.String(returnData[i]["b_id"]))
|
|
|
+ bb := fmt.Sprintf("%s%s", gconv.String(returnData[j]["zbtime"]),
|
|
|
+ gconv.String(returnData[j]["b_id"]))
|
|
|
+ return aa > bb
|
|
|
})
|
|
|
return returnData
|
|
|
}
|
|
|
@@ -1086,7 +1092,8 @@ func (t *OwnerService) CandidateChannel() ([]*ResultData, int, int, int, int) {
|
|
|
returnData := []*ResultData{}
|
|
|
dataMap := &map[string]map[string]interface{}{}
|
|
|
if t.PartyA != "" || t.Supplier != "" || t.Heterotophy != "" || t.Intermediary != "" || t.Agency != "" {
|
|
|
- dataMap = BuyerList(t.PartyA, t.Supplier, t.Heterotophy, t.Intermediary, t.Agency, t.PositionId)
|
|
|
+ dataMap = BuyerList(t.PartyA, t.Supplier, t.Heterotophy, "", t.Agency,
|
|
|
+ t.PositionId)
|
|
|
}
|
|
|
a1, a2, a3, a4 := 0, 0, 0, 0
|
|
|
if len(*dataMap) > 0 && dataMap != nil {
|
WH01243