Merge branch 'dm' of http://8.136.199.33:3000/eta_server/eta_api into dm

models/data_manage/base_from_hisugar.go

@@ -305,6 +305,14 @@ func GetHisugarDataDataTimeByIndexId(indexIdList []int) (items []string, err err
 	//sql := ` SELECT DISTINCT data_time FROM base_from_hisugar_data WHERE base_from_hisugar_index_id IN (` + utils.GetOrmInReplace(len(indexIdList)) + `) ORDER BY data_time DESC`
 	sql := ` SELECT DISTINCT data_time FROM base_from_hisugar_data WHERE base_from_hisugar_index_id IN ? ORDER BY data_time DESC`
 	err = o.Raw(sql, indexIdList).Find(&items).Error
+	if err != nil {
+		return
+	}
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		for i, v := range items {
+			items[i] = utils.GormDateStrToDateStr(v)
+		}
+	}
 	return
 }
 

utils/sql.go

@@ -51,3 +51,16 @@ func getDriverInstance(driver string) (dbDriver Driver, err error) {
 	}
 	return
 }
+
+func NeedDateOrTimeFormat(driver string) bool {
+	var dbDriver Driver
+	if driver == "" {
+		dbDriver = supportDriverMap[DbDriverName]
+	} else {
+		dbDriver, _ = getDriverInstance(driver)
+	}
+	if dbDriver == DM {
+		return true
+	}
+	return false
+}