fix:刷新指标逻辑，还是把时间限制加上

models/data_manage/edb_info_calculate_bp.go

@@ -26,7 +26,7 @@ type EdbInfoCalculateBp struct {
 }
 
 //变频
-func RefreshCalculateBp(edbInfoId int, fromEdbInfo *EdbInfo, edbCode string) (err error) {
+func RefreshCalculateBp(edbInfoId int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
 	o := orm.NewOrm()
 	o.Using("data")
 	o.Begin()
@@ -47,15 +47,15 @@ func RefreshCalculateBp(edbInfoId int, fromEdbInfo *EdbInfo, edbCode string) (er
 	var pars []interface{}
 	condition += " AND edb_info_id=? "
 	pars = append(pars, fromEdbInfo.EdbInfoId)
-	//if startDate != "" {
-	//	condition += " AND data_time>=? "
-	//	pars = append(pars, startDate)
-	//}
-	//
-	//if endDate != "" {
-	//	condition += " AND data_time<=? "
-	//	pars = append(pars, endDate)
-	//}
+	if startDate != "" {
+		condition += " AND data_time>=? "
+		pars = append(pars, startDate)
+	}
+
+	if endDate != "" {
+		condition += " AND data_time<=? "
+		pars = append(pars, endDate)
+	}
 	dataList, err := GetEdbDataListAll(condition, pars, fromEdbInfo.Source, 0)
 	if err != nil {
 		return err

models/data_manage/edb_info_calculate_hbz.go

@@ -38,7 +38,7 @@ func HbzDiv(current, pre float64) string {
 }
 
 //刷新环比值数据
-func RefreshCalculateHbz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode string, formulaInt int) (err error) {
+func RefreshCalculateHbz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string, formulaInt int) (err error) {
 	o := orm.NewOrm()
 	o.Using("data")
 	o.Begin()
@@ -60,14 +60,14 @@ func RefreshCalculateHbz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode st
 	condition += " AND edb_info_id=? "
 	pars = append(pars, fromEdbInfo.EdbInfoId)
 
-	//if startDate != "" {
-	//	condition += " AND data_time>=? "
-	//	pars = append(pars, startDate)
-	//}
-	//if endDate != "" {
-	//	condition += " AND data_time<=? "
-	//	pars = append(pars, endDate)
-	//}
+	if startDate != "" {
+		condition += " AND data_time>=? "
+		pars = append(pars, startDate)
+	}
+	if endDate != "" {
+		condition += " AND data_time<=? "
+		pars = append(pars, endDate)
+	}
 
 	dataList, err := GetEdbDataListAll(condition, pars, fromEdbInfo.Source, 0)
 	if err != nil {

models/data_manage/edb_info_calculate_hcz.go

@@ -38,7 +38,7 @@ func HczDiv(current, pre float64) string {
 }
 
 //刷新环比值数据
-func RefreshCalculateHcz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode string) (err error) {
+func RefreshCalculateHcz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
 	o := orm.NewOrm()
 	o.Using("data")
 	o.Begin()
@@ -60,14 +60,14 @@ func RefreshCalculateHcz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode st
 	condition += " AND edb_info_id=? "
 	pars = append(pars, fromEdbInfo.EdbInfoId)
 
-	//if startDate != "" {
-	//	condition += " AND data_time>=? "
-	//	pars = append(pars, startDate)
-	//}
-	//if endDate != "" {
-	//	condition += " AND data_time<=? "
-	//	pars = append(pars, endDate)
-	//}
+	if startDate != "" {
+		condition += " AND data_time>=? "
+		pars = append(pars, startDate)
+	}
+	if endDate != "" {
+		condition += " AND data_time<=? "
+		pars = append(pars, endDate)
+	}
 
 	dataList, err := GetEdbDataListAll(condition, pars, fromEdbInfo.Source, 0)
 	if err != nil {

models/data_manage/edb_info_calculate_ljzzy.go

@@ -26,7 +26,7 @@ type EdbInfoCalculateLjzzy struct {
 }
 
 //刷新累计值转月值数据
-func RefreshCalculateLjzzy(edbInfoId int, fromEdbInfo *EdbInfo, edbCode string) (err error) {
+func RefreshCalculateLjzzy(edbInfoId int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
 	o := orm.NewOrm()
 	o.Using("data")
 	o.Begin()
@@ -48,14 +48,14 @@ func RefreshCalculateLjzzy(edbInfoId int, fromEdbInfo *EdbInfo, edbCode string)
 	condition += " AND edb_info_id=? "
 	pars = append(pars, fromEdbInfo.EdbInfoId)
 
-	//if startDate != "" {
-	//	condition += " AND data_time>=? "
-	//	pars = append(pars, startDate)
-	//}
-	//if endDate != "" {
-	//	condition += " AND data_time<=? "
-	//	pars = append(pars, endDate)
-	//}
+	if startDate != "" {
+		condition += " AND data_time>=? "
+		pars = append(pars, startDate)
+	}
+	if endDate != "" {
+		condition += " AND data_time<=? "
+		pars = append(pars, endDate)
+	}
 
 	dataList, err := GetEdbDataListAll(condition, pars, fromEdbInfo.Source, 1)
 	if err != nil {

models/data_manage/edb_info_calculate_tbz.go

@@ -35,7 +35,7 @@ func TbzDiv(a, b float64) string {
 }
 
 //刷新同比值数据
-func RefreshCalculateTbz(edbInfoId int, fromEdbInfo *EdbInfo, edbCode string) (err error) {
+func RefreshCalculateTbz(edbInfoId int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
 	o := orm.NewOrm()
 	o.Using("data")
 	o.Begin()
@@ -59,14 +59,14 @@ func RefreshCalculateTbz(edbInfoId int, fromEdbInfo *EdbInfo, edbCode string) (e
 	condition += " AND edb_info_id=? "
 	pars = append(pars, fromEdbInfo.EdbInfoId)
 
-	//if startDate != "" {
-	//	condition += " AND data_time>=? "
-	//	pars = append(pars, startDate)
-	//}
-	//if endDate != "" {
-	//	condition += " AND data_time<=? "
-	//	pars = append(pars, endDate)
-	//}
+	if startDate != "" {
+		condition += " AND data_time>=? "
+		pars = append(pars, startDate)
+	}
+	if endDate != "" {
+		condition += " AND data_time<=? "
+		pars = append(pars, endDate)
+	}
 
 	dataList, err := GetEdbDataListAll(condition, pars, fromEdbInfo.Source, 0)
 	if err != nil {

models/data_manage/edb_info_calculate_tcz.go

@@ -35,7 +35,7 @@ func TczSub(a, b float64) string {
 }
 
 //刷新同差值数据
-func RefreshCalculateTcz(edbInfoId int, fromEdbInfo *EdbInfo, edbCode string) (err error) {
+func RefreshCalculateTcz(edbInfoId int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
 	o := orm.NewOrm()
 	o.Using("data")
 	o.Begin()
@@ -59,14 +59,14 @@ func RefreshCalculateTcz(edbInfoId int, fromEdbInfo *EdbInfo, edbCode string) (e
 	condition += " AND edb_info_id=? "
 	pars = append(pars, fromEdbInfo.EdbInfoId)
 
-	//if startDate != "" {
-	//	condition += " AND data_time>=? "
-	//	pars = append(pars, startDate)
-	//}
-	//if endDate != "" {
-	//	condition += " AND data_time<=? "
-	//	pars = append(pars, endDate)
-	//}
+	if startDate != "" {
+		condition += " AND data_time>=? "
+		pars = append(pars, startDate)
+	}
+	if endDate != "" {
+		condition += " AND data_time<=? "
+		pars = append(pars, endDate)
+	}
 
 	dataList, err := GetEdbDataListAll(condition, pars, fromEdbInfo.Source, 0)
 	if err != nil {

services/data/edb_info.go

@@ -301,10 +301,10 @@ func RefreshDataFromCalculateAll() (err error) {
 				}
 				return errors.New("GetEdbInfoById Err:" + err.Error())
 			}
-			//year := time.Now().Year() - 1
-			//startDate := strconv.Itoa(year) + "-01" + "-01"
-			//endDate := "" //time.Now().Format(utils.FormatDate)
-			err = data_manage.RefreshCalculateLjzzy(edbInfoId, fromEdbInfo, edbCode)
+			year := time.Now().Year() - 1
+			startDate := strconv.Itoa(year) + "-01" + "-01"
+			endDate := "" //time.Now().Format(utils.FormatDate)
+			err = data_manage.RefreshCalculateLjzzy(edbInfoId, fromEdbInfo, edbCode, startDate, endDate)
 			if err != nil {
 				return errors.New("RefreshCalculateLjzzy Err:" + err.Error())
 			}
@@ -320,9 +320,9 @@ func RefreshDataFromCalculateAll() (err error) {
 				}
 				return errors.New("GetEdbInfoById Err:" + err.Error())
 			}
-			//startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
-			//endDate := "" //time.Now().Format(utils.FormatDate)
-			err = data_manage.RefreshCalculateTbz(edbInfoId, fromEdbInfo, calculateTbz.EdbCode)
+			startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
+			endDate := "" //time.Now().Format(utils.FormatDate)
+			err = data_manage.RefreshCalculateTbz(edbInfoId, fromEdbInfo, calculateTbz.EdbCode, startDate, endDate)
 			if err != nil {
 				return errors.New("RefreshCalculateTbz Err:" + err.Error())
 			}
@@ -338,9 +338,9 @@ func RefreshDataFromCalculateAll() (err error) {
 				}
 				return errors.New("GetEdbInfoById Err:" + err.Error())
 			}
-			//startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
-			//endDate := "" //time.Now().Format(utils.FormatDate)
-			err = data_manage.RefreshCalculateTcz(edbInfoId, fromEdbInfo, calculateTcz.EdbCode)
+			startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
+			endDate := "" //time.Now().Format(utils.FormatDate)
+			err = data_manage.RefreshCalculateTcz(edbInfoId, fromEdbInfo, calculateTcz.EdbCode, startDate, endDate)
 			if err != nil {
 				return errors.New("RefreshCalculateTcz Err:" + err.Error())
 			}
@@ -373,10 +373,10 @@ func RefreshDataFromCalculateAll() (err error) {
 				}
 				return errors.New("GetEdbInfoById Err:" + err.Error())
 			}
-			//startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
-			//endDate := "" //time.Now().Format(utils.FormatDate)
+			startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
+			endDate := "" //time.Now().Format(utils.FormatDate)
 			formulaInt, _ := strconv.Atoi(v.CalculateFormula)
-			err = data_manage.RefreshCalculateHbz(edbInfoId, source, fromEdbInfo, calculateHbz.EdbCode, formulaInt)
+			err = data_manage.RefreshCalculateHbz(edbInfoId, source, fromEdbInfo, calculateHbz.EdbCode, startDate, endDate, formulaInt)
 			if err != nil {
 				return errors.New("RefreshCalculateTbz Err:" + err.Error())
 			}
@@ -392,9 +392,9 @@ func RefreshDataFromCalculateAll() (err error) {
 				}
 				return errors.New("GetEdbInfoById Err:" + err.Error())
 			}
-			//startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
-			//endDate := "" //time.Now().Format(utils.FormatDate)
-			err = data_manage.RefreshCalculateHcz(edbInfoId, source, fromEdbInfo, calculateHcz.EdbCode)
+			startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
+			endDate := "" //time.Now().Format(utils.FormatDate)
+			err = data_manage.RefreshCalculateHcz(edbInfoId, source, fromEdbInfo, calculateHcz.EdbCode, startDate, endDate)
 			if err != nil {
 				return errors.New("RefreshCalculateTbz Err:" + err.Error())
 			}
@@ -411,9 +411,9 @@ func RefreshDataFromCalculateAll() (err error) {
 					}
 					return errors.New("GetEdbInfoById Err:" + err.Error())
 				}
-				//startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
-				//endDate := "" //time.Now().Format(utils.FormatDate)
-				err = data_manage.RefreshCalculateBp(edbInfoId, fromEdbInfo, calculateBp.EdbCode)
+				startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
+				endDate := "" //time.Now().Format(utils.FormatDate)
+				err = data_manage.RefreshCalculateBp(edbInfoId, fromEdbInfo, calculateBp.EdbCode, startDate, endDate)
 				if err != nil {
 					return errors.New("RefreshCalculateTbz Err:" + err.Error())
 				}