ziwen vor 2 Jahren
Ursprung
Commit
d9687131ff
2 geänderte Dateien mit 9 neuen und 1 gelöschten Zeilen
  1. 8 1
      controller/census/invoice_payment.go
  2. 1 0
      models/fms/contract_invoice.go

+ 8 - 1
controller/census/invoice_payment.go

@@ -508,7 +508,7 @@ func ExportInvoicePaymentCensusList(c *gin.Context, results *fms.InvoicePaymentC
 // @Param   HasInvoice		query	string		false	"是否已开票: 0-否; 1-是; 空-全部"
 // @Param   HasPayment		query	string		false	"是否已到款: 0-否; 1-是; 空-全部"
 // @Param   IsExport		query	int		false	"是否导出: 0-否; 1-是"
-// @Param   ListParam		query	int		false	"是否导出: 0-全部; 1-ficc; 2-权益"
+// @Param   ListParam		query	int		false	"套餐类型: 0-全部; 1-ficc; 2-权益"
 // @Param   SortParam       query   string  false      "排序字段参数,用来排序的字段, 枚举值:'invoice_time':开票日 、 'payment_date':到款日"
 // @Param   SortType        query   string  true       "如何排序,是正序还是倒序,枚举值:`asc 正序`,`desc 倒叙`"
 // @Success 200 {object} fms.ContractRegisterItem
@@ -553,6 +553,13 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 			cond += ` AND 1 = 2`
 		}
 	}
+
+	if req.ListParam == 1{
+		cond += ` AND a.service_product_id = 1 `
+	}else if req.ListParam == 2 {
+		cond += ` AND a.service_product_id = 2 `
+	}
+
 	// 开票到款日期
 	if req.TimeType != 0 {
 		if req.TimeType == 1 &&  req.StartDate != "" && req.EndDate != "" {

+ 1 - 0
models/fms/contract_invoice.go

@@ -289,6 +289,7 @@ type InvoicePaymentCensusListReq struct {
 	HasInvoice   string `json:"has_invoice" form:"has_invoice" description:"是否已开票: 0-否; 1-是; 空-全部"`
 	HasPayment   string `json:"has_payment" form:"has_payment" description:"是否已到款: 0-否; 1-是; 空-全部"`
 	IsExport     int    `json:"is_export" form:"is_export" description:"是否导出: 0-否; 1-是"`
+	ListParam     int    `json:"list_param" form:"list_param" description:"套餐类型: 0-全部; 1-ficc; 2-权益"`
 	SortParam    string `json:"sort_param" form:"sort_param" description:"排序字段参数,用来排序的字段, 枚举值:'invoice_time':开票日 、 'payment_date':到款日"`
 	SortType     string `json:"sort_type" form:"sort_type" description:"如何排序,是正序还是倒序,枚举值:asc 正序,desc 倒叙"`
 	TimeType     int    `json:"time_type" form:"time_type" description:"时间类型: 1-开票时间; 2-到款时间;3-开票时间&到款时间"`