|
@@ -1051,8 +1051,8 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
|
|
|
cond += ` AND b.contract_type IN (2,3,4) `
|
|
cond += ` AND b.contract_type IN (2,3,4) `
|
|
|
historyCond += ` AND new_company = 0 `
|
|
historyCond += ` AND new_company = 0 `
|
|
|
} else if req.CompanyType == 3 {
|
|
} else if req.CompanyType == 3 {
|
|
|
- cond += ` AND b.contract_type = 1 `
|
|
|
|
|
- historyCond += ` AND new_company = 1 `
|
|
|
|
|
|
|
+ cond += ` AND b.contract_type IN (2,3,4) `
|
|
|
|
|
+ historyCond += ` AND new_company = 0 `
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
var latestTime time.Time
|
|
var latestTime time.Time
|
zwxi