Merge branch 'bug/5664' into debug

controllers/data_manage/manual_edb.go

@@ -164,6 +164,7 @@ func fillDataNextDateTime(list []*models.Edbdata) ([]*models.Edbdata, error) {
 // ClassifyEdbList
 // @Title 分类指标列表
 // @Description 指标列表
+// @Param   Frequency   query   string  false       "频度；枚举值：日度、周度、月度、季度、半年度、年度"
 // @Param   ClassifyId   query   string  true       "分类id"
 // @Success 200 {object} models.TargetDetailResp
 // @router /target/classify/edb/list [get]
@@ -188,6 +189,9 @@ func (c *ManualEdbController) ClassifyEdbList() {
 		br.IsSendEmail = false
 	}
 
+	// 频度
+	frequency := c.GetString("Frequency")
+
 	var condition string
 	var pars []interface{}
 
@@ -214,6 +218,11 @@ func (c *ManualEdbController) ClassifyEdbList() {
 	condition += ` AND a.classify_id = ? `
 	pars = append(pars, classifyId)
 
+	if frequency != "" {
+		condition += ` AND a.frequency = ?`
+		pars = append(pars, frequency)
+	}
+
 	tmpList, err := models.GetEdbInfoList(condition, pars, 0, 0)
 	if err != nil {
 		br.Msg = "获取失败"