Merge branch 'fix/2022-07-28_pool' into debug

controller/chart/chart_info.go

@@ -181,8 +181,13 @@ func GetChartInfoDetail(c *gin.Context) {
 		item.StartDate = v.StartDate
 		item.EndDate = v.EndDate
 		item.ModifyTime = v.ModifyTime
-		if !utils.InArray(v.SourceName, sourceArr) {
-			sourceArr = append(sourceArr, v.SourceName)
+
+		sourceName := v.SourceName
+		if utils.InArray(v.Source, utils.SystemSourceList) { //来源于系统的指标，都展示为弘则研究
+			sourceName = "弘则研究"
+		}
+		if !utils.InArray(sourceName, sourceArr) {
+			sourceArr = append(sourceArr, sourceName)
 		}
 		if chartInfoId <= 0 {
 			item.IsAxis = 1
@@ -339,7 +344,7 @@ func GetChartInfoDetail(c *gin.Context) {
 		}
 		edbList = append(edbList, item)
 	}
-	sourceArr = append(sourceArr, "弘则研究")
+	//sourceArr = append(sourceArr, "弘则研究")
 	chartInfo.ChartSource = strings.Join(sourceArr, ",")
 
 	// 访问记录-仅普通用户记录

utils/constants.go

@@ -141,7 +141,7 @@ const (
 	TEMPLATE_MSG_ACTIVITY_APPOINTMENT            //活动预约/报名时间通知
 	_
 	TEMPLATE_MSG_YB_COMMUNITY_QUESTION // 研报小程序-问答社区通知
-	TEMPLATE_MSG_YB_VOICE_BROADCAST // 研报小程序-语音播报
+	TEMPLATE_MSG_YB_VOICE_BROADCAST    // 研报小程序-语音播报
 )
 
 // 微信用户user_record注册平台
@@ -158,3 +158,20 @@ const (
 	AdminId  = 11      //系统操作的用户id
 	RealName = "超级管理员" //系统操作的用户名称
 )
+
+// SystemSourceList 系统来源
+var SystemSourceList = []int{
+	DATA_SOURCE_CALCULATE,            //指标运算
+	DATA_SOURCE_CALCULATE_LJZZY,      //累计值转月
+	DATA_SOURCE_CALCULATE_TBZ,        //同比值
+	DATA_SOURCE_CALCULATE_TCZ,        //同差值
+	DATA_SOURCE_CALCULATE_NSZYDPJJS,  //N数值移动平均计算
+	DATA_SOURCE_MANUAL,               //手工指标
+	DATA_SOURCE_CALCULATE_HBZ,        //环比值->12
+	DATA_SOURCE_CALCULATE_HCZ,        //环差值->13
+	DATA_SOURCE_CALCULATE_BP,         //变频->14
+	DATA_SOURCE_CALCULATE_TIME_SHIFT, //时间移位->22
+	DATA_SOURCE_CALCULATE_ZJPJ,       //直接拼接->23
+	DATA_SOURCE_CALCULATE_LJZTBPJ,    //累计值同比拼接->24
+	DATA_SOURCE_PYTHON,               //python代码->27
+}