|
@@ -794,10 +794,11 @@ func (rg *RegisterController) Export(c *gin.Context) {
|
|
|
|
|
|
|
|
cond := `1 = 1`
|
|
cond := `1 = 1`
|
|
|
pars := make([]interface{}, 0)
|
|
pars := make([]interface{}, 0)
|
|
|
|
|
+ // 合同编号/客户姓名/销售/代付方
|
|
|
if req.Keyword != "" {
|
|
if req.Keyword != "" {
|
|
|
kw := "%" + req.Keyword + "%"
|
|
kw := "%" + req.Keyword + "%"
|
|
|
- cond += ` AND (company_name LIKE ? OR contract_code LIKE ? OR seller_name LIKE ?)`
|
|
|
|
|
- pars = append(pars, kw, kw, kw)
|
|
|
|
|
|
|
+ cond += ` AND (company_name LIKE ? OR contract_code LIKE ? OR seller_name LIKE ? OR pay_company_name LIKE ?)`
|
|
|
|
|
+ pars = append(pars, kw, kw, kw, kw)
|
|
|
}
|
|
}
|
|
|
if req.StartDate != "" && req.EndDate != "" {
|
|
if req.StartDate != "" && req.EndDate != "" {
|
|
|
st := fmt.Sprint(req.StartDate, " 00:00:00")
|
|
st := fmt.Sprint(req.StartDate, " 00:00:00")
|
