fix：兼容自定义分析指标转手工数据指标的逻辑

models/manual_edb.go

@@ -104,7 +104,7 @@ type EdbListResp struct {
 // @return err error
 func GetEdbInfoList(condition string, pars []interface{}, startSize, pageSize int) (items []*EdbInfoListItem, err error) {
 	o := orm.NewOrmUsingDB("edb")
-	sql := `SELECT DISTINCT a.* FROM edbinfo AS a  WHERE a.REMARK='手动' `
+	sql := `SELECT DISTINCT a.* FROM edbinfo AS a  WHERE a.classify_id > 0 `
 	if condition != "" {
 		sql += condition
 	}
@@ -130,7 +130,7 @@ func GetEdbInfoList(condition string, pars []interface{}, startSize, pageSize in
 // @return err error
 func GetCountEdbInfoList(condition string, pars []interface{}) (total int, err error) {
 	o := orm.NewOrmUsingDB("edb")
-	sql := `SELECT COUNT(1) ct FROM edbinfo AS a  WHERE a.REMARK='手动' `
+	sql := `SELECT COUNT(1) ct FROM edbinfo AS a  WHERE a.classify_id > 0 `
 	if condition != "" {
 		sql += condition
 	}

models/target.go

@@ -36,7 +36,7 @@ func GetDataList(condition string, pars []interface{}, startSize, pageSize int)
 	sql := `select a.TRADE_CODE,a.SEC_NAME,a.UNIT,a.frequency,a.classify_id,b.classify_name,c.DT,c.CLOSE,c.modify_time FROM edbdata AS c
                 inner join edbinfo AS a ON a.TRADE_CODE=c.TRADE_CODE
                 left join edbdata_classify AS b ON a.classify_id=b.classify_id
-                where left(a.TRADE_CODE,1)='W' AND a.REMARK='手动' AND a.classify_id>0`
+                where a.classify_id>0`
 	if condition != "" {
 		sql += condition
 	}
@@ -50,7 +50,7 @@ func GetDataListCount(condition string, pars []interface{}) (count int, err erro
 	sql := ` select count(1) as count FROM edbdata AS c
                     inner join edbinfo AS a ON a.TRADE_CODE=c.TRADE_CODE    
                     left join edbdata_classify AS b ON a.classify_id=b.classify_id
-                    where left(a.TRADE_CODE,1)='W' AND a.REMARK='手动' AND a.classify_id>0 `
+                    where a.classify_id>0 `
 	if condition != "" {
 		sql += condition
 	}
@@ -191,14 +191,14 @@ func GetEdbinfoListCount(condition string, pars []interface{}, mobile string, ro
 	if mobile != "" && roleType == 1 {
 		sql = `SELECT COUNT(1) AS count FROM edbinfo AS a 
              INNER JOIN edbinfo_user AS c ON a.TRADE_CODE=c.TRADE_CODE AND c.mobile=?
-             WHERE LEFT(a.TRADE_CODE,1)='W' AND a.REMARK='手动' AND a.classify_id>0`
+             WHERE a.classify_id>0`
 
 		if condition != "" {
 			sql += condition
 		}
 		err = o.Raw(sql, mobile, pars).QueryRow(&count)
 	} else {
-		sql := `SELECT COUNT(1) AS count FROM edbinfo AS a WHERE LEFT(a.TRADE_CODE,1)='W' AND a.REMARK='手动' AND a.classify_id>0`
+		sql := `SELECT COUNT(1) AS count FROM edbinfo AS a WHERE a.classify_id>0`
 
 		if condition != "" {
 			sql += condition
@@ -234,7 +234,7 @@ func GetEdbinfoItemList(condition string, pars []interface{}, startSize, pageSiz
 		sql = ` SELECT DISTINCT a.*,b.classify_name FROM edbinfo AS a
                     LEFT JOIN edbdata_classify AS b ON a.classify_id=b.classify_id
                     INNER JOIN edbinfo_user AS c ON a.TRADE_CODE=c.TRADE_CODE AND c.mobile=?
-                    WHERE LEFT(a.TRADE_CODE,1)='W' AND a.REMARK='手动' AND a.classify_id>0`
+                    WHERE a.classify_id>0`
 		if condition != "" {
 			sql += condition
 		}
@@ -243,7 +243,7 @@ func GetEdbinfoItemList(condition string, pars []interface{}, startSize, pageSiz
 	} else {
 		sql = `SELECT DISTINCT a.*,b.classify_name FROM edbinfo AS a
                      LEFT JOIN edbdata_classify AS b on a.classify_id=b.classify_id
-                     WHERE LEFT(a.TRADE_CODE,1)='W' AND a.REMARK='手动' AND a.classify_id>0`
+                     WHERE a.classify_id>0`
 		if condition != "" {
 			sql += condition
 		}
@@ -296,7 +296,7 @@ type EdbinfoAddReq struct {
 
 // GetMaxTradeCode 获取指标最大trade_code
 func GetMaxTradeCode() (max_trade_code string, err error) {
-	sql := " SELECT MAX(TRADE_CODE) AS max_trade_code FROM edbinfo WHERE LEFT(TRADE_CODE,1)='W' AND TRADE_CODE not like '%index%' and TRADE_CODE NOT LIKE 'WDC%'"
+	sql := " SELECT MAX(TRADE_CODE) AS max_trade_code FROM edbinfo WHERE LEFT(TRADE_CODE,1)='W' "
 	o := orm.NewOrmUsingDB("edb")
 	err = o.Raw(sql).QueryRow(&max_trade_code)
 	if (err != nil && err.Error() == utils.ErrNoRow()) || max_trade_code == `` {
@@ -306,7 +306,7 @@ func GetMaxTradeCode() (max_trade_code string, err error) {
 }
 
 func GetEdbinfoBySecName(secName string) (item *Edbinfo, err error) {
-	sql := `SELECT * FROM edbinfo WHERE SEC_NAME=? AND left(TRADE_CODE,1)='W' AND REMARK='手动' `
+	sql := `SELECT * FROM edbinfo WHERE SEC_NAME=? `
 	o := orm.NewOrmUsingDB("edb")
 	err = o.Raw(sql, secName).QueryRow(&item)
 	return
@@ -367,7 +367,7 @@ func EditEdbinfo(tradeCode, secName, unit, frequency, noticeTime string, classif
 func SearchTargetEntry(classifyId int, keyWord string) (items []*Edbinfo, err error) {
 	where := ""
 	pars := make([]interface{}, 0)
-	sql := `SELECT * FROM edbinfo WHERE LEFT(TRADE_CODE,1)='W' AND REMARK='手动' AND classify_id>0 AND classify_id=? `
+	sql := `SELECT * FROM edbinfo WHERE classify_id>0 AND classify_id=? `
 	pars = append(pars, classifyId)
 	if keyWord != "" {
 		sql += `AND SEC_NAME LIKE ? `
@@ -471,7 +471,7 @@ type EdbdataClassifyResp struct {
 }
 
 func GetTargetBySecName(secName string) (item *Edbinfo, err error) {
-	sql := `SELECT * FROM edbinfo WHERE SEC_NAME=? AND left(TRADE_CODE,1)='W' AND REMARK='手动' `
+	sql := `SELECT * FROM edbinfo WHERE SEC_NAME=? `
 	o := orm.NewOrmUsingDB("edb")
 	err = o.Raw(sql, secName).QueryRow(&item)
 	return
@@ -580,7 +580,7 @@ func GetDataListForExport(startDate, endDate, frequency, keyWord string, classif
 	sql := ` SELECT a.TRADE_CODE,a.SEC_NAME,a.UNIT,a.frequency,a.classify_id,b.classify_name,c.DT,c.CLOSE FROM edbdata AS c
                 INNER JOIN edbinfo AS a ON a.TRADE_CODE=c.TRADE_CODE
                 LEFT JOIN edbdata_classify AS b ON a.classify_id=b.classify_id
-                WHERE LEFT(a.TRADE_CODE,1)='W' AND a.REMARK='手动' AND a.classify_id>0 `
+                WHERE a.classify_id>0 `
 	if where != "" {
 		sql += where
 	}
@@ -676,7 +676,7 @@ func GetResearcherEntry() (items []*Researcher, err error) {
 		mobile := items[i].Mobile
 		sqlCount := ` SELECT COUNT(DISTINCT a.TRADE_CODE) AS count FROM  edbinfo_user AS a
             INNER JOIN edbinfo AS b ON a.TRADE_CODE=b.TRADE_CODE
-            WHERE a.mobile=? AND LEFT(b.TRADE_CODE,1)='W' AND b.REMARK='手动' AND b.classify_id>0 `
+            WHERE a.mobile=? AND b.classify_id>0 `
 		err = edbO.Raw(sqlCount, mobile).QueryRow(&count)
 		items[i].TargetCount = count
 	}
@@ -697,7 +697,7 @@ func GetResearcherEntryByMobile(mobile string) (items []*Researcher, err error)
 		mobile := items[i].Mobile
 		sqlCount := ` SELECT COUNT(DISTINCT a.TRADE_CODE) AS count FROM  edbinfo_user AS a
             INNER JOIN edbinfo AS b ON a.TRADE_CODE=b.TRADE_CODE
-            WHERE a.mobile=? AND LEFT(b.TRADE_CODE,1)='W' AND b.REMARK='手动' AND b.classify_id>0 `
+            WHERE a.mobile=? AND b.classify_id>0 `
 		err = edbO.Raw(sqlCount, mobile).QueryRow(&count)
 		items[i].TargetCount = count
 	}
@@ -729,10 +729,10 @@ type SortEdbInfo []EdbinfoItems
 func GetTargetItems(mobile string, classifyId int) (lastItems SortEdbInfo, err error) {
 	var items []*EdbinfoItems
 	o := orm.NewOrmUsingDB("edb")
-	//sql := ` SELECT *,'' modify_date,'' status FROM edbinfo AS a WHERE LEFT(a.TRADE_CODE,1)='W' AND a.REMARK='手动' AND a.classify_id>0 `
+	//sql := ` SELECT *,'' modify_date,'' status FROM edbinfo AS a WHERE a.classify_id>0 `
 
 	sql := ` SELECT *,'' modify_date,'' STATUS FROM edbinfo AS a 
-            WHERE LEFT(a.TRADE_CODE,1)='W' AND a.REMARK='手动' AND a.classify_id>0
+            WHERE a.classify_id>0
              `
 	if classifyId > 0 {
 		sql += ` AND a.classify_id=` + strconv.Itoa(classifyId) + ``
@@ -741,7 +741,7 @@ func GetTargetItems(mobile string, classifyId int) (lastItems SortEdbInfo, err e
 
 	//if classifyId > 0 {
 	//	sql = ` SELECT *,'' modify_date,'' status FROM edbinfo AS a
-	//        WHERE a.classify_id=` + strconv.Itoa(classifyId) + ` AND LEFT(a.TRADE_CODE,1)='W' AND a.REMARK='手动' AND a.classify_id>0
+	//        WHERE a.classify_id=` + strconv.Itoa(classifyId) + ` AND a.classify_id>0
 	//         GROUP BY a.TRADE_CODE `
 	//}
 
@@ -1035,12 +1035,12 @@ func GetEdbdataSecName(condition string, pars []interface{}) (items []*EdbdataEx
 	//	        INNER JOIN edbinfo AS a ON a.TRADE_CODE=c.TRADE_CODE
 	//	        INNER JOIN edbinfo_user AS d ON a.TRADE_CODE=d.TRADE_CODE
 	//	        LEFT JOIN edbdata_classify AS b ON a.classify_id=b.classify_id
-	//	        WHERE LEFT(a.TRADE_CODE,1)='W' AND a.REMARK='手动' AND a.classify_id>0`
+	//	        WHERE a.classify_id>0`
 	sql := `SELECT a.TRADE_CODE,a.SEC_NAME,a.frequency,a.UNIT,MAX(c.DT) AS Dt,b.classify_name
 		        FROM edbdata AS c
 		        INNER JOIN edbinfo AS a ON a.TRADE_CODE=c.TRADE_CODE
 		        LEFT JOIN edbdata_classify AS b ON a.classify_id=b.classify_id
-		        WHERE LEFT(a.TRADE_CODE,1)='W' AND a.REMARK='手动' AND a.classify_id>0`
+		        WHERE a.classify_id>0`
 	if condition != "" {
 		sql += condition
 	}
@@ -1279,7 +1279,7 @@ func GetTargetItemList(classifyId, edbShowType int, frequency, keyword, tradeCod
 		sql = ` SELECT a.*,b.DT,'' modify_date,'' STATUS FROM edbinfo AS a 
 left join edbdata b on a.TRADE_CODE=b.TRADE_CODE `
 	}
-	sql += ` WHERE LEFT(a.TRADE_CODE,1)='W' AND a.REMARK='手动' AND a.classify_id>0 `
+	sql += ` WHERE a.classify_id>0 `
 
 	//如果没有分类id集合列表，那么就没有数据了，不用往下执行了，直接返回好了
 	if len(classifyIdStrList) <= 0 {
@@ -1432,7 +1432,7 @@ func GetEdbInfoCountByClassifyId(classifyId int) (count int, err error) {
 	o := orm.NewOrmUsingDB("edb")
 	sql := `SELECT COUNT(1) AS count FROM ( SELECT a.*,b.CLOSE FROM edbinfo AS a 
              INNER JOIN edbdata AS b ON a.TRADE_CODE=b.TRADE_CODE
-             WHERE LEFT(a.TRADE_CODE,1)='W' AND a.REMARK='手动' AND a.classify_id=? group by a.TRADE_CODE) d `
+             WHERE a.classify_id=? group by a.TRADE_CODE) d `
 	err = o.Raw(sql, classifyId).QueryRow(&count)
 	return
 }
@@ -1448,7 +1448,7 @@ func GetEdbInfoGroupCountByClassifyIds(classifyIds string) (list []*EdbInfoGroup
 	o := orm.NewOrmUsingDB("edb")
 	sql := `SELECT COUNT(1) AS count,classify_id FROM ( SELECT a.*,b.CLOSE FROM edbinfo AS a 
              INNER JOIN edbdata AS b ON a.TRADE_CODE=b.TRADE_CODE
-             WHERE LEFT(a.TRADE_CODE,1)='W' AND a.REMARK='手动' and a.classify_id in (` + classifyIds + `) group by a.TRADE_CODE) d 
+             WHERE a.classify_id in (` + classifyIds + `) group by a.TRADE_CODE) d 
 						 GROUP BY classify_id `
 	_, err = o.Raw(sql).QueryRows(&list)
 	return