|
@@ -199,6 +199,7 @@ func RefreshAllCalculateNszydpjjs(edbInfoId, source, formulaInt int, fromEdbInfo
|
|
|
func refreshAllCalculateNszydpjjs(to orm.TxOrmer, edbInfoId, source, formulaInt int, fromEdbInfo *EdbInfo, edbCode, startDate string) (err error) {
|
|
|
edbInfoIdStr := strconv.Itoa(edbInfoId)
|
|
|
fmt.Println(edbInfoIdStr)
|
|
|
+ fmt.Println("refreshAllCalculateNszydpjjs startDate:", startDate)
|
|
|
//计算数据
|
|
|
var condition string
|
|
|
var pars []interface{}
|
|
@@ -221,8 +222,10 @@ func refreshAllCalculateNszydpjjs(to orm.TxOrmer, edbInfoId, source, formulaInt
|
|
|
var fromPars []interface{}
|
|
|
fromCondition += " AND edb_info_id=? "
|
|
|
fromPars = append(fromPars, fromEdbInfo.EdbInfoId)
|
|
|
- fromCondition += " AND data_time>=? "
|
|
|
- fromPars = append(fromPars, startDate)
|
|
|
+ if startDate != `` {
|
|
|
+ fromCondition += " AND data_time>=? "
|
|
|
+ fromPars = append(fromPars, startDate)
|
|
|
+ }
|
|
|
|
|
|
fmt.Println("fromPars:", fromPars)
|
|
|
fromDataList, err := GetEdbDataListAllV1ByTo(to, fromCondition, fromPars, fromEdbInfo.Source, 0)
|