fix

controller/census/invoice_payment.go

@@ -1912,10 +1912,10 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 			contractIdSumMap := make(map[int]int)
 
 			for _, v := range registerList {
-				if v.InvoicedAmountCount >= v.PaymentAmountCount {
-					invoiceTotal += v.InvoicedAmountCount
-				} else if v.InvoicedAmountCount == 0 {
-					invoiceTotal += v.PaymentAmountCount
+				if v.InvoicedAmount >= v.PaymentAmount {
+					invoiceTotal += v.InvoicedAmount
+				} else if v.InvoicedAmount == 0 {
+					invoiceTotal += v.PaymentAmount
 				}
 				rate := v.RMBRate
 				if rate == 0.0 {

models/fms/invoice_payment_summary.go

@@ -355,7 +355,7 @@ func GetInvoiceCensusList(condition string, pars []interface{}) (results []*Invo
 		Joins("left JOIN invoice_payment_summary AS a 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...).Group("contract_register_id,service_product_id")
+		Where(condition, pars...).Group("contract_register_id")
 
 	nq := global.DEFAULT_MYSQL.Table("(?) AS e", query).
 		Select("*").Where(" e.invoiced_amount_count <>  e.contract_amount ")