|
@@ -2637,7 +2637,20 @@ func (this *TradeCommonController) MtjhData() {
|
|
|
product.Frequency = v.Frequency
|
|
|
product.CreateTime = v.CreateTime
|
|
|
|
|
|
+ modifyTime, err := data_manage.GetMtjhIndexLatestDate(v.IndexCode)
|
|
|
+ if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
+ br.Msg = "获取更新时间失败"
|
|
|
+ br.ErrMsg = "获取更新时间失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ product.ModifyTime = modifyTime
|
|
|
+
|
|
|
total, err := data_manage.GetMtjhIndexDataCount(v.IndexCode)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取总数失败"
|
|
|
+ br.ErrMsg = "获取总数失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
page := paging.GetPaging(currentIndex, pageSize, total)
|
|
|
dataList, err := data_manage.GetMtjhIndexData(v.IndexCode, startSize, pageSize)
|
|
|
if err != nil {
|
|
@@ -2726,7 +2739,19 @@ func (this *TradeCommonController) MtjhSingleData() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
+ modifyTime, err := data_manage.GetMtjhIndexLatestDate(indexCode)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取更新时间失败"
|
|
|
+ br.ErrMsg = "获取更新时间失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
total, err := data_manage.GetMtjhIndexDataCount(indexCode)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取总数失败"
|
|
|
+ br.ErrMsg = "获取总数失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
page := paging.GetPaging(currentIndex, pageSize, total)
|
|
|
resp := data_manage.BaseFromMtjhIndexList{
|
|
|
BaseFromMtjhMappingId: mapping.BaseFromMtjhMappingId,
|
|
@@ -2737,6 +2762,7 @@ func (this *TradeCommonController) MtjhSingleData() {
|
|
|
Unit: mapping.Unit,
|
|
|
Frequency: mapping.Frequency,
|
|
|
CreateTime: mapping.CreateTime,
|
|
|
+ ModifyTime: modifyTime,
|
|
|
Variety: mapping.Variety,
|
|
|
DataList: items,
|
|
|
Paging: page,
|
|
@@ -2963,7 +2989,7 @@ func (this *TradeCommonController) ExportMtjhList() {
|
|
|
rowModifyCell := rowModifyDate.AddCell()
|
|
|
rowModifyCell.SetValue("更新时间")
|
|
|
rowModifyCell = rowModifyDate.AddCell()
|
|
|
- rowModifyCell.SetValue(dataList[len(dataList) - 1].ModifyTime)
|
|
|
+ rowModifyCell.SetValue(dataList[len(dataList)-1].ModifyTime)
|
|
|
|
|
|
fmt.Println("len(dataList):", len(dataList))
|
|
|
dataMax, err := data_manage.GetMtjhCount(indexCode)
|