到款统计新增时间类型

controller/census/invoice_payment.go

@@ -476,13 +476,31 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 		}
 	}
 	// 开票到款日期
-	if req.StartDate != "" && req.EndDate != "" {
+	if req.TimeType != 0 {
+		if req.TimeType == 1 &&  req.StartDate != "" && req.EndDate != "" {
+			st := fmt.Sprint(req.StartDate, " 00:00:00")
+			ed := fmt.Sprint(req.EndDate, " 23:59:59")
+			cond += ` AND (c.invoice_time BETWEEN ? AND ?) `
+			pars = append(pars, st, ed, st, ed)
+		}else if req.TimeType == 2 &&  req.StartDate != "" && req.EndDate != "" {
+			st := fmt.Sprint(req.StartDate, " 00:00:00")
+			ed := fmt.Sprint(req.EndDate, " 23:59:59")
+			cond += ` AND (d.invoice_time BETWEEN ? AND ?) `
+			pars = append(pars, st, ed, st, ed)
+		}else if req.TimeType == 3 &&  req.StartDate != "" && req.EndDate != "" {
+			st := fmt.Sprint(req.StartDate, " 00:00:00")
+			ed := fmt.Sprint(req.EndDate, " 23:59:59")
+			cond += ` AND (c.invoice_time BETWEEN ? AND ?) AND (d.invoice_time BETWEEN ? AND ?) `
+			pars = append(pars, st, ed, st, ed)
+		}
+	}else if req.StartDate != "" && req.EndDate != "" {
 		st := fmt.Sprint(req.StartDate, " 00:00:00")
 		ed := fmt.Sprint(req.EndDate, " 23:59:59")
 		cond += ` AND ((c.invoice_time BETWEEN ? AND ?) or (d.invoice_time BETWEEN ? AND ?))`
 		pars = append(pars, st, ed, st, ed)
 	}
 
+
 	if req.HasInvoice == "1" {
 		cond += ` AND a.invoice_id > 0 `
 	}else if req.HasInvoice == "0" {

models/fms/contract_invoice.go

@@ -271,6 +271,7 @@ type InvoicePaymentCensusListReq struct {
 	IsExport    int    `json:"is_export" form:"is_export" description:"是否导出: 0-否; 1-是"`
 	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-开票时间&到款时间"`
 	base.PageReq
 }
 
@@ -311,7 +312,7 @@ type InvoicePaymentCensusResp struct {
 
 // InvoicePaymentCensusItem 商品到款统计信息
 type InvoicePaymentCensusItem struct {
-	SummaryId       int       `json:"summary_id" description:"汇总ID"`
+	SummaryId          int                         `json:"summary_id" description:"汇总ID"`
 	ContractRegisterId int                         `json:"contract_register_id" description:"登记ID"`
 	CompanyName        string                      `json:"company_name" description:"客户名称"`
 	NewCompany         int                         `json:"new_company" description:"是否为新客户: 0-否; 1-是"`