|
@@ -5,12 +5,13 @@ import (
|
|
|
"eta/eta_api/models/mgo"
|
|
|
"eta/eta_api/utils"
|
|
|
"fmt"
|
|
|
- "github.com/beego/beego/v2/client/orm"
|
|
|
- "github.com/rdlucklib/rdluck_tools/paging"
|
|
|
- "go.mongodb.org/mongo-driver/bson"
|
|
|
"strconv"
|
|
|
"strings"
|
|
|
"time"
|
|
|
+
|
|
|
+ "github.com/beego/beego/v2/client/orm"
|
|
|
+ "github.com/rdlucklib/rdluck_tools/paging"
|
|
|
+ "go.mongodb.org/mongo-driver/bson"
|
|
|
)
|
|
|
|
|
|
type ChartInfo struct {
|
|
@@ -1417,8 +1418,6 @@ func EditChartBaseInfoAndEdbEnInfo(req *EditChartInfoBaseReq, chartItem *ChartIn
|
|
|
updateChartCols = append(updateChartCols, "ExtraConfig")
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
chartItem.ModifyTime = time.Now()
|
|
|
updateChartCols = append(updateChartCols, "ModifyTime")
|
|
|
_, err = to.Update(chartItem, updateChartCols...)
|
|
@@ -2774,6 +2773,15 @@ func GetChartInfoBySourceAndParentId(source, parentId, adminId int) (items []*Ch
|
|
|
return
|
|
|
}
|
|
|
|
|
|
+func GetChartInfoBySourceAndAdminId(source, adminId int) (items []*ChartClassifyItems, err error) {
|
|
|
+ o := orm.NewOrmUsingDB("data")
|
|
|
+ sql := ` SELECT chart_info_id,chart_classify_id,chart_name AS chart_classify_name,chart_name_en AS chart_classify_name_en,
|
|
|
+ unique_code,sys_user_id,sys_user_real_name,date_type,start_date,end_date,chart_type,calendar,season_start_date,season_end_date,source
|
|
|
+ FROM chart_info WHERE source = ? AND sys_user_id = ? ORDER BY sort asc,chart_info_id ASC `
|
|
|
+ _, err = o.Raw(sql, source, adminId).QueryRows(&items)
|
|
|
+ return
|
|
|
+}
|
|
|
+
|
|
|
|
|
|
type PreviewSeasonChartReq struct {
|
|
|
ChartEdbInfoList []*ChartSaveItem `description:"指标及配置信息"`
|