Browse Source

change gorm

Roc 3 weeks ago
parent
commit
e5ad5dd616

+ 6 - 0
models/data_manage/mysteel_chemical_index.go

@@ -550,6 +550,12 @@ type BaseRefreshEdbInfo struct {
 	RefreshTime     string `description:"刷新时间"`
 }
 
+func (m *BaseRefreshEdbInfo) AfterFind(db *gorm.DB) (err error) {
+	m.EndDate = utils.GormDateStrToDateStr(m.EndDate)
+
+	return
+}
+
 // RefreshBaseEdbInfoResp
 // @Description: 刷新数据源的数据返回
 type RefreshBaseEdbInfoResp struct {

+ 1 - 1
models/edb_monitor/edb_monitor.go

@@ -59,7 +59,7 @@ func (m *EdbMonitorInfo) Update(cols []string) (err error) {
 }
 
 func GetEdbMonitorLevelList() (list []string, err error) {
-	sql := `SELECT DISTINCT monitor_level FROM edb_monitor_info`
+	sql := `SELECT DISTINCT monitor_level FROM edb_monitor_info WHERE monitor_level != '' `
 	err = global.DbMap[utils.DbNameIndex].Raw(sql).Find(&list).Error
 
 	return

+ 1 - 1
utils/common.go

@@ -1825,7 +1825,7 @@ func GetDateByDateTypeV2(dateType int, tmpStartDate, tmpEndDate string, startYea
 
 func TimeTransferString(format string, t time.Time) string {
 	str := t.Format(format)
-	if t.IsZero() {
+	if t.IsZero() || t.UTC().IsZero() {
 		return ""
 	}
 	return str