fix: 商品到款分页金额合计

controller/census/invoice_payment.go

@@ -99,11 +99,12 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 		page.SetCurrent(1)
 	}
 
-	total, list, e := fms.GetInvoicePaymentCensusPageList(page, cond, pars)
+	list, allRegisterIds, e := fms.GetInvoicePaymentCensusPageList(page, cond, pars)
 	if e != nil {
 		resp.FailMsg("获取失败", "获取商品到款统计列表失败, Err: "+e.Error(), c)
 		return
 	}
+	total := int64(len(allRegisterIds))
 	registerIds := make([]int, 0)
 	for i := range list {
 		registerIds = append(registerIds, list[i].ContractRegisterId)
@@ -201,8 +202,8 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 		// 开票到款金额合计(换算后)
 		amountTotalCond := `contract_register_id IN ?`
 		amountTotalPars := make([]interface{}, 0)
-		amountTotalPars = append(amountTotalPars, registerIds)
-		amountTotalList, e := fms.GetContractInvoiceAmountTotal(amountTotalCond, amountTotalPars)
+		amountTotalPars = append(amountTotalPars, allRegisterIds)
+		amountTotalList, e := fms.GetContractInvoiceAmountTotal(cond, pars)
 		if e != nil {
 			resp.FailMsg("获取失败", "获取开票到款金额合计失败, Err:"+e.Error(), c)
 			return

models/fms/contract_invoice.go

@@ -269,14 +269,13 @@ type InvoicePaymentCensusListReq struct {
 }
 
 // GetInvoicePaymentCensusPageList 获取商品到款统计列表-分页
-func GetInvoicePaymentCensusPageList(page base.IPage, condition string, pars []interface{}) (count int64, results []*ContractRegister, err error) {
+func GetInvoicePaymentCensusPageList(page base.IPage, condition string, pars []interface{}) (results []*ContractRegister, registerIds []int, err error) {
 	query := global.DEFAULT_MYSQL.Table("contract_invoice AS a").
 		Select("b.*").
 		Joins("JOIN contract_register AS b ON a.contract_register_id = b.contract_register_id").
 		Where("a.is_deleted = 0 AND b.is_deleted = 0").
 		Where(condition, pars...).
 		Group("b.contract_register_id")
-	//query.Count(&count)
 	if len(page.GetOrderItemsString()) > 0 {
 		query = query.Order(page.GetOrderItemsString())
 	}
@@ -291,7 +290,7 @@ func GetInvoicePaymentCensusPageList(page base.IPage, condition string, pars []i
 		Where("a.is_deleted = 0 AND b.is_deleted = 0").
 		Where(condition, pars...).
 		Group("b.contract_register_id")
-	queryCount.Count(&count)
+	queryCount.Find(&registerIds)
 	return
 }