Просмотр исходного кода

fix:隆众接口获取数据调整,group by获取数据源

Roc 2 лет назад
Родитель
Сommit
3eacf34a5a
1 измененных файлов с 3 добавлено и 4 удалено
  1. 3 4
      models/base_from_lz.go

+ 3 - 4
models/base_from_lz.go

@@ -24,7 +24,7 @@ func GetLzSurveyDataFromLz(condition string, pars []interface{}) (item []*lzSurv
 	if condition != "" {
 		sql += condition
 	}
-	sql += ` ORDER BY a.data_time DESC `
+	sql += ` GROUP BY data_time ORDER BY a.data_time DESC `
 	_, err = o.Raw(sql, pars).QueryRows(&item)
 	return
 }
@@ -100,7 +100,6 @@ func RefreshEdbDataFromLz(edbInfoId int, edbCode, startDate string) (err error)
 
 	lzDataList, err := GetLzSurveyDataFromLz(condition, pars)
 
-
 	var existCondition string
 	var existPars []interface{}
 
@@ -138,7 +137,7 @@ func RefreshEdbDataFromLz(edbInfoId int, edbCode, startDate string) (err error)
 			addSql += GetAddSql(edbInfoIdStr, edbCode, eDate, timeStr, saveValue)
 			isAdd = true
 		} else {
-			if findItem!=nil && utils.SubFloatToString(findItem.Value, 30) != saveValue {
+			if findItem != nil && utils.SubFloatToString(findItem.Value, 30) != saveValue {
 				err = ModifyEdbDataById(source, findItem.EdbDataId, saveValue)
 				if err != nil {
 					return err
@@ -154,4 +153,4 @@ func RefreshEdbDataFromLz(edbInfoId int, edbCode, startDate string) (err error)
 		}
 	}
 	return
-}
+}