|
@@ -2713,7 +2713,6 @@ func (this *TradeCommonController) MtjhSingleData() {
|
|
|
}
|
|
|
startSize = utils.StartIndex(currentIndex, pageSize)
|
|
|
|
|
|
-
|
|
|
mapping, err := data_manage.GetMtjhMappingItemByCode(indexCode)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取煤炭数据失败"
|
|
@@ -2726,6 +2725,9 @@ func (this *TradeCommonController) MtjhSingleData() {
|
|
|
br.ErrMsg = "获取煤炭度数据失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
+
|
|
|
+ total, err := data_manage.GetMtjhIndexDataCount(indexCode)
|
|
|
+ page := paging.GetPaging(currentIndex, pageSize, total)
|
|
|
resp := data_manage.BaseFromMtjhIndexList{
|
|
|
BaseFromMtjhMappingId: mapping.BaseFromMtjhMappingId,
|
|
|
IndexName: mapping.IndexName,
|
|
@@ -2737,9 +2739,9 @@ func (this *TradeCommonController) MtjhSingleData() {
|
|
|
CreateTime: mapping.CreateTime,
|
|
|
Variety: mapping.Variety,
|
|
|
DataList: items,
|
|
|
+ Paging: page,
|
|
|
}
|
|
|
|
|
|
-
|
|
|
br.Ret = 200
|
|
|
br.Success = true
|
|
|
br.Msg = "获取成功"
|
|
@@ -2769,7 +2771,6 @@ func (this *TradeCommonController) MtjhFrequency() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-
|
|
|
br.Ret = 200
|
|
|
br.Success = true
|
|
|
br.Msg = "获取成功"
|
|
@@ -3040,4 +3041,4 @@ func (this *TradeCommonController) MtjhFrequency() {
|
|
|
// br.Success = true
|
|
|
// br.Msg = "success"
|
|
|
//
|
|
|
-//}
|
|
|
+//}
|