zwxi 1 an în urmă
părinte
comite
f61fc9ce27
2 a modificat fișierele cu 5 adăugiri și 4 ștergeri
  1. 3 3
      controller/census/seller.go
  2. 2 1
      models/fms/invoice_payment_summary.go

+ 3 - 3
controller/census/seller.go

@@ -561,7 +561,7 @@ func (this *SellerController) InvoiceListV2(c *gin.Context) {
 			amountPars = append(amountPars, summaryIds)
 			if len(groupIds) > 0 {
 				amountCond += ` AND IF ( a.invoice_id = 0, d.seller_group_id, b.seller_group_id ) IN (?) `
-				amountPars = append(historyPars, groupIds)
+				amountPars = append(amountPars, groupIds)
 			}
 
 			//if req.SellerIds != "" {
@@ -646,7 +646,7 @@ func (this *SellerController) InvoiceListV2(c *gin.Context) {
 			amountPars = append(amountPars, summaryIds)
 			if len(groupIds) > 0 {
 				amountCond += ` AND IF ( a.invoice_id = 0, d.seller_group_id, b.seller_group_id ) IN (?) `
-				amountPars = append(historyPars, groupIds)
+				amountPars = append(amountPars, groupIds)
 			}
 			//if req.SellerIds != "" {
 			//	sellerIds := strings.Split(req.SellerIds, ",")
@@ -744,7 +744,7 @@ func (this *SellerController) InvoiceListV2(c *gin.Context) {
 			amountPars = append(amountPars, summaryIds)
 			if len(groupIds) > 0 {
 				amountCond += ` AND IF ( a.invoice_id = 0, d.seller_group_id, b.seller_group_id ) IN (?) `
-				amountPars = append(historyPars, groupIds)
+				amountPars = append(amountPars, groupIds)
 			}
 			//if req.SellerIds != "" {
 			//	sellerIds := strings.Split(req.SellerIds, ",")

+ 2 - 1
models/fms/invoice_payment_summary.go

@@ -206,7 +206,8 @@ type IncomeSummaryItem struct {
 func GetContractSummaryIncomeAmount(condition string, pars []interface{}) (results []*IncomeSummaryItem, err error) {
 	query := global.DEFAULT_MYSQL.Table("invoice_payment_summary AS a").
 		Select("IF(a.invoice_id=0,d.amount, b.amount) AS amount,IF(a.invoice_id=0,d.invoice_time, b.invoice_time) AS invoice_date,"+
-			" c.contract_type,c.company_name,IF(a.invoice_id=0,d.seller_name, b.seller_name) AS seller_name,"+
+			" c.contract_type,c.company_name," +
+			"IF(a.invoice_id=0,d.seller_name, b.seller_name) AS seller_name,"+
 			"IF(a.invoice_id=0,d.seller_id, b.seller_id) AS final_seller_id,"+
 			"IF(a.invoice_id=0,d.seller_group_id, b.seller_group_id) AS seller_group_id").
 		Joins("LEFT JOIN contract_invoice AS b ON a.invoice_id = b.contract_invoice_id AND b.is_deleted = 0 ").