fix: 组别筛选

controller/census/invoice_payment.go

@@ -456,7 +456,7 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 		pars = append(pars, kw, kw)
 	}
 	if req.SellGroupId > 0 {
-		cond += ` AND a.seller_group_id = ?`
+		cond += ` AND c.seller_group_id = ?`
 		pars = append(pars, req.SellGroupId)
 	}
 	// 套餐筛选
@@ -485,13 +485,17 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 		}
 		pars = append(pars, req.TimeType, st, ed)
 	}
-	// 已开票
-	if req.HasInvoice == 1 {
-		cond += ` AND a.invoice_id > 0`
+	// 已开票未到款
+	if req.HasInvoice == 1 && req.HasPayment == 0 {
+		cond += ` AND a.invoice_id > 0 AND a.payment_id = 0 `
 	}
-	// 已到款
-	if req.HasPayment == 1 {
-		cond += ` AND a.payment_id > 0`
+	// 已到款未开票
+	if req.HasPayment == 1 && req.HasInvoice == 0 {
+		cond += ` AND a.payment_id > 0 AND a.invoice_id = 0 `
+	}
+	// 已开票且已到款
+	if req.HasInvoice == 1 && req.HasPayment == 1 {
+		cond += ` AND a.invoice_id > 0 AND a.payment_id > 0 `
 	}
 
 	page := new(base.Page)

models/fms/invoice_payment_summary.go

@@ -67,16 +67,6 @@ func GetInvoicePaymentCensusPageList(page base.IPage, condition string, pars []i
 		Where(condition, pars...).
 		Group("a.register_id")
 	queryCount.Find(&registerIds)
-
-	//summaryQuery := global.DEFAULT_MYSQL.Table("invoice_payment_summary AS a").
-	//	Select("a.id").
-	//	Joins("JOIN contract_register AS b ON a.register_id = b.contract_register_id AND b.is_deleted = 0").
-	//	Joins("LEFT JOIN contract_invoice AS c ON a.invoice_id = c.contract_invoice_id AND c.is_deleted = 0").
-	//	Joins("LEFT JOIN contract_invoice AS d ON a.payment_id = d.contract_invoice_id AND d.is_deleted = 0").
-	//	Where(condition, pars...)
-	//summaryQuery.Find(&summaryIds)
-	//err = summaryQuery.Limit(int(page.GetPageSize())).Offset(int(page.Offset())).Find(&summaryPageIds).Error
-	//Group("a.register_id")
 	return
 }