|
|
@@ -1184,10 +1184,11 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
|
|
|
histrtyCond += ` AND new_company = 0 `
|
|
|
prevHistoryCond += ` AND new_company = 0 `
|
|
|
} else if req.CompanyType == 3 {
|
|
|
+ //未续约收入金额=去年同期总收入金额（新客户+老客户）-当期老客户收入金额
|
|
|
cond += ` AND b.contract_type IN (2,3,4) `
|
|
|
- prevCond += ` AND b.contract_type IN (2,3,4) `
|
|
|
+ //prevCond += ` AND b.contract_type IN (2,3,4) `
|
|
|
histrtyCond += ` AND new_company = 0 `
|
|
|
- prevHistoryCond += ` AND new_company = 0 `
|
|
|
+ //prevHistoryCond += ` AND new_company = 0 `
|
|
|
}
|
|
|
|
|
|
if req.SellerIds != "" {
|
|
|
@@ -1492,7 +1493,7 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
|
|
|
} else {
|
|
|
// 当筛选条件是”月度“时，并且客户是”未续约“客户，展示柱形图和曲线图
|
|
|
// 当筛选条件是”季度“、”半年度“、”年度“、”月度统计“时，并且客户是”未续约“时，仅展示柱形图，无曲线图
|
|
|
- // 未续约客户收入：去年同期老客户收入金额 减 当期老客户收入金额
|
|
|
+ // 未续约收入金额=去年同期总收入金额（新客户+老客户）-当期老客户收入金额
|
|
|
// 移动平均值：若是10月份，计算8月，9月，10月，这三个月的收入金额平均值
|
|
|
for i := range prevTotalMoneySlice {
|
|
|
totalMoneySlice[i], _ = strconv.ParseFloat(fmt.Sprintf("%.2f", prevTotalMoneySlice[i]-totalMoneySlice[i]), 64)
|
zwxi