|
@@ -333,8 +333,11 @@ func (this *MySteelChemicalController) GetIndexCreate() {
|
|
|
this.ServeJSON()
|
|
|
}()
|
|
|
|
|
|
+ // 终端编码
|
|
|
+ terminalCode := this.GetString("TerminalCode")
|
|
|
+
|
|
|
indexObj := new(models.BaseFromMysteelChemicalIndex)
|
|
|
- items, err := indexObj.GetIndexCreate()
|
|
|
+ items, err := indexObj.GetIndexCreate(terminalCode)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取失败"
|
|
|
br.ErrMsg = "获取指标失败, Err: " + err.Error()
|
|
@@ -571,6 +574,7 @@ func (this *MySteelChemicalController) MultiUpdateIndex() {
|
|
|
br.Msg = "操作成功"
|
|
|
}
|
|
|
|
|
|
+// AddMysteelIndex
|
|
|
// @Title 处理钢联指标的接口
|
|
|
// @Description 处理钢联指标的接口
|
|
|
// @Success 200 {object} models.AddMysteelIndexResp
|
|
@@ -659,6 +663,7 @@ func (this *MySteelChemicalController) GetIndexDetailByCode() {
|
|
|
br.Msg = "获取成功"
|
|
|
}
|
|
|
|
|
|
+// GetIndexCountByFrequency
|
|
|
// @Title 根据频度获取指标总数量
|
|
|
// @Description 根据频度获取指标总数量
|
|
|
// @Success 200 {object} models.HandleMysteelIndexResp
|
|
@@ -689,6 +694,10 @@ func (this *MySteelChemicalController) GetIndexCountByFrequency() {
|
|
|
pars = append(pars, req.EndDate)
|
|
|
}
|
|
|
|
|
|
+ // 终端编码
|
|
|
+ condition += ` AND terminal_code = ? `
|
|
|
+ pars = append(pars, req.TerminalCode)
|
|
|
+
|
|
|
condition += ` AND is_stop = 0 `
|
|
|
|
|
|
indexObj := new(models.BaseFromMysteelChemicalIndex)
|
|
@@ -704,7 +713,7 @@ func (this *MySteelChemicalController) GetIndexCountByFrequency() {
|
|
|
br.Msg = "处理成功"
|
|
|
}
|
|
|
|
|
|
-// GetNoMergeIndexByFrequencyPage
|
|
|
+// GetIndexLimitByFrequency
|
|
|
// @Title 获取未合并的指标列表
|
|
|
// @Description 获取未合并的指标列表
|
|
|
// @Success 200 {object} models.HandleMysteelIndexResp
|
|
@@ -736,6 +745,7 @@ func (this *MySteelChemicalController) GetIndexLimitByFrequency() {
|
|
|
br.Msg = "处理成功"
|
|
|
}
|
|
|
|
|
|
+// GetIndexPageByFrequency
|
|
|
// @Title 获取钢联指标分页数据
|
|
|
// @Description 获取钢联指标分页数据
|
|
|
// @Success 200 {object} models.HandleMysteelIndexResp
|
|
@@ -767,6 +777,10 @@ func (this *MySteelChemicalController) GetIndexPageByFrequency() {
|
|
|
pars = append(pars, req.EndDate)
|
|
|
}
|
|
|
|
|
|
+ // 终端编码
|
|
|
+ condition += ` AND terminal_code = ? `
|
|
|
+ pars = append(pars, req.TerminalCode)
|
|
|
+
|
|
|
condition += ` AND is_stop = 0 `
|
|
|
|
|
|
indexObj := new(models.BaseFromMysteelChemicalIndex)
|