Merge branch 'crm/crm_14.4.1' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/statistic_company_merge.go

@@ -1351,7 +1351,7 @@ func (this *StatisticCompanyMergerController) CompanyContractPercentageList() {
 		renewalRateMoney = fmt.Sprint(utils.SubFloatToString(float64(totalMoneyRenewal)/float64(totalMoneyNew+totalMoneyRenewalEnd)*100, 2), "%")
 		renewalRateTotal = fmt.Sprint(utils.SubFloatToString(float64(totalRenewal)/float64(totalNew+totalRenewalEnd)*100, 2), "%")
 	}
-	renewalRateTotalContent = fmt.Sprint(totalMoneyRenewal, (totalMoneyNew + totalMoneyRenewalEnd))
+	renewalRateTotalContent = fmt.Sprint(int(totalMoneyRenewal), "/", int(totalMoneyNew+totalMoneyRenewalEnd))
 	renewalRateMoneyContent = fmt.Sprint(totalRenewal, "份/", totalNew+totalRenewalEnd, "份")
 
 	if contractDataType == "续约合同" {
@@ -1488,12 +1488,14 @@ func (this *StatisticCompanyMergerController) GetYearList() {
 		return
 	}
 	thisYear := time.Now().Year()
-	startYear := 2021 //初始查询年份
+	startYear := 2022 //初始查询年份
 
-	var resp []int
+	resp := new(company.SearchYearListResp)
+	var yearList []int
 	for i := startYear; i <= thisYear; i++ {
-		resp = append(resp, i)
+		yearList = append(yearList, i)
 	}
+	resp.List = yearList
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

models/company/company_contract_merge.go

@@ -113,3 +113,8 @@ func GetIncrementalRenewalCompanyProductMergeSumMoney(condition string, pars []i
 	err = o.Raw(sql, pars).QueryRow(&total)
 	return
 }
+
+// 权益客户统计，续约率搜索自然年的年份，返回类
+type SearchYearListResp struct {
+	List []int
+}