|
@@ -806,9 +806,6 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
|
|
|
} else if req.CompanyType == 2 {
|
|
|
cond += ` AND b.contract_type IN (2,3,4) `
|
|
|
historyCond += ` AND new_company = 0 `
|
|
|
- } else if req.CompanyType == 3 {
|
|
|
- cond += ` AND b.contract_type IN (2,3,4) `
|
|
|
- historyCond += ` AND new_company = 0 `
|
|
|
}
|
|
|
|
|
|
var latestTime time.Time
|
|
@@ -833,6 +830,11 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
|
|
|
latestTime = time.Now()
|
|
|
}
|
|
|
|
|
|
+ if req.CompanyType == 3 {
|
|
|
+ cond += ` AND b.contract_type IN (2,3,4) `
|
|
|
+ historyCond += ` AND new_company = 0 `
|
|
|
+ }
|
|
|
+
|
|
|
latestTime = latestTime.AddDate(0, 0, -latestTime.Day()+1)
|
|
|
addMonth := 0
|
|
|
if req.ListParam == "1" {
|