Merge branch 'bugfix_7333' into debug

models/calculate_residual_analysis_config_mapping.go

@@ -23,15 +23,23 @@ func init() {
 // GetConfigMappingListByConditionNotBase 查询非基础指标的配置映射
 func GetConfigMappingListByConditionNotBase(edbInfoId int) (configMapping []CalculateResidualAnalysisConfigMapping, err error) {
 	o := orm.NewOrm()
+	//sql := `
+	//SELECT
+	//	*
+	//FROM
+	//	calculate_residual_analysis_config_mapping
+	//WHERE
+	//	calculate_residual_analysis_config_id IN ( SELECT calculate_residual_analysis_config_id FROM calculate_residual_analysis_config_mapping WHERE edb_info_id = ? )
+	//	AND index_type != 3
+	//	AND index_type != 4`
 	sql := `
 	SELECT
-  		* 
+		* 
 	FROM
-  		calculate_residual_analysis_config_mapping 
-	WHERE
-  		calculate_residual_analysis_config_id IN ( SELECT calculate_residual_analysis_config_id FROM calculate_residual_analysis_config_mapping WHERE edb_info_id = ? ) 
-  		AND index_type != 3 
-  		AND index_type != 4`
+		calculate_residual_analysis_config_mapping 
+		 WHERE edb_info_id = ? AND index_type != 3 
+		AND index_type != 4`
+
 	_, err = o.Raw(sql, edbInfoId).QueryRows(&configMapping)
 	if err != nil {
 		return nil, fmt.Errorf("查询数据时出错: %v", err)

models/edb_data_residual_analysis.go

@@ -52,22 +52,30 @@ func RefreshAllCalculateResidualAnalysis(edbInfoId, source, subSource, formulaIn
 			_ = to.Commit()
 		}
 	}()*/
+	//只清空残差分析数据自身指标的数据
 	configMapping, err := GetConfigMappingListByConditionNotBase(edbInfoId)
-	if err != nil {
-		return err
-	}
-
-	var edbInfoIdList []int64
-	for _, v := range configMapping {
-		edbInfoIdList = append(edbInfoIdList, v.EdbInfoId)
-	}
+	//if err != nil {
+	//	return err
+	//}
+	//
+	//var edbInfoIdList []int64
+	//for _, v := range configMapping {
+	//	edbInfoIdList = append(edbInfoIdList, v.EdbInfoId)
+	//}
 
 	//清空原有数据
-	sql := ` DELETE FROM edb_data_residual_analysis WHERE edb_info_id in (` + utils.GetOrmInReplace(len(edbInfoIdList)) + `) `
+	//sql := ` DELETE FROM edb_data_residual_analysis WHERE edb_info_id in (` + utils.GetOrmInReplace(len(edbInfoIdList)) + `) `
+	//var params []interface{}
+	//for _, i := range edbInfoIdList {
+	//	params = append(params, i)
+	//}
 	var params []interface{}
-	for _, i := range edbInfoIdList {
-		params = append(params, i)
-	}
+	sql := ` DELETE FROM edb_data_residual_analysis WHERE edb_info_id = ?`
+	params = append(params, edbInfoId)
+	//var params []interface{}
+	//for _, i := range edbInfoIdList {
+	//	params = append(params, i)
+	//}
 	_, err = to.Raw(sql, params...).Exec()
 	if err != nil {
 		return
@@ -126,10 +134,10 @@ func refreshAllCalculateResidualAnalysis(edbInfoId, source, subSource, formulaIn
 
 	// 时间处理
 	switch config.DateType {
-	case 0:
+	case -1:
 		startDate = config.StartDate
 		endDate = config.EndDate
-	case 1:
+	case 0:
 		startDate = config.StartDate
 		endDate = ""
 	default:
@@ -579,7 +587,7 @@ func fillOriginalChart(config ResidualAnalysisConfig, req *EdbInfo, mappingList
 
 		if v.EdbInfoId == edbInfoMappingB.EdbInfoId {
 			// 领先指标 dataList进行数据处理
-			if config.IndexType == 1 {
+			if config.IndexType == 2 {
 				if config.LeadValue < 0 {
 					return nil, nil, nil, fmt.Errorf("领先值不能小于0")
 				} else if config.LeadValue > 0 {

services/base_from_mysteel_chemical.go

@@ -52,7 +52,7 @@ func HandleApiMysteelIndex(req *models.HandleMysteelIndexResp) (errMsg string, e
 }
 
 func ApiCheck() (ok bool, err error) {
-	item, err := getPageIndexInfoMap(1, 1, false)
+	item, err := getPageIndexInfoMap(1, 1, true)
 	if err != nil {
 		if err.Error() == "406" {
 			return false, nil

static/pcsg_task.json

@@ -86,5 +86,13 @@
     "ExtraLetter": "",
     "IndexNamePrefix": "",
     "IndexCodeSuffix": ""
+  },
+  {
+    "TaskKey": "IDpcsgDailyRunHistU3",
+    "Frequency": "日度",
+    "VCode": false,
+    "ExtraLetter": "",
+    "IndexNamePrefix": "",
+    "IndexCodeSuffix": ""
   }
-]
+]