Merge branch 'fms_2.8' into debug

controller/census/invoice_payment.go

@@ -1145,13 +1145,13 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 		prevHistoryPars := make([]interface{}, 0)
 
 		if req.CompanyType == 1 {
-			cond += ` AND b.new_company = 1 `
-			prevCond += ` AND b.new_company = 1 `
+			cond += ` AND b.contract_type = 1 `
+			prevCond += ` AND b.contract_type = 1 `
 			histrtyCond += ` AND new_company = 1 `
 			prevHistoryCond += ` AND new_company = 1 `
 		} else if req.CompanyType == 2 {
-			cond += ` AND b.new_company = 0 `
-			prevCond += ` AND b.new_company = 0 `
+			cond += ` AND b.contract_type = 2 `
+			prevCond += ` AND b.contract_type = 2 `
 			histrtyCond += ` AND new_company = 0 `
 			prevHistoryCond += ` AND new_company = 0 `
 		}
@@ -1400,6 +1400,7 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 		//fmt.Println("1：", prevTotalMoneySlice[i])
 		//fmt.Println("2:", totalMoneySlice[i])
 		//fmt.Println("3:", totalMoneySlice[i]-prevTotalMoneySlice[i])
+		totalMoneySlice[i], _ = strconv.ParseFloat(fmt.Sprintf("%.2f", totalMoneySlice[i]), 64)
 		if prevTotalMoneySlice[i] != 0 && totalMoneySlice[i] != 0 {
 			yoy = (totalMoneySlice[i] - prevTotalMoneySlice[i]) / prevTotalMoneySlice[i]
 			yoyStr = fmt.Sprintf("%.4f", yoy)