|
@@ -149,6 +149,7 @@ func RefreshDataFromPb(wg *sync.WaitGroup) (err error) {
|
|
|
var pars []interface{}
|
|
|
condition += " AND source=? "
|
|
|
pars = append(pars, utils.DATA_SOURCE_PB)
|
|
|
+
|
|
|
items, err := data_manage.GetEdbInfoByCondition(condition, pars)
|
|
|
if err != nil {
|
|
|
return errors.New("GetEdbInfoByCondition:" + err.Error())
|
|
@@ -164,19 +165,18 @@ func RefreshDataFromPb(wg *sync.WaitGroup) (err error) {
|
|
|
for _, v := range items {
|
|
|
startDate := ""
|
|
|
if v.Frequency == "日度" {
|
|
|
- startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
|
|
|
+ startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDateUnSpace)
|
|
|
} else if v.Frequency == "周度" {
|
|
|
- startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
|
|
|
+ startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDateUnSpace)
|
|
|
} else if v.Frequency == "月度" {
|
|
|
- startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
|
|
|
+ startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDateUnSpace)
|
|
|
} else if v.Frequency == "季度" {
|
|
|
- startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
|
|
|
+ startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDateUnSpace)
|
|
|
} else if v.Frequency == "年度" {
|
|
|
- startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
|
|
|
+ startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDateUnSpace)
|
|
|
} else {
|
|
|
- startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
|
|
|
+ startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDateUnSpace)
|
|
|
}
|
|
|
- fmt.Println(startDate, endDate)
|
|
|
err = SyncEdbDataByPb(int64(v.EdbInfoId), v.EdbCode, startDate, endDate)
|
|
|
if err != nil {
|
|
|
return errors.New("SyncEdbDataByPb:" + err.Error())
|
|
@@ -285,7 +285,7 @@ func RefreshDataFromCalculateAll() (err error) {
|
|
|
edbInfo, _ := data_manage.GetEdbInfoById(v.FromEdbInfoId)
|
|
|
edbInfoList = append(edbInfoList, edbInfo)
|
|
|
}
|
|
|
- fmt.Println("RefreshCalculate:",edbInfoList, edbInfoId, edbCode, v.CalculateFormula, startDate, endDate, edbInfoIdBytes)
|
|
|
+ fmt.Println("RefreshCalculate:", edbInfoList, edbInfoId, edbCode, v.CalculateFormula, startDate, endDate, edbInfoIdBytes)
|
|
|
err = RefreshCalculate(edbInfoList, edbInfoId, edbCode, v.CalculateFormula, startDate, endDate, edbInfoIdBytes)
|
|
|
if err != nil {
|
|
|
return errors.New("RefreshCalculate Err:" + err.Error())
|
|
@@ -417,7 +417,6 @@ func RefreshDataFromManual(wg *sync.WaitGroup) (err error) {
|
|
|
return err
|
|
|
}
|
|
|
|
|
|
-
|
|
|
//刷新隆众数据
|
|
|
func RefreshDataFromLz(wg *sync.WaitGroup) (err error) {
|
|
|
defer func() {
|
|
@@ -475,4 +474,4 @@ func RefreshDataFromLz(wg *sync.WaitGroup) (err error) {
|
|
|
}
|
|
|
wg.Done()
|
|
|
return err
|
|
|
-}
|
|
|
+}
|