zwxi 1 rok pred
rodič
commit
f8ca8dd41a

+ 27 - 1
controllers/commodity_trade_base_index.go

@@ -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)

+ 8 - 0
models/data_manage/base_from_mtjh.go

@@ -137,6 +137,7 @@ type BaseFromMtjhIndexList struct {
 	Unit                  string `description:"单位"`
 	Frequency             string `description:"频率"`
 	CreateTime            string `description:"插入时间"`
+	ModifyTime            string `description:"修改时间"`
 	Variety               string `description:"品种"`
 	DataList              []*BaseFromMtjhIndexItem
 	Paging                *paging.PagingItem `description:"分页数据"`
@@ -225,4 +226,11 @@ func GetMtjhCount(indexCode string) (count int, err error) {
 		index_code =? `
 	err = o.Raw(sql, indexCode).QueryRow(&count)
 	return
+}
+
+func GetMtjhIndexLatestDate(indexCode string) (ModifyTime string, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := ` SELECT modify_time FROM base_from_mtjh_index WHERE index_code=? ORDER BY modify_time DESC limit 1 `
+	err = o.Raw(sql, indexCode).QueryRow(&ModifyTime)
+	return
 }