|
@@ -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
|
|
|
}
|
|
|
|