|
@@ -587,7 +587,7 @@ func (this *CalculateController) Refresh() {
|
|
startDate = sTime.Format(utils.FormatDate)
|
|
startDate = sTime.Format(utils.FormatDate)
|
|
|
|
|
|
var edbInfoIdBytes []string
|
|
var edbInfoIdBytes []string
|
|
- calculateMap, err := models.GetEdbInfoCalculateDetail(edbInfo.EdbInfoId)
|
|
|
|
|
|
+ calculateMap, err := models.GetEdbInfoCalculateDetailList(edbInfo.EdbInfoId)
|
|
if err != nil {
|
|
if err != nil {
|
|
errMsg = "GetEdbInfoCalculateDetail Err:" + err.Error()
|
|
errMsg = "GetEdbInfoCalculateDetail Err:" + err.Error()
|
|
break
|
|
break
|
|
@@ -607,7 +607,7 @@ func (this *CalculateController) Refresh() {
|
|
break
|
|
break
|
|
}
|
|
}
|
|
case utils.DATA_SOURCE_CALCULATE_LJZZY: //刷新累计值转月值
|
|
case utils.DATA_SOURCE_CALCULATE_LJZZY: //刷新累计值转月值
|
|
- calculateLjzzy, err := models.GetEdbInfoCalculateLjzzyDetail(edbInfoId)
|
|
|
|
|
|
+ calculateLjzzy, err := models.GetEdbInfoCalculateMappingDetail(edbInfoId)
|
|
if err != nil {
|
|
if err != nil {
|
|
errMsg = "GetEdbInfoCalculateLjzzyDetail Err:" + err.Error()
|
|
errMsg = "GetEdbInfoCalculateLjzzyDetail Err:" + err.Error()
|
|
break
|
|
break
|
|
@@ -625,7 +625,7 @@ func (this *CalculateController) Refresh() {
|
|
break
|
|
break
|
|
}
|
|
}
|
|
case utils.DATA_SOURCE_CALCULATE_TBZ: //刷新同比值
|
|
case utils.DATA_SOURCE_CALCULATE_TBZ: //刷新同比值
|
|
- calculateTbz, err := models.GetEdbInfoCalculateTbzDetail(edbInfoId)
|
|
|
|
|
|
+ calculateTbz, err := models.GetEdbInfoCalculateMappingDetail(edbInfoId)
|
|
if err != nil {
|
|
if err != nil {
|
|
errMsg = "GetEdbInfoCalculateTbzDetail Err:" + err.Error()
|
|
errMsg = "GetEdbInfoCalculateTbzDetail Err:" + err.Error()
|
|
break
|
|
break
|
|
@@ -643,7 +643,7 @@ func (this *CalculateController) Refresh() {
|
|
break
|
|
break
|
|
}
|
|
}
|
|
case utils.DATA_SOURCE_CALCULATE_TCZ: //同差值
|
|
case utils.DATA_SOURCE_CALCULATE_TCZ: //同差值
|
|
- calculateTcz, err := models.GetEdbInfoCalculateTczDetail(edbInfoId)
|
|
|
|
|
|
+ calculateTcz, err := models.GetEdbInfoCalculateMappingDetail(edbInfoId)
|
|
if err != nil {
|
|
if err != nil {
|
|
errMsg = "GetEdbInfoCalculateTczDetail Err:" + err.Error()
|
|
errMsg = "GetEdbInfoCalculateTczDetail Err:" + err.Error()
|
|
break
|
|
break
|
|
@@ -661,7 +661,7 @@ func (this *CalculateController) Refresh() {
|
|
break
|
|
break
|
|
}
|
|
}
|
|
case utils.DATA_SOURCE_CALCULATE_NSZYDPJJS: //N数值移动平均计算
|
|
case utils.DATA_SOURCE_CALCULATE_NSZYDPJJS: //N数值移动平均计算
|
|
- calculateNszydpjjs, err := models.GetEdbInfoCalculateNszydpjjsDetail(edbInfoId)
|
|
|
|
|
|
+ calculateNszydpjjs, err := models.GetEdbInfoCalculateMappingDetail(edbInfoId)
|
|
if err != nil {
|
|
if err != nil {
|
|
errMsg = "GetEdbInfoCalculateNszydpjjsDetail Err:" + err.Error()
|
|
errMsg = "GetEdbInfoCalculateNszydpjjsDetail Err:" + err.Error()
|
|
break
|
|
break
|
|
@@ -679,7 +679,7 @@ func (this *CalculateController) Refresh() {
|
|
break
|
|
break
|
|
}
|
|
}
|
|
case utils.DATA_SOURCE_CALCULATE_HBZ: //刷新环比值
|
|
case utils.DATA_SOURCE_CALCULATE_HBZ: //刷新环比值
|
|
- calculateTbz, err := models.GetEdbInfoCalculateHbzDetail(edbInfoId)
|
|
|
|
|
|
+ calculateTbz, err := models.GetEdbInfoCalculateMappingDetail(edbInfoId)
|
|
if err != nil {
|
|
if err != nil {
|
|
errMsg = "GetEdbInfoCalculateHbzDetail Err:" + err.Error()
|
|
errMsg = "GetEdbInfoCalculateHbzDetail Err:" + err.Error()
|
|
break
|
|
break
|
|
@@ -698,7 +698,7 @@ func (this *CalculateController) Refresh() {
|
|
break
|
|
break
|
|
}
|
|
}
|
|
case utils.DATA_SOURCE_CALCULATE_HCZ: //刷新环差值
|
|
case utils.DATA_SOURCE_CALCULATE_HCZ: //刷新环差值
|
|
- calculateTbz, err := models.GetEdbInfoCalculateHczDetail(edbInfoId)
|
|
|
|
|
|
+ calculateTbz, err := models.GetEdbInfoCalculateMappingDetail(edbInfoId)
|
|
if err != nil {
|
|
if err != nil {
|
|
errMsg = "GetEdbInfoCalculateHczDetail Err:" + err.Error()
|
|
errMsg = "GetEdbInfoCalculateHczDetail Err:" + err.Error()
|
|
break
|
|
break
|
|
@@ -717,7 +717,7 @@ func (this *CalculateController) Refresh() {
|
|
break
|
|
break
|
|
}
|
|
}
|
|
case utils.DATA_SOURCE_CALCULATE_BP: //刷新变频
|
|
case utils.DATA_SOURCE_CALCULATE_BP: //刷新变频
|
|
- calculateTbz, err := models.GetEdbInfoCalculateBpDetail(edbInfoId)
|
|
|
|
|
|
+ calculateTbz, err := models.GetEdbInfoCalculateMappingDetail(edbInfoId)
|
|
if err != nil {
|
|
if err != nil {
|
|
errMsg = "GetEdbInfoCalculateTbzDetail Err:" + err.Error()
|
|
errMsg = "GetEdbInfoCalculateTbzDetail Err:" + err.Error()
|
|
break
|
|
break
|