|
|
@@ -1016,7 +1016,6 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
|
|
|
//校验日期，分段查询
|
|
|
if startDateTime.After(historyTime) || startDateTime.Equal(historyTime) {
|
|
|
//全部走新查询
|
|
|
- //fmt.Println("新查询")
|
|
|
cond += ` AND ((c.invoice_time BETWEEN ? AND ?) or (d.invoice_time BETWEEN ? AND ?))`
|
|
|
pars = append(pars, st, ed, st, ed)
|
|
|
summaryIds, e := fms.GetInvoicePaymentCensusSummaryDataIds(cond, pars)
|
|
|
@@ -1123,7 +1122,7 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
|
|
|
// 校验日期，分段查询
|
|
|
if prevStartDateTime.After(historyTime) || prevStartDateTime.Equal(historyTime) {
|
|
|
// 全部走新查询
|
|
|
- prevCond += ` AND ((b.invoice_time BETWEEN ? AND ?) or (d.invoice_time BETWEEN ? AND ?))` // 查询条件加入新的时间范围
|
|
|
+ prevCond += ` AND ((c.invoice_time BETWEEN ? AND ?) or (d.invoice_time BETWEEN ? AND ?))` // 查询条件加入新的时间范围
|
|
|
prevPars = append(prevPars, prevSt, prevEd, prevSt, prevEd) // 添加时间参数到参数列表
|
|
|
prevSummaryIds, e := fms.GetInvoicePaymentCensusSummaryDataIds(prevCond, prevPars) // 获取摘要ID列表
|
|
|
if e != nil {
|
zwxi