Merge branch 'eta_bug_7034_fenwei_1224@guomengyuan' into debug

# Conflicts:
#	controllers/report_chapter.go
#	models/data_manage/edb_info.go
#	routers/router.go
#	services/data/chart_classify.go
#	static/ErrMsgConfig.json
#	utils/common.go
#	utils/constants.go

controllers/data_manage/fenwei_data.go

@@ -182,7 +182,15 @@ func (this *EdbInfoController) FenweiIndexData() {
 		product.IndexName = v.IndexName
 		product.Frequency = v.Frequency
 		product.CreateTime = v.CreateTime
-		product.ModifyTime = v.ModifyTime
+
+		// 获取指标数据最新更新时间
+		modifyTime, err := data_manage.GetFenWeiDataLastModifyTime(v.IndexCode)
+		if err != nil {
+			br.Msg = "获取数据失败"
+			br.ErrMsg = "获取指标数据最新更新时间失败, Err:" + err.Error()
+			return
+		}
+		product.ModifyTime = modifyTime
 
 		edbInfo := edbCodeMap[v.IndexCode]
 		if edbInfo != nil {

models/data_manage/base_from_fenwei.go

@@ -283,3 +283,11 @@ func GetFenWeiIndexInfoCount(condition string, pars []interface{}) (count int, e
 	err = o.Raw(sql, pars).QueryRow(&count)
 	return
 }
+
+// GetFenWeiDataLastModifyTime 获取指标数据最新更新时间
+func GetFenWeiDataLastModifyTime(indexCode string) (lastModifyTime string, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := ` SELECT MAX(modify_time) AS last_modify_time FROM base_from_fenwei_data WHERE index_code=? `
+	err = o.Raw(sql, indexCode).QueryRow(&lastModifyTime)
+	return
+}

services/data/edb_classify.go

@@ -442,7 +442,7 @@ func EditEdbClassify(classifyId, parentId int, classifyName, lang string, sysUse
 			err = e
 			return
 		}
-		if item.Level != parentClassifyInfo.Level + 1 {
+		if item.Level != parentClassifyInfo.Level+1 {
 			err = errors.New("父级分类层级异常")
 			return
 		}
@@ -1688,7 +1688,7 @@ func GetEdbClassifyChildrenRecursive(list []*data_manage.EdbClassifyItems, paren
 }
 
 // GetEdbClassifyChildrenRecursiveByParentIds 根据父目录递归子级目录
-func GetEdbClassifyChildrenRecursiveByParentIds(list []*data_manage.EdbClassifyItems, parentIds []string) []*data_manage.EdbClassifyItems{
+func GetEdbClassifyChildrenRecursiveByParentIds(list []*data_manage.EdbClassifyItems, parentIds []string) []*data_manage.EdbClassifyItems {
 	var res []*data_manage.EdbClassifyItems
 	for _, v := range list {
 		for _, id := range parentIds {

utils/constants.go

@@ -187,7 +187,7 @@ const (
 	DATA_SOURCE_TRADE_ANALYSIS                       = 92       // 持仓分析
 	DATA_SOURCE_USDA_FAS                             = 96       //美国农业部->96
 	DATA_SOURCE_RZD                                  = 97       // 睿姿得数据
-	DATA_SOURCE_CALCULATE_STL                        = 98       // 泛糖科技 -> 93
+	DATA_SOURCE_CALCULATE_STL                        = 98       // STL趋势分解 -> 98
 	DATA_SOURCE_MAPPING_RESIDUAL                     = 99       // 残差分析
 	DATA_SOURCE_CLARKSONS                            = 101      // 克拉克森数据
 	DATA_SOURCE_GPR_RISK                             = 102      //GPR地缘风险指数