fix:合并冲突

models/bi_dashboard/bi_dashboard.go

@@ -89,9 +89,9 @@ type BiDashboardEditingCache struct {
 // DashboardDetailResp 详情响应体
 type DashboardDetailResp struct {
 	*BiDashboard
-	IsGrant   int                     `description:"是否共享，0：不是，1：是"`
-	Editor    BiDashboardEditingCache `description:"编辑人信息"`
-	List      []*BiDashboardDetail
+	IsGrant int                     `description:"是否共享，0：不是，1：是"`
+	Editor  BiDashboardEditingCache `description:"编辑人信息"`
+	List    []*BiDashboardDetail
 }
 
 type AddDashboardReq struct {
@@ -115,7 +115,7 @@ type EditDashboardReq struct {
 func EditDashboard(item *BiDashboard) (err error) {
 	o := orm.NewOrm()
 	sql := `UPDATE bi_dashboard SET bi_dashboard_name=?,modify_time=?,state=? WHERE bi_dashboard_id=?`
-	_, err = o.Raw(sql, item.BiDashboardName, time.Now(),item.State, item.BiDashboardId).Exec()
+	_, err = o.Raw(sql, item.BiDashboardName, time.Now(), item.State, item.BiDashboardId).Exec()
 	return
 }
 
@@ -145,11 +145,10 @@ func SaveDashboard(item *BiDashboard) (err error) {
 	return
 }
 
-
 // BiDashboardEditingReq 标记编辑中请求体
 type BiDashboardEditingReq struct {
-	BiDashboardId  int `description:"看板主键ID"`
-	Status int `description:"标记状态: 1-编辑中; 2-编辑完成"`
+	BiDashboardId int `description:"看板主键ID"`
+	Status        int `description:"标记状态: 1-编辑中; 2-编辑完成"`
 }
 
 // GetAllMyShareList 获取我共享的看板
@@ -167,4 +166,4 @@ func GetDashboardByName(name string) (item *BiDashboard, err error) {
 	o := orm.NewOrm()
 	err = o.Raw(sql, name).QueryRow(&item)
 	return
-}
+}

models/bi_dashboard/bi_dashboard_detail.go

@@ -22,8 +22,8 @@ func (m *BiDashboardDetail) TableName() string {
 
 // add
 //func AddBiDashboardDetail(item *BiDashboardDetail) (err error) {
-	//err = global.DEFAULT_DmSQL.Create(item).Error
-	//return
+//err = global.DEFAULT_DmSQL.Create(item).Error
+//return
 //}
 
 func GetBiDashboardDetailById(id int) (list []*BiDashboardDetail, err error) {
@@ -56,7 +56,7 @@ type MoveDashboardDetailReq struct {
 }
 
 // update
-func EditBiDashboardDetail(item *BiDashboardDetail) (err error){
+func EditBiDashboardDetail(item *BiDashboardDetail) (err error) {
 	//return global.DEFAULT_DmSQL.Model(item).Where("bi_dashboard_detail_id = ?", item.BiDashboardDetailId).Updates(item).Error
 	o := orm.NewOrm()
 	_, err = o.Raw("UPDATE bi_dashboard_detail SET bi_dashboard_id=?,type=?,unique_code=?,sort=?,modify_time=? WHERE bi_dashboard_detail_id=?", item.BiDashboardId, item.Type, item.UniqueCode, item.Sort, item.ModifyTime, item.BiDashboardDetailId).Exec()
@@ -67,11 +67,10 @@ type DelDashboardDetailReq struct {
 	BiDashboardDetailId int `description:"看板详情id"`
 }
 
-
 // del
 func DeleteBiDashboardDetailByDetailId(id int) (err error) {
 	//return global.DEFAULT_DmSQL.Where("bi_dashboard_detail_id = ?", id).Delete(&BiDashboardDetail{}).Error
 	o := orm.NewOrm()
 	_, err = o.Raw("DELETE from bi_dashboard_detail where bi_dashboard_detail_id=?", id).Exec()
 	return
-}
+}

models/bi_dashboard/bi_dashboard_grant.go

@@ -72,4 +72,4 @@ func GetDashboardGrantInfo(biDashboardId int) (list []*BiDashboardGrant, err err
 	o := orm.NewOrm()
 	_, err = o.Raw("SELECT * FROM bi_dashboard_grant where bi_dashboard_id=?", biDashboardId).QueryRows(&list)
 	return
-}
+}

models/business_conf.go

@@ -12,6 +12,7 @@ import (
 var (
 	BusinessConfMap map[string]string
 )
+
 const (
 	BusinessConfUseXf                        = "UseXf"
 	BusinessConfXfAppid                      = "XfAppid"

services/bi_dashboard.go

@@ -8,9 +8,6 @@ import (
 	"time"
 )
 
-
-
-
 // UpdateBiDashboardEditing 更新看板编辑状态
 func UpdateBiDashboardEditing(boardId, status, userId int, userName string) (ret bi_dashboard.BiDashboardEditingCache, err error) {
 	if boardId <= 0 {

services/data/chart_info.go

@@ -3904,7 +3904,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 						continue
 					}
 					// 农历时dataTimeList的年份为最新年份，图例时间的年份才是真实年份
-					chartLegend,_ := strconv.Atoi(v.ChartLegend)
+					chartLegend, _ := strconv.Atoi(v.ChartLegend)
 					if chartLegend < startYear {
 						continue
 					}
@@ -4040,7 +4040,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 							continue
 						}
 						// 农历时dataTimeList的年份为最新年份，图例时间的年份才是真实年份
-						chartLegend,_ := strconv.Atoi(v.ChartLegend)
+						chartLegend, _ := strconv.Atoi(v.ChartLegend)
 						if chartLegend < startYear {
 							continue
 						}
@@ -4213,7 +4213,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 						continue
 					}
 					// 农历时dataTimeList的年份为最新年份，图例时间的年份才是真实年份
-					chartLegend,_ := strconv.Atoi(quarterDataList[i].ChartLegend)
+					chartLegend, _ := strconv.Atoi(quarterDataList[i].ChartLegend)
 					if chartLegend < startYear {
 						continue
 					}
@@ -4301,7 +4301,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 						continue
 					}
 					// 农历时dataTimeList的年份为最新年份，图例时间的年份才是真实年份
-					chartLegend,_ := strconv.Atoi(quarterDataList[i].ChartLegend)
+					chartLegend, _ := strconv.Atoi(quarterDataList[i].ChartLegend)
 					if chartLegend < startYear {
 						continue
 					}

services/data/edb_info_calculate.go

@@ -375,7 +375,7 @@ func GetMaxMinEdbInfo(formula string) string {
 }
 
 // HandleDataByLinearRegressionToList 插值法补充数据(线性方程式)
-func HandleDataByLinearRegressionToList (edbInfoDataList []*data_manage.EdbDataList, handleDataMap map[string]float64) (dataTimeList []string,valueList []float64, err error) {
+func HandleDataByLinearRegressionToList(edbInfoDataList []*data_manage.EdbDataList, handleDataMap map[string]float64) (dataTimeList []string, valueList []float64, err error) {
 	if len(edbInfoDataList) < 2 {
 		return
 	}
@@ -514,7 +514,7 @@ func HandleDataByLinearRegressionToListV2(edbInfoDataList []*data_manage.EdbData
 }
 
 // HandleDataByLinearRegressionToListV3 插值法补充数据(线性方程式)-直接补充指标起始日期间的所有数据
-func HandleDataByLinearRegressionToListV3 (edbInfoDataList []*data_manage.EdbDataList, handleDataMap map[string]float64) (newEdbInfoDataList []*data_manage.EdbDataList, dataTimeList []string,valueList []float64, err error) {
+func HandleDataByLinearRegressionToListV3(edbInfoDataList []*data_manage.EdbDataList, handleDataMap map[string]float64) (newEdbInfoDataList []*data_manage.EdbDataList, dataTimeList []string, valueList []float64, err error) {
 	if len(edbInfoDataList) < 2 {
 		return
 	}

services/report.go

@@ -124,18 +124,18 @@ func UpdateChaptersVideo(ids []int) (err error) {
 //	return
 //}
 
-func initp2_838 (){
+func initp2_838() {
 	var condition string
 	var pars []interface{}
 	condition = " AND  state =  2 "
-	list ,err:= models.GetReportByCondition(condition,pars,[]string{},"",false,0,0)
-	if err != nil{
+	list, err := models.GetReportByCondition(condition, pars, []string{}, "", false, 0, 0)
+	if err != nil {
 		fmt.Println(err)
 	}
 	fmt.Println(len(list))
-	for  _,v:=  range  list{
+	for _, v := range list {
 		fmt.Println(v.Id)
-		UpdateReportEs(v.Id,2)
+		UpdateReportEs(v.Id, 2)
 	}
 }