|
@@ -24,7 +24,7 @@ func GetLzSurveyDataFromLz(condition string, pars []interface{}) (item []*lzSurv
|
|
if condition != "" {
|
|
if condition != "" {
|
|
sql += 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)
|
|
_, err = o.Raw(sql, pars).QueryRows(&item)
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -100,7 +100,6 @@ func RefreshEdbDataFromLz(edbInfoId int, edbCode, startDate string) (err error)
|
|
|
|
|
|
lzDataList, err := GetLzSurveyDataFromLz(condition, pars)
|
|
lzDataList, err := GetLzSurveyDataFromLz(condition, pars)
|
|
|
|
|
|
-
|
|
|
|
var existCondition string
|
|
var existCondition string
|
|
var existPars []interface{}
|
|
var existPars []interface{}
|
|
|
|
|
|
@@ -138,7 +137,7 @@ func RefreshEdbDataFromLz(edbInfoId int, edbCode, startDate string) (err error)
|
|
addSql += GetAddSql(edbInfoIdStr, edbCode, eDate, timeStr, saveValue)
|
|
addSql += GetAddSql(edbInfoIdStr, edbCode, eDate, timeStr, saveValue)
|
|
isAdd = true
|
|
isAdd = true
|
|
} else {
|
|
} 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)
|
|
err = ModifyEdbDataById(source, findItem.EdbDataId, saveValue)
|
|
if err != nil {
|
|
if err != nil {
|
|
return err
|
|
return err
|
|
@@ -154,4 +153,4 @@ func RefreshEdbDataFromLz(edbInfoId int, edbCode, startDate string) (err error)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return
|
|
return
|
|
-}
|
|
|
|
|
|
+}
|