|
@@ -281,8 +281,8 @@ func RefreshAllAdjustEdb(edbInfo *EdbInfo, fromEdbInfo *EdbInfo) (err error) {
|
|
|
{
|
|
|
var tmpCondition string
|
|
|
var tmpPars []interface{}
|
|
|
- condition += " AND edb_info_id=? AND data_time > ? "
|
|
|
- pars = append(pars, fromEdbInfo.EdbInfoId, edbAdjustConf.SourceEndDate)
|
|
|
+ tmpCondition += " AND edb_info_id=? AND data_time > ? "
|
|
|
+ tmpPars = append(tmpPars, edbInfo.EdbInfoId, edbAdjustConf.SourceEndDate)
|
|
|
existDataList, tmpErr := GetEdbDataListAllByTo(to, tmpCondition, tmpPars, edbInfo.Source, 1)
|
|
|
if tmpErr != nil {
|
|
|
err = tmpErr
|
|
@@ -331,17 +331,17 @@ func RefreshAllAdjustEdb(edbInfo *EdbInfo, fromEdbInfo *EdbInfo) (err error) {
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
- // 变更数据调整配置表的实际结束日期
|
|
|
- {
|
|
|
- var fromEdbEndDate time.Time
|
|
|
- if fromEdbInfo.EndDate != `0000-00-00` {
|
|
|
- fromEdbEndDate, _ = time.Parse(utils.FormatDate, fromEdbInfo.EndDate)
|
|
|
+ // 变更数据调整配置表的实际结束日期
|
|
|
+ {
|
|
|
+ var fromEdbEndDate time.Time
|
|
|
+ if fromEdbInfo.EndDate != `0000-00-00` {
|
|
|
+ fromEdbEndDate, _ = time.Parse(utils.FormatDate, fromEdbInfo.EndDate)
|
|
|
+ }
|
|
|
+ edbAdjustConf.SourceEndDate = fromEdbEndDate
|
|
|
+ edbAdjustConf.ModifyTime = time.Now()
|
|
|
+ _, err = to.Update(edbAdjustConf, "SourceEndDate", "ModifyTime")
|
|
|
}
|
|
|
- edbAdjustConf.SourceEndDate = fromEdbEndDate
|
|
|
- edbAdjustConf.ModifyTime = time.Now()
|
|
|
- _, err = to.Update(edbAdjustConf, "SourceEndDate", "ModifyTime")
|
|
|
}
|
|
|
|
|
|
return
|