Merge branch 'ETA_1.4.5'

controllers/data_manage/smm_api.go

@@ -7,6 +7,7 @@ import (
 	"eta/eta_api/utils"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"strconv"
 	"strings"
 )
 
@@ -104,13 +105,20 @@ func (this *EdbInfoController) SmmApiList() {
 		}
 	}
 
+	sortStr := ``
+
 	if keyword != "" {
 		keyWordArr := strings.Split(keyword, " ")
 		if len(keyWordArr) > 0 {
 			condition += " AND ( "
-			for _, v := range keyWordArr {
+			keywordStr := strings.Replace(keyword, " ", "", -1)
+			condition += ` CONCAT(index_name,index_code) LIKE '%` + keywordStr + `%' OR `
+			sortStr += ` CASE WHEN CONCAT(index_name,index_code) LIKE '%` + keywordStr + `%' THEN 1 `
+			for i, v := range keyWordArr {
 				condition += ` CONCAT(index_name,index_code) LIKE '%` + v + `%' OR`
+				sortStr += ` WHEN CONCAT(index_name,index_code) LIKE '%` + v + `%' THEN  ` + strconv.Itoa(i+2) + ` `
 			}
+			sortStr += ` END, `
 			condition = strings.TrimRight(condition, "OR")
 			condition += " ) "
 		}
@@ -126,11 +134,10 @@ func (this *EdbInfoController) SmmApiList() {
 		condition += " AND index_code IN (" + indexCodeStr + ") "
 	}
 
-	sortStr := ``
 	if sortParam != `` {
-		sortStr = fmt.Sprintf("%s %s,modify_time desc ", utils.PascalToSnake(sortParam), sortType)
+		sortStr += fmt.Sprintf("%s %s,modify_time desc ", utils.PascalToSnake(sortParam), sortType)
 	} else {
-		sortStr = " modify_time desc "
+		sortStr += " modify_time desc "
 	}
 
 	total, err := data_manage.GetSmmIndexDataListCount(condition, pars)