Merge branch 'new_2.6' into debug

controller/census/invoice_payment.go

@@ -1691,8 +1691,15 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 			}
 
 			noSummaryCond += ` AND b.is_deleted = 0 AND b.contract_status <> 4 `
-			noSummaryCond += ` AND b.contract_register_id IN ? AND b.contract_register_id NOT IN ?`
-			noSummaryPars = append(noSummaryPars, queryRegisterIds, notQueryRegisterIds)
+			if len(notQueryRegisterIds) >0 {
+				noSummaryCond += ` AND b.contract_register_id IN ? AND b.contract_register_id NOT IN ?`
+				noSummaryPars = append(noSummaryPars, queryRegisterIds, notQueryRegisterIds)
+			} else {
+				noSummaryCond += ` AND b.contract_register_id IN ? `
+				noSummaryPars = append(noSummaryPars, queryRegisterIds)
+			}
+
+
 			noSummaryData, e := fms.GetNoInvoicePaymentCensusData(noSummaryCond, noSummaryPars)
 			if e != nil {
 				resp.FailMsg("获取失败", "GetNoInvoicePaymentCensusData, Err: "+e.Error(), c)
@@ -1770,7 +1777,6 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 
 						NotInvoiceSummaryMap[v.ContractRegisterId] = append(NotInvoiceSummaryMap[v.ContractRegisterId], &item2)
 					}
-
 				} else if v.ProductIds == "1" && len(NotInvoiceSummaryMap[v.ContractRegisterId]) == 0 {
 					if serviceAmount, ok := serviceAmountMap[v.ContractRegisterId]; ok {
 						item1 := fms.NotInvoicePaymentSummaryItem{
@@ -1906,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 {
@@ -2112,6 +2118,7 @@ func (ct *InvoicePaymentController) NotPaymentList(c *gin.Context) {
 		page.SetCurrent(1)
 	}
 
+	cond += `  AND b.payment_amount <> b.invoiced_amount AND b.is_deleted = 0  AND b.contract_status <> 4 `
 	registerList, total, e := fms.GetNoPaymentCensusPageList(page, cond, pars)
 	if e != nil {
 		resp.FailMsg("获取失败", "获取商品到款统计列表总数失败, Err: "+e.Error(), c)

models/fms/invoice_payment_summary.go

@@ -148,7 +148,7 @@ func GetSummaryListCurrencySum(condition string, pars []interface{}, amountType
 		joinCond = `a.payment_id = b.contract_invoice_id`
 	}
 	query := global.DEFAULT_MYSQL.Table("invoice_payment_summary AS a").
-		Select("b.currency_unit, b.invoice_type, SUM(b.amount) AS amount_total, SUM(b.origin_amount) AS origin_amount_total").
+		Select("b.currency_unit, b.invoice_type, IFNULL(SUM(b.amount),0) AS amount_total, IFNULL(SUM(b.origin_amount),0) AS origin_amount_total").
 		Joins(fmt.Sprintf("JOIN contract_invoice AS b ON %s AND b.is_deleted = 0", joinCond)).
 		Where(condition, pars...).
 		Group("b.currency_unit")
@@ -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 ")