Merge branch 'refs/heads/eta_2.0.8_ly_0804@guomengyuan' into debug

controllers/data_manage/base_from_ly_index_controller.go

@@ -107,7 +107,7 @@ func (this *BaseFromLyIndexController) LyIndexDataList() {
 	}
 
 	// 获取指标数据列表
-	indexId, err := this.GetInt("indexId")
+	indexId, err := this.GetInt("IndexId")
 	if err != nil {
 		br.Msg = "获取指标ID失败"
 		br.ErrMsg = "获取指标ID失败，Err:" + err.Error()
@@ -391,7 +391,7 @@ func (this *BaseFromLyIndexController) LyIndexDataExport() {
 	}
 
 	if classifyId >= 0 {
-		condition += ` AND classify_id=? `
+		condition += ` AND base_from_ly_classify_id=? `
 		pars = append(pars, classifyId)
 	}
 
@@ -418,7 +418,6 @@ func (this *BaseFromLyIndexController) LyIndexDataExport() {
 		}
 		condition = condition[:len(condition)-1]
 		condition += `) `
-		pars = append(pars, indexCodes)
 	}
 
 	indexList, err := data_manage.GetLyIndexList(condition, pars)

models/data_manage/base_from_ly_index.go

@@ -58,21 +58,24 @@ func GetLyIndexByClassifyIds(classifyIds []int) (items []*BaseFromLyIndex, err e
 }
 
 // GetLyIndexCount 获取指标总数
-func GetLyIndexCount(searchParam string) (count int, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT count(*) FROM base_from_ly_index WHERE 1=1`
+func GetLyIndexCount(classifyId string, searchParam string) (count int, err error) {
+	o := orm.NewOrm()
+	qs := o.QueryTable("base_from_ly_index")
 
-	var params []interface{}
+	// 精确匹配 classifyId
+	if classifyId != "" {
+		qs = qs.Filter("base_from_ly_classify_id", classifyId)
+	}
 
 	if searchParam != "" {
-		sql += ` AND (index_name LIKE ? OR index_code = ?)`
-		params = append(params, "%"+searchParam+"%", searchParam)
+		qs = qs.Filter("index_name__icontains", searchParam).
+			Filter("index_code", searchParam)
 	}
-
-	sql += ` ORDER BY base_from_ly_index_id DESC`
-
-	err = o.Raw(sql, params...).QueryRow(&count)
-	return
+	number, err := qs.Count()
+	if err != nil {
+		return 0, err
+	}
+	return int(number), nil
 }
 
 // GetLyIndexPage 获取指标列表

services/data/base_from_ly_index_service.go

@@ -12,7 +12,7 @@ import (
 
 // GetIndexPage 获取指标分页列表
 func GetIndexPage(classifyId string, searchParam string, currentIndex, pageSize int) (*data_manage.BaseFromLyIndexPage, error) {
-	count, err := data_manage.GetLyIndexCount(searchParam)
+	count, err := data_manage.GetLyIndexCount(classifyId, searchParam)
 	if err != nil {
 		return nil, err
 	}
@@ -53,6 +53,7 @@ func GetIndexDataPage(indexId, startSize, pageSize int) (*data_manage.BaseFromLy
 		return nil, err
 	}
 	lyDataPage.List = dataList
+	lyDataPage.Paging = page
 
 	return &lyDataPage, nil
 }