|
@@ -40,21 +40,15 @@ func EdbInfoRefreshAllFromBaseBak(edbInfoIdList []int, refreshAll bool) (err err
|
|
|
//source := bv.Source
|
|
|
//edbInfoId := bv.EdbInfoId
|
|
|
//edbCode := bv.EdbCode
|
|
|
- if bv.StartDate == "0000-00-00" {
|
|
|
- continue
|
|
|
- }
|
|
|
+
|
|
|
//开始时间
|
|
|
- startDate = ``
|
|
|
- if refreshAll { //刷新所有数据,用开始时间作为起始日期去刷新
|
|
|
- sTime, tmpErr := time.Parse(utils.FormatDate, bv.StartDate)
|
|
|
- if tmpErr != nil {
|
|
|
- err = tmpErr
|
|
|
- errmsg = err.Error()
|
|
|
- return
|
|
|
+ startDate = utils.BaseEdbRefreshStartDate
|
|
|
+ if !refreshAll { //不是刷新所有数据,用结束时间减去对应期数作为起始日期去刷新
|
|
|
+ sDate := bv.EndDate
|
|
|
+ if sDate == `` || sDate == `0000-00-00` {
|
|
|
+ sDate = utils.BaseEdbRefreshStartDate
|
|
|
}
|
|
|
- startDate = sTime.Format(utils.FormatDate)
|
|
|
- } else {
|
|
|
- sTime, tmpErr := time.Parse(utils.FormatDate, bv.EndDate)
|
|
|
+ sTime, tmpErr := time.ParseInLocation(utils.FormatDate, sDate, time.Local)
|
|
|
if tmpErr != nil {
|
|
|
err = tmpErr
|
|
|
errmsg = err.Error()
|
|
@@ -647,17 +641,13 @@ func edbInfoRefreshAll(refreshAll bool, newBaseEdbInfoArr, newBasePredictEdbInfo
|
|
|
continue
|
|
|
}
|
|
|
//开始时间
|
|
|
- startDate = ``
|
|
|
- if refreshAll { //刷新所有数据,用开始时间作为起始日期去刷新
|
|
|
- sTime, tmpErr := time.Parse(utils.FormatDate, bv.StartDate)
|
|
|
- if tmpErr != nil {
|
|
|
- err = tmpErr
|
|
|
- errmsg = "时间格式转换失败1"
|
|
|
- return
|
|
|
+ startDate = utils.BaseEdbRefreshStartDate
|
|
|
+ if !refreshAll { // 非刷新所有数据,用结束时间减去对应期数作为起始日期去刷新
|
|
|
+ sDate := bv.EndDate
|
|
|
+ if sDate == `` || sDate == `0000-00-00` {
|
|
|
+ sDate = utils.BaseEdbRefreshStartDate
|
|
|
}
|
|
|
- startDate = sTime.Format(utils.FormatDate)
|
|
|
- } else {
|
|
|
- sTime, tmpErr := time.Parse(utils.FormatDate, bv.EndDate)
|
|
|
+ sTime, tmpErr := time.Parse(utils.FormatDate, sDate)
|
|
|
if tmpErr != nil {
|
|
|
err = tmpErr
|
|
|
errmsg = "时间格式转换失败2"
|