Merge branch 'feature/eta1.6.5_edb_calculate' into debug

controllers/data_manage/edb_info_calculate.go

@@ -1733,6 +1733,8 @@ func (this *ChartInfoController) BatchCalculateBatchSave() {
 		}
 		return
 	}
+	req.AdminId = sysUser.AdminId
+	req.AdminName = sysUser.RealName
 	req.EdbList = reqEdbList
 	// 调用指标库去更新
 	reqJson, err := json.Marshal(req)
@@ -2107,7 +2109,7 @@ func (this *ChartInfoController) CalculateMultiChoice() {
 	classifyIds := this.GetString("ClassifyIds")
 	edbInfoIds := this.GetString("EdbInfoIds")
 	selectAll, _ := this.GetBool("SelectAll")
-
+	notFrequency := this.GetString("NotFrequency")
 	var edbIdArr []int
 
 	if selectAll {
@@ -2127,6 +2129,11 @@ func (this *ChartInfoController) CalculateMultiChoice() {
 			condition += ` AND frequency IN (` + utils.GetOrmInReplace(len(frequencyArr)) + `) `
 			pars = append(pars, frequencyArr)
 		}
+		if notFrequency != "" {
+			notFrequencyArr := strings.Split(notFrequency, ",")
+			condition += ` AND frequency NOT IN (` + utils.GetOrmInReplace(len(notFrequencyArr)) + `) `
+			pars = append(pars, notFrequencyArr)
+		}
 
 		if sysUserIds != "" {
 			sysUserIdSlice := strings.Split(sysUserIds, ",")
@@ -2232,6 +2239,7 @@ func (this *ChartInfoController) CalculateMultiSearch() {
 
 	pageSize, _ := this.GetInt("PageSize")
 	currentIndex, _ := this.GetInt("CurrentIndex")
+	notFrequency := this.GetString("NotFrequency")
 
 	var startSize int
 	if pageSize <= 0 {
@@ -2258,7 +2266,11 @@ func (this *ChartInfoController) CalculateMultiSearch() {
 		condition += ` AND frequency IN (` + utils.GetOrmInReplace(len(frequencyArr)) + `) `
 		pars = append(pars, frequencyArr)
 	}
-
+	if notFrequency != "" {
+		notFrequencyArr := strings.Split(notFrequency, ",")
+		condition += ` AND frequency NOT IN (` + utils.GetOrmInReplace(len(notFrequencyArr)) + `) `
+		pars = append(pars, notFrequencyArr)
+	}
 	if sysUserIds != "" {
 		sysUserIdSlice := strings.Split(sysUserIds, ",")
 		condition += ` AND sys_user_id IN (` + utils.GetOrmInReplace(len(sysUserIdSlice)) + `)`

models/data_manage/edb_info_calculate.go

@@ -542,6 +542,8 @@ type SaveAdjustEdbDataReq struct {
 
 // BatchEdbInfoCalculateBatchSaveReq 批量添加 计算指标
 type BatchEdbInfoCalculateBatchSaveReq struct {
+	AdminId          int                     `description:"添加人id"`
+	AdminName        string                  `description:"添加人名称"`
 	EdbList          []*CalculateEdbInfoItem //需要批量计算的指标列表
 	Formula          string                  `description:"N值/移动天数"`
 	Source           int                     `description:"来源:1:同花顺,2:wind,3:彭博,4:指标运算,5:累计值转月,6:同比值,7:同差值,8:N数值移动平均计算,12:环比值,13:环差值,14:升频"`