Merge branch 'bzq1/excel_rule_master_cf' of eta_server/eta_api into debug

controllers/data_manage/excel/excel_info.go

@@ -3255,6 +3255,9 @@ func (c *ExcelInfoController) GetExcelRuleList() {
 		br.ErrMsg = "管理规则添加失败，Err:" + err.Error()
 		return
 	}
+	if items.List == nil {
+		items.List = []*excel3.ExcelInfoRuleMappingView{}
+	}
 
 	br.Data = items
 	br.Msg = "获取成功"

models/data_manage/edb_info.go

@@ -11,9 +11,10 @@ import (
 	"strings"
 	"time"
 
+	"go.mongodb.org/mongo-driver/bson"
+
 	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
-	"go.mongodb.org/mongo-driver/bson"
 )
 
 type EdbInfo struct {
@@ -2010,6 +2011,25 @@ func GetEdbInfoListByCond(condition string, pars []interface{}) (list []*EdbInfo
 	return
 }
 
+type EdbInfoEditRecord struct {
+	EdbInfoId           int    `description:"指标ID"`
+	EdbName             string `description:"指标名称"`
+	Frequency           string `description:"频率"`
+	Unit                string `description:"单位"`
+	ClassifyId          int    `description:"分类id"`
+	CalculateFormula    string `description:"计算公式"`
+	OperateUserId       int    `description:"操作人id"`
+	OperateUserRealName string `description:"操作人姓名"`
+}
+
+func ModifyEdbInfoBaseTimeById(edbInfoId int, cTime time.Time) (err error) {
+	o := orm.NewOrmUsingDB("data")
+	// 更新修改时间
+	sql := ` UPDATE edb_info SET base_modify_time = ? WHERE edb_info_id = ? `
+	_, err = o.Raw(sql, cTime, edbInfoId).Exec()
+	return
+}
+
 func GetEdbInfoFieldList(cond string, pars []interface{}, fields []string) (items []*EdbInfo, err error) {
 	field := " * "
 	if len(fields) > 0 {

models/data_manage/edb_info_calculate.go

@@ -2,10 +2,12 @@ package data_manage
 
 import (
 	"fmt"
-	"github.com/beego/beego/v2/client/orm"
-	"github.com/rdlucklib/rdluck_tools/paging"
+
 	"strings"
 	"time"
+
+	"github.com/beego/beego/v2/client/orm"
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 type EdbInfoCalculateSaveReq struct {

models/data_manage/excel/excel_info_rule_mapping.go

@@ -61,7 +61,7 @@ func (e *ExcelInfoRuleMapping) Update(cols []string) (err error) {
 // GetExcelRuleMappingByExcelInfoId 根据excelInfoId获取规则映射信息
 func GetExcelRuleMappingByExcelInfoId(id int) (items []*ExcelInfoRuleMappingView, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM excel_info_rule_mapping WHERE excel_info_id = ?`
+	sql := `SELECT * FROM excel_info_rule_mapping WHERE excel_info_id = ? ORDER BY create_time ASC`
 	_, err = o.Raw(sql, id).QueryRows(&items)
 	return
 }

services/data/excel/excel_info.go

@@ -735,10 +735,11 @@ func ExcelRuleFormat(req *request.ExcelRuleMappingReq, lang string) (res *excel.
 		res.RightValue = fmt.Sprintf("%d,%d", x, y)
 		res.RightValueShow = req.RightValue
 	default:
-		res.RightValue = req.LeftValue
+		res.RightValue = req.RightValue
 		res.RightValueShow = req.RightValue
 	}
 
+	res.RuleType = req.RuleType
 	res.ExcelInfoId = req.ExcelInfoId
 	res.ExcelInfoRuleMappingId = req.ExcelRuleMappingId
 	res.LeftValueType = req.LeftValueType