perf: filter by condition

server/dao/contract.go

@@ -52,23 +52,30 @@ func (c *ContractDao) Delete(param *models.ContractDeleteParam) error {
 
 func (c *ContractDao) GetList(param *models.ContractQueryParam) ([]*models.ContractList, int64, error) {
 	contractList := make([]*models.ContractList, 0)
-	s := "contract.id, contract.name, contract.amount, contract.begin_time, contract.over_time, customer.name as cname, contract.remarks, contract.status, contract.created, contract.updated"
-	j := "inner join customer on contract.cid = customer.id and contract.creator = ?"
+	field := "contract.id, contract.name, contract.amount, contract.begin_time, contract.over_time, customer.name as cname, contract.remarks, contract.status, contract.created, contract.updated"
+	where := "inner join customer on contract.cid = customer.id and contract.creator = ?"
+	raw := "select count(*) from contract where creator = ?"
 
 	// 分页查询
 	offset := (param.Page.PageNum - 1) * param.Page.PageSize
-	mdb := global.Db.Offset(offset).Limit(param.Page.PageSize).Table(CONTRACT).Select(s)
-	var err error
-	if param.Id != 0 {
-		err = mdb.Joins(j+" and contract.id = ?", param.Creator, param.Id).Scan(&contractList).Error
-	} else {
-		err = mdb.Joins(j, param.Creator).Scan(&contractList).Error
-	}
-	if err != nil {
-		return nil, 0, err
-	}
+	db := global.Db.Offset(offset).Limit(param.Page.PageSize).Table(CONTRACT).Select(field)
+	
 	var rows int64
-	global.Db.Raw("select count(*) from contract where creator = ?", param.Creator).Scan(&rows)
+	if param.Id != NumberNull {
+		db.Joins(where+" and contract.id = ?", param.Creator, param.Id)
+		global.Db.Raw(raw + " and contract.id = ?", param.Creator, param.Creator).Scan(&rows)
+	} else {
+		if param.Status != NumberNull {
+			db.Joins(where+" and contract.status = ?", param.Creator, param.Status)
+			global.Db.Raw(raw + " and contract.status = ?", param.Creator, param.Status).Scan(&rows)
+		} else {
+			db.Joins(where, param.Creator)
+			global.Db.Raw(raw, param.Creator).Scan(&rows)
+		}
+	}
+	if err := db.Scan(&contractList).Error; err != nil {
+		return nil, NumberNull, nil
+	}
 	return contractList, rows, nil
 }
 

server/dao/customer.go

@@ -62,8 +62,12 @@ func (c *CustomerDao) IsExists(name string, uid int64) bool {
 
 func (c *CustomerDao) GetList(param *models.CustomerQueryParam) ([]*models.CustomerList, int64, error) {
 	customer := models.Customer{
-		Name:    param.Name,
-		Creator: param.Creator,
+		Name:     param.Name,
+		Source:   param.Source,
+		Industry: param.Industry,
+		Level:    param.Level,
+		Status:   param.Status,
+		Creator:  param.Creator,
 	}
 	customerList := make([]*models.CustomerList, 0)
 	rows, err := restPage(param.Page, CUSTOMER, customer, &customerList, &[]*models.CustomerList{})

server/models/contract.go

@@ -52,6 +52,7 @@ type ContractQueryParam struct {
 	Id      int64   `form:"id" binding:"omitempty,gt=0"`
 	Pids    []int64 `form:"pids" json:"pids" binding:"-"`
 	Name    string  `form:"name" binding:"-"`
+	Status  int     `form:"status" binding:"omitempty,oneof=1 2"`
 	Creator int64   `form:"creator,omitempty" binding:"-"`
 	Page    Page
 }

server/models/customer.go

@@ -58,11 +58,14 @@ type CustomerDeleteParam struct {
 }
 
 type CustomerQueryParam struct {
-	Id      int64  `form:"id" binding:"omitempty,gt=0"`
-	Name    string `form:"name" binding:"-"`
-	Phone   string `form:"phone" binding:"omitempty,len=11"`
-	Creator int64  `form:"creator,omitempty" binding:"-"`
-	Page    Page
+	Id       int64  `form:"id" binding:"omitempty,gt=0"`
+	Name     string `form:"name" binding:"omitempty,gt=0"`
+	Source   string `form:"source" binding:"omitempty,gt=0"`
+	Industry string `form:"industry" binding:"omitempty,gt=0"`
+	Level    string `form:"level" binding:"omitempty,gt=0"`
+	Status   int    `form:"status" binding:"omitempty,oneof=1 2"`
+	Creator  int64  `form:"creator,omitempty" binding:"-"`
+	Page     Page
 }
 
 type CustomerList struct {