|
|
@@ -881,32 +881,32 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
|
|
|
case "AddTrialCount": //新增试用
|
|
|
mapSortDateService[vS.AdminId] = mapAddTrialNum[keyMap]
|
|
|
case "NewContractData": //新签合同
|
|
|
- mapSortDateService[vS.AdminId] = mapNewContractMoney[keyMap]
|
|
|
+ mapSortDateService[vS.AdminId] = mapNewContractMoneyServer[keyMap]
|
|
|
case "ExpiredContractData": //到期合同
|
|
|
- mapSortDateService[vS.AdminId] = mapExpiredContractMoney[keyMap]
|
|
|
+ mapSortDateService[vS.AdminId] = mapExpiredContractMoneyServer[keyMap]
|
|
|
case "RenewedContractData": //续约合同
|
|
|
- mapSortDateService[vS.AdminId] = mapRenewedContractMoney[keyMap]
|
|
|
+ mapSortDateService[vS.AdminId] = mapRenewedContractMoneyServer[keyMap]
|
|
|
case "RenewalRateData": //续约率
|
|
|
- if mapRenewedContractMoney[keyMap] == 0 || mapExpiredContractMoney[keyMap] == 0 {
|
|
|
+ if mapRenewedContractMoney[keyMap] == 0 || mapExpiredContractMoneyServer[keyMap] == 0 {
|
|
|
mapSortDateService[vS.AdminId] = 0
|
|
|
} else {
|
|
|
- mapSortDateService[vS.AdminId] = mapRenewedContractMoney[keyMap] / mapExpiredContractMoney[keyMap]
|
|
|
+ mapSortDateService[vS.AdminId] = mapRenewedContractMoneyServer[keyMap] / mapExpiredContractMoneyServer[keyMap]
|
|
|
}
|
|
|
case "ConfirmedNoRenewalContractData": //确认不续约合同
|
|
|
- mapSortDateService[vS.AdminId] = confirmedNoRenewalContractMoney[keyMap]
|
|
|
+ mapSortDateService[vS.AdminId] = confirmedNoRenewalContractMoneyServer[keyMap]
|
|
|
case "ConfirmNonRenewalRateData": //确认不续约率
|
|
|
- if confirmedNoRenewalContractMoney[keyMap] == 0 || mapExpiredContractMoney[keyMap] == 0 {
|
|
|
+ if confirmedNoRenewalContractMoneyServer[keyMap] == 0 || mapExpiredContractMoneyServer[keyMap] == 0 {
|
|
|
mapSortDateService[vS.AdminId] = 0
|
|
|
} else {
|
|
|
- mapSortDateService[vS.AdminId] = confirmedNoRenewalContractMoney[keyMap] / mapExpiredContractMoney[keyMap]
|
|
|
+ mapSortDateService[vS.AdminId] = confirmedNoRenewalContractMoneyServer[keyMap] / mapExpiredContractMoneyServer[keyMap]
|
|
|
}
|
|
|
case "SignedClientCount": //签约客户数量
|
|
|
- mapSortDateService[vS.AdminId] = float64(mapSignedClientNum[keyMap])
|
|
|
+ mapSortDateService[vS.AdminId] = float64(mapSignedClientNumServer[keyMap])
|
|
|
case "AverageRevenueCount": //客单价
|
|
|
- if mapSignedClientNum[keyMap] == 0 || mapSignedClientMoney[keyMap] == 0 {
|
|
|
+ if mapSignedClientNum[keyMap] == 0 || mapSignedClientMoneyServer[keyMap] == 0 {
|
|
|
mapSortDateService[vS.AdminId] = 0
|
|
|
} else {
|
|
|
- mapSortDateService[vS.AdminId] = mapSignedClientMoney[keyMap] / float64(mapSignedClientNum[keyMap])
|
|
|
+ mapSortDateService[vS.AdminId] = mapSignedClientMoneyServer[keyMap] / float64(mapSignedClientNumServer[keyMap])
|
|
|
}
|
|
|
case "InvoiceAmountCount": //开票金额
|
|
|
mapSortDateService[vS.AdminId] = mapInvoiceAmountMoney[keyMap]
|
|
|
@@ -1020,6 +1020,7 @@ func handleMapSortDate(mapSort map[int]float64, dataList []*statistic_report.Rai
|
|
|
|
|
|
// 3. 输出排序结果
|
|
|
for _, vsort := range adminSlice {
|
|
|
+ //fmt.Println("vsort.AdminIdKey", vsort.AdminIdKey, "vsort.AdminValue", vsort.AdminValue)
|
|
|
for _, vDate := range dataList {
|
|
|
if vDate.SellerId == strconv.Itoa(vsort.AdminIdKey) {
|
|
|
dataListResp = append(dataListResp, vDate)
|
