Roc 2 жил өмнө
parent
commit
8d47ddb1af

+ 9 - 8
models/edb_data_calculate_hcz.go

@@ -210,10 +210,11 @@ func refreshAllCalculateHcz(to orm.TxOrmer, edbInfoId, source int, fromEdbInfo *
 	condition += " AND edb_info_id=? "
 	pars = append(pars, fromEdbInfo.EdbInfoId)
 
-	//if startDate != "" {
-	//	condition += " AND data_time>=? "
-	//	pars = append(pars, startDate)
-	//}
+	if startDate != "" {
+		condition += " AND data_time>=? "
+		pars = append(pars, startDate)
+	}
+
 	//if endDate != "" {
 	//	condition += " AND data_time<=? "
 	//	pars = append(pars, endDate)
@@ -237,10 +238,10 @@ func refreshAllCalculateHcz(to orm.TxOrmer, edbInfoId, source int, fromEdbInfo *
 
 	var existPars []interface{}
 	sql := `SELECT * FROM %s WHERE edb_info_id=? `
-	//if startDate != "" {
-	//	sql += " AND data_time>=? "
-	//	existPars = append(existPars, startDate)
-	//}
+	if startDate != "" {
+		sql += " AND data_time>=? "
+		existPars = append(existPars, startDate)
+	}
 	sql = fmt.Sprintf(sql, dataTableName)
 	_, err = to.Raw(sql, edbInfoId, existPars).QueryRows(&existDataList)
 	if err != nil {