fix：最大最小值

controllers/data_manage/manual_edb.go

@@ -369,8 +369,24 @@ func (c *ManualEdbController) EdbList() {
 
 	// 所属分类
 	if classifyId > 0 {
-		condition += ` AND a.classify_id = ? `
-		pars = append(pars, classifyId)
+		childClassifyList, err := models.GetEdbdataClassifyByParentId(classifyId)
+		if err != nil {
+			br.Msg = "获取分类数据失败"
+			br.Msg = "获取拥有的分类数据失败，Err:" + err.Error()
+			return
+		}
+		num := len(childClassifyList)
+		if num > 0 {
+			classifyIdList := make([]int, 0)
+			for _, v := range childClassifyList {
+				classifyIdList = append(classifyIdList, v.ClassifyId)
+			}
+			condition += ` AND a.classify_id in (` + utils.GetOrmInReplace(num) + `) `
+			pars = append(pars, classifyIdList)
+		} else {
+			condition += ` AND a.classify_id = ? `
+			pars = append(pars, classifyId)
+		}
 	}
 
 	// 所属用户

models/manual_edb.go

@@ -83,6 +83,8 @@ type EdbInfoListItem struct {
 	UniqueCode   string
 	IsJoinEdb    int8   `description:"指标库是否已添加：0-否；1-是"`
 	UserName     string `description:"录入用户名称"`
+	StartDate    string `description:"数据开始日期"`
+	EndDate      string `description:"数据结束日期"`
 }
 
 // EdbListResp 指标数据结构体

models/target.go

@@ -1232,6 +1232,8 @@ type EdbInfoItem struct {
 	ModifyTime   string     `description:"最近一次更新时间"`
 	Status       string     `description:"状态：未完成/完成"`
 	IsJoinEdb    int8       `description:"指标库是否已添加：0-否；1-是"`
+	StartDate    string     `description:"数据开始日期"`
+	EndDate      string     `description:"数据结束日期"`
 	DataList     []*Edbdata `description:"指标数据列表"`
 }