Merge branch 'ETA_1.3.7'

controllers/data_manage/mysteel_chemical_data.go

@@ -797,38 +797,43 @@ func (this *EdbClassifyController) AddMysteelChemical() {
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
 		return
 	}
-	if req.IndexCode == "" {
-		br.Msg = "请输入指标ID"
-		br.IsSendEmail = false
-		return
-	}
-	if req.BaseFromMysteelChemicalClassifyId <= 0 {
-		br.Msg = "请选择分类"
-		br.IsSendEmail = false
-		return
-	}
+	resp := new(response.AddMysteelChemicalIndexInfoResp)
+	for i, v := range req.List {
+		if v.IndexCode == "" {
+			br.Msg = "请输入指标ID"
+			br.IsSendEmail = false
+			return
+		}
+		if v.BaseFromMysteelChemicalClassifyId <= 0 {
+			br.Msg = "请选择分类"
+			br.IsSendEmail = false
+			return
+		}
 
-	req.IndexCode = utils.TrimStr(req.IndexCode)
-	req.IndexCode = strings.Replace(req.IndexCode, "\t", "", -1)
+		v.IndexCode = utils.TrimStr(v.IndexCode)
+		v.IndexCode = strings.Replace(v.IndexCode, "\t", "", -1)
 
-	//添加指标
-	mysteelChemicalIndexInfo, err, errMsg := data.AddMysteelChemicalIndex(req.BaseFromMysteelChemicalClassifyId, strings.ToUpper(req.IndexCode), req.UpdateWeek, req.UpdateTime, this.SysUser.AdminId, this.SysUser.RealName)
-	if errMsg != `` {
-		br.Msg = errMsg
-		br.ErrMsg = errMsg
-		if err != nil {
-			br.ErrMsg = errMsg + ";Err:" + err.Error()
-		} else {
-			br.IsSendEmail = false
+		//添加指标
+		mysteelChemicalIndexInfo, err, errMsg := data.AddMysteelChemicalIndex(v.BaseFromMysteelChemicalClassifyId, strings.ToUpper(v.IndexCode), v.UpdateWeek, v.UpdateTime, this.SysUser.AdminId, this.SysUser.RealName)
+		if errMsg != `` {
+			br.Msg = errMsg
+			br.ErrMsg = errMsg
+			if err != nil {
+				br.ErrMsg = errMsg + ";Err:" + err.Error()
+			} else {
+				br.IsSendEmail = false
+			}
+			return
+		}
+		if i == 0 {
+			resp.BaseFromMysteelChemicalIndexId = mysteelChemicalIndexInfo.BaseFromMysteelChemicalIndexId
+			resp.IndexCode = mysteelChemicalIndexInfo.IndexCode
+			resp.UniqueCode = fmt.Sprint(mysteelChemicalIndexInfo.BaseFromMysteelChemicalClassifyId, "_", mysteelChemicalIndexInfo.BaseFromMysteelChemicalIndexId)
 		}
-		return
 	}
 
-	resp := response.AddMysteelChemicalIndexInfoResp{
-		BaseFromMysteelChemicalIndexId: mysteelChemicalIndexInfo.BaseFromMysteelChemicalIndexId,
-		IndexCode:                      mysteelChemicalIndexInfo.IndexCode,
-		UniqueCode:                     fmt.Sprint(mysteelChemicalIndexInfo.BaseFromMysteelChemicalClassifyId, "_", mysteelChemicalIndexInfo.BaseFromMysteelChemicalIndexId),
-	}
+
+
 	br.Data = resp
 	br.Ret = 200
 	br.Msg = "保存成功"
@@ -881,7 +886,7 @@ func (this *EdbClassifyController) EditMysteelChemical() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	var req request.AddBaseFromMysteelChemicalReq
+	var req request.AddBaseFromMysteelChemicalReqItem
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
 	if err != nil {
 		br.Msg = "参数解析异常！"

models/data_manage/mysteel_chemical_classify.go

@@ -54,6 +54,7 @@ func EditBaseFromMysteelChemicalClassify(classifyId int, classifyName string) (e
 type BaseFromMysteelChemicalClassifyItems struct {
 	BaseFromMysteelChemicalClassifyId int                                        `orm:"column(base_from_mysteel_chemical_classify_id)"`
 	BaseFromMysteelChemicalIndexId    int                                        `orm:"column(base_from_mysteel_chemical_index_id)"`
+	IndexCode                         string                                     `description:"指标编码"`
 	ClassifyName                      string                                     `description:"分类名称"`
 	ParentId                          int                                        `description:"父级id"`
 	SysUserId                         int                                        `description:"创建人id"`

models/data_manage/mysteel_chemical_index.go

@@ -71,7 +71,7 @@ type MysteelChemicalFrequency struct {
 func GetMysteelChemicalIndexAll() (items []*BaseFromMysteelChemicalClassifyItems, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT base_from_mysteel_chemical_index_id,base_from_mysteel_chemical_classify_id,index_name AS classify_name,
-             sys_user_id,sys_user_real_name,sort
+             sys_user_id,sys_user_real_name,sort,index_code 
             FROM base_from_mysteel_chemical_index ORDER BY sort asc, create_time ASC `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return

models/data_manage/request/mysteel_chemical_data.go

@@ -27,13 +27,17 @@ type DelBaseFromMysteelChemicalClassifyReq struct {
 }
 
 // AddBaseFromMysteelChemicalReq 添加钢联化工请求
-type AddBaseFromMysteelChemicalReq struct {
+type AddBaseFromMysteelChemicalReqItem struct {
 	BaseFromMysteelChemicalIndexId    int    `description:"指标id"`
 	BaseFromMysteelChemicalClassifyId int    `description:"分类id"`
 	IndexCode                         string `description:"指标id"`
 	UpdateWeek                        string `description:"更新周期"`
 	UpdateTime                        string `description:"更新时间点，多个时间点用英文,隔开"`
 }
+// AddBaseFromMysteelChemicalReq 添加钢联化工请求
+type AddBaseFromMysteelChemicalReq struct {
+	List []AddBaseFromMysteelChemicalReqItem
+}
 
 // DelBaseFromMysteelChemicalReq 删除钢联化工请求
 type DelBaseFromMysteelChemicalReq struct {

services/data/mysteel_chemical.go

@@ -20,7 +20,7 @@ func AddMysteelChemicalClassify(classifyName string, parentId, level, sysUserId
 		return
 	}
 	if count > 0 {
-		errMsg = `分类名称已存在，请重新输入`
+		errMsg = `分类名称:`+classifyName+` 已存在，请重新输入`
 		return
 	}
 	//获取该层级下最大的排序数
@@ -269,7 +269,7 @@ func AddMysteelChemicalIndex(classifyId int, indexCode, updateWeek, updateTimeSt
 		return
 	}
 	if baseFromMysteelChemicalIndex != nil {
-		errMsg = `指标ID已存在，请重新输入`
+		errMsg = `指标ID:`+indexCode+` 已存在，请重新输入`
 		return
 	}
 	// 更新时间切割