kobe6258 преди 3 седмици
родител
ревизия
f31155c9a8
променени са 3 файла, в които са добавени 13 реда и са изтрити 7 реда
  1. 3 3
      controllers/hisugar_data.go
  2. 4 3
      models/data_manage/base_from_rzd_index.go
  3. 6 1
      models/data_source/longzhong.go

+ 3 - 3
controllers/hisugar_data.go

@@ -693,9 +693,9 @@ func (this *TradeCommonController) HisugarExporthisugarList() {
 			return
 		}
 		if classifyIds != "" {
-			//condition += ` AND classify_id IN (` + classifyIds + `)`
-			condition += ` AND classify_id IN (?)`
-			pars = append(pars, classifyIds)
+			condition += ` AND classify_id IN (` + classifyIds + `)`
+			//condition += ` AND classify_id IN (?)`
+			//pars = append(pars, classifyIds)
 		}
 	}
 	frequencies, err := data_manage.GetHisugarFrequencyByCondition(condition, pars)

+ 4 - 3
models/data_manage/base_from_rzd_index.go

@@ -180,9 +180,10 @@ func GetRzdIndexByCodeAndClassify(indexCode string, classifyIdList []int, freque
 
 	if len(classifyIdList) > 0 {
 		sql += ` AND a.base_from_rzd_classify_id in (` + utils.GetOrmInReplace(len(classifyIdList)) + `)`
-		for _, id := range classifyIdList {
-			params = append(params, id)
-		}
+		//for _, id := range classifyIdList {
+		//	params = append(params, id)
+		//}
+		params = append(params, classifyIdList)
 	}
 
 	// 如果 indexCode 不为空,增加过滤条件

+ 6 - 1
models/data_source/longzhong.go

@@ -1,6 +1,7 @@
 package data_source
 
 import (
+	sql2 "database/sql"
 	"eta/eta_api/global"
 	"eta/eta_api/models/data_manage"
 	"eta/eta_api/utils"
@@ -70,13 +71,17 @@ func GetLongzhongSurveyDataMaxCount(classifyName string) (count int, err error)
 
 func GetLongzhongSurveyDataMaxCountByFrequency(classifyName string, frequency int) (count int, err error) {
 	o := global.DbMap[utils.DbNameManualIndex]
+	var sqlCount sql2.NullInt64
 	sql := `SELECT MAX(t.num) AS count FROM (
 				SELECT COUNT(1) AS num  FROM longzhong_survey_product AS a
 				INNER JOIN longzhong_survey_data AS b ON a.survey_product_id=b.survey_product_id
 				WHERE a.breed_name=? AND a.frequency=?
 				GROUP BY a.survey_product_id
 			)AS t `
-	err = o.Raw(sql, classifyName, frequency).Scan(&count).Error
+	err = o.Raw(sql, classifyName, frequency).Scan(&sqlCount).Error
+	if sqlCount.Valid {
+		count = int(sqlCount.Int64)
+	}
 	return
 }