Merge branch 'fms_2.8'

controller/census/invoice_payment.go

@@ -1022,7 +1022,7 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 		cond += ` AND b.contract_type = 1 `
 		historyCond += ` AND new_company = 1`
 	} else if req.CompanyType == 2 {
-		cond += ` AND b.contract_type = 2 `
+		cond += ` AND b.contract_type IN (2,3,4) `
 		historyCond += ` AND new_company = 0`
 	}
 
@@ -1146,8 +1146,8 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 			histrtyCond += ` AND new_company = 1 `
 			prevHistoryCond += ` AND new_company = 1 `
 		} else if req.CompanyType == 2 {
-			cond += ` AND b.contract_type = 2 `
-			prevCond += ` AND b.contract_type = 2 `
+			cond += ` 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 `
 		}