Merge branch 'fix/2023-7-28' into debug

models/data_manage/chart_classify.go

@@ -271,3 +271,10 @@ func GetChartClassifyByLevel(level, source int) (items []*ChartClassifyItems, er
 	_, err = o.Raw(sql, level, source).QueryRows(&items)
 	return
 }
+
+func EditChartClassifySysUser(classifyId,sysUserId int, chartClassifyName string) (err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `UPDATE chart_classify SET sys_user_id=?,sys_user_real_name=?,modify_time=NOW() WHERE parent_id=?  AND level=3 `
+	_, err = o.Raw(sql, sysUserId, chartClassifyName, classifyId).Exec()
+	return
+}

models/data_manage/edb_classify.go

@@ -408,4 +408,44 @@ WHERE
 			)AS t`
 	err = o.Raw(sql, classifyId, classifyId, classifyId).QueryRow(&classifyIds)
 	return
+}
+
+func FixEdbClassifySysUser()  {
+	list, err := GetEdbClassifyByLevel(2,0)
+	if err != nil {
+		return
+	}
+
+	for _, v := range list {
+		err := EditEdbClassifySysUser(v.ClassifyId, v.SysUserId, v.SysUserRealName)
+		if err != nil {
+			return
+		}
+		fmt.Println("ClassifyId:",v.ClassifyId)
+	}
+	fmt.Println("FixEdbClassifySysUser end")
+}
+
+
+func EditEdbClassifySysUser(classifyId,sysUserId int, chartClassifyName string) (err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `UPDATE edb_classify SET sys_user_id=?,sys_user_real_name=?,modify_time=NOW() WHERE parent_id=?  AND level=3 `
+	_, err = o.Raw(sql, sysUserId, chartClassifyName, classifyId).Exec()
+	return
+}
+
+func FixPredictEdbClassifySysUser()  {
+	list, err := GetEdbClassifyByLevel(2,1)
+	if err != nil {
+		return
+	}
+
+	for _, v := range list {
+		err := EditEdbClassifySysUser(v.ClassifyId, v.SysUserId, v.SysUserRealName)
+		if err != nil {
+			return
+		}
+		fmt.Println("ClassifyId:",v.ClassifyId)
+	}
+	fmt.Println("EditChartClassifySysUser end")
 }

models/product.go

@@ -0,0 +1,6 @@
+package models
+
+type Product struct {
+	ProductId   int    `description:"产品id"`
+	ProductName string `description:"产品名称"`
+}

models/report.go

@@ -855,14 +855,14 @@ type YbPcSuncode struct {
 
 // GetYbPcSunCode 获取太阳码
 func GetYbPcSunCode(scene, page string) (item *YbPcSuncode, err error) {
-	o := orm.NewOrmUsingDB("weekly")
+	o := orm.NewOrmUsingDB("default")
 	sql := `SELECT * FROM yb_pc_suncode WHERE scene = ? AND code_page = ? `
 	err = o.Raw(sql, scene, page).QueryRow(&item)
 	return
 }
 
 func AddYbPcSunCode(item *YbPcSuncode) (err error) {
-	o := orm.NewOrmUsingDB("weekly")
+	o := orm.NewOrmUsingDB("default")
 	_, err = o.Insert(item)
 	return
 }
@@ -876,7 +876,7 @@ type YbSuncodePars struct {
 }
 
 func AddYbSuncodePars(item *YbSuncodePars) (err error) {
-	o := orm.NewOrmUsingDB("weekly")
+	o := orm.NewOrmUsingDB("default")
 	_, err = o.Insert(item)
 	return
 }

services/data/chart_classify.go

@@ -1,6 +1,7 @@
 package data
 
 import (
+	"fmt"
 	"hongze/hz_eta_api/models/data_manage"
 	"hongze/hz_eta_api/utils"
 	"strconv"
@@ -75,3 +76,20 @@ func FixChartClassify()  {
 		}
 	}
 }
+
+func FixChartClassifySysUserId()  {
+	//获取所有父级分类信息
+	list, err := data_manage.GetChartClassifyByLevel(2,1)
+	if err != nil {
+		return
+	}
+
+	for _, v := range list {
+		err := data_manage.EditChartClassifySysUser(v.ChartClassifyId, v.SysUserId, v.SysUserRealName)
+		if err != nil {
+			return
+		}
+		fmt.Println("ChartClassifyId:",v.ChartClassifyId)
+	}
+	fmt.Println("FixChartClassifySysUserId end")
+}

services/data/predict_edb_info_rule.go

@@ -1779,6 +1779,9 @@ func GetChartPredictEdbInfoDataListByRuleAnnualValueInversion(edbInfoId int, con
 
 		//同比年份相应的上一期日期的余额
 		lastYearDateBalance := yearTotalMap[lastPrevDateTime.Year()] - dateTotal
+		if lastYearDateBalance == 0 {
+			continue
+		}
 
 		// 同比增速=当年余额/同比年份上一期日期的余额
 		tbVal := decimal.NewFromFloat(currYearBalance).Div(decimal.NewFromFloat(lastYearDateBalance))