修改按时间查询

controller/census/invoice_payment.go

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

models/fms/contract_invoice.go

@@ -261,7 +261,6 @@ type InvoicePaymentCensusListReq struct {
 	ServiceType int    `json:"service_type" form:"service_type" description:"套餐类型"`
 	StartDate   string `json:"start_date" form:"start_date" binding:"omitempty,datetime=2006-01-02" description:"开始日期"`
 	EndDate     string `json:"end_date" form:"end_date" binding:"omitempty,datetime=2006-01-02" description:"结束日期"`
-	TimeType    int    `json:"time_type" form:"time_type" description:"时间类型: 1-开票时间; 2-到款时间"`
 	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-是"`