change gorm

models/base_from_manual.go

@@ -117,10 +117,11 @@ func RefreshEdbDataFromManual(edbInfoId int, edbCode, startDate string) (err err
 	if startDate != "" {
 		condition += " AND DT>=? "
 		pars = append(pars, startDate)
-	} else {
-		condition += " AND DT != ? "
-		pars = append(pars, `0000-00-00`)
 	}
+	//else {
+	//	condition += " AND DT != ? "
+	//	pars = append(pars, `0000-00-00`)
+	//}
 
 	manualDataList, err := GetEdbdataManualByCondition(condition, pars)
 	if err != nil {
@@ -168,6 +169,9 @@ func RefreshEdbDataFromManual(edbInfoId int, edbCode, startDate string) (err err
 	manualMap := make(map[string]*ManualEdbdata)
 	//fmt.Println("manualDataList:", len(manualDataList))
 	for _, v := range manualDataList {
+		if v.Dt == `` || v.Dt == `0000-00-00` {
+			continue
+		}
 		item := v
 		eDate := item.Dt
 		sValue := item.Close

models/edb_info.go

@@ -545,6 +545,7 @@ type EdbInfoMaxAndMinInfo struct {
 func (m *EdbInfoMaxAndMinInfo) AfterFind(db *gorm.DB) (err error) {
 	m.MinDate = utils.GormDateStrToDateStr(m.MinDate)
 	m.MaxDate = utils.GormDateStrToDateStr(m.MaxDate)
+	m.LatestDate = utils.GormDateStrToDateStr(m.LatestDate)
 
 	return
 }