|
@@ -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 == "续约合同" {
|
|
@@ -1490,10 +1490,12 @@ func (this *StatisticCompanyMergerController) GetYearList() {
|
|
|
thisYear := time.Now().Year()
|
|
|
startYear := 2021 //初始查询年份
|
|
|
|
|
|
- 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 = "获取成功"
|