|
|
@@ -1144,7 +1144,7 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
|
|
|
} else {
|
|
|
amountCond += ` AND ((a.invoice_id <> 0 AND b.invoice_time BETWEEN ? AND ?)`
|
|
|
amountCond += `OR (a.payment_id <> 0 AND a.invoice_id = 0 AND d.invoice_time BETWEEN ? AND ?))` // 根据发票/支付状态筛选时间范围
|
|
|
- amountPars = append(amountPars, prevSt, prevEd)
|
|
|
+ amountPars = append(amountPars, prevSt, prevEd, prevSt, prevEd)
|
|
|
}
|
|
|
results, e := fms.GetContractSummaryIncomeAmount(amountCond, amountPars) // 获取合同摘要收入金额数据
|
|
|
if e != nil {
|
zwxi