|
|
@@ -23,11 +23,16 @@ func (d *BizObjectOAMMappingRepo) GetList(m map[string]interface{}) ([]viewmodel
|
|
|
B.object_title,
|
|
|
B.object_code,
|
|
|
C.oam_title,
|
|
|
- C.oam_code `
|
|
|
+ C.oam_code,
|
|
|
+ E.model_title AS mapping_model_title,
|
|
|
+ F.object_title AS mapping_object_title,
|
|
|
+ F.object_code AS mapping_object_code `
|
|
|
sqlFrom := ` FROM biz_object_oam_mapping AS A
|
|
|
LEFT JOIN biz_object AS B ON (A.biz_id = B.biz_id AND A.object_id = B.object_id)
|
|
|
- LEFT JOIN biz_object_oam AS C ON (A.biz_id = C.biz_id AND A.object_id = C.object_id AND A.oam_id = C.oam_id)`
|
|
|
- sqlWhere := ` WHERE A.deleted_flag = 0 `
|
|
|
+ LEFT JOIN biz_object_oam AS C ON (A.biz_id = C.biz_id AND A.object_id = C.object_id AND A.oam_id = C.oam_id)
|
|
|
+ LEFT JOIN ds_model AS E ON (A.mapping_model_id = E.model_id)
|
|
|
+ LEFT JOIN ds_object AS F ON (A.mapping_model_id = F.model_id AND A.mapping_object_id = F.object_id)`
|
|
|
+ sqlWhere := ` WHERE 1=1 `
|
|
|
if bizId, ok := m["bizId"]; ok {
|
|
|
sqlWhere += fmt.Sprintf(" AND A.biz_id = %d ", bizId)
|
|
|
}
|
|
|
@@ -37,7 +42,7 @@ func (d *BizObjectOAMMappingRepo) GetList(m map[string]interface{}) ([]viewmodel
|
|
|
if oamId, ok := m["oamId"]; ok {
|
|
|
sqlWhere += fmt.Sprintf(" AND A.oam_id = %d ", oamId)
|
|
|
}
|
|
|
- sqlOrderBy := " ORDER BY A.param_id ASC "
|
|
|
+ sqlOrderBy := " ORDER BY A.sort_no ASC "
|
|
|
|
|
|
datalist := make([]viewmodels.BizObjectOAMMappingInfo, 0)
|
|
|
err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
|
|
|
@@ -57,7 +62,7 @@ func (d *BizObjectOAMMappingRepo) GetById(bizId, objectId, oamId, orId int64) (*
|
|
|
sqlFrom := ` FROM biz_object_oam_mapping AS A
|
|
|
LEFT JOIN biz_object AS B ON (A.biz_id = B.biz_id AND A.object_id = B.object_id)
|
|
|
LEFT JOIN biz_object_oam AS C ON (A.biz_id = C.biz_id AND A.object_id = C.object_id AND A.oam_id = C.oam_id)`
|
|
|
- sqlWhere := ` WHERE A.deleted_flag = 0 `
|
|
|
+ sqlWhere := ` WHERE 1=1 `
|
|
|
sqlWhere += fmt.Sprintf(" AND A.biz_id = %d ", bizId)
|
|
|
sqlWhere += fmt.Sprintf(" AND A.object_id = %d ", objectId)
|
|
|
sqlWhere += fmt.Sprintf(" AND A.oam_id = %d ", oamId)
|
|
|
@@ -81,7 +86,7 @@ func (d *BizObjectOAMMappingRepo) GetListById(bizId, objectId, oamId int64) ([]v
|
|
|
sqlFrom := ` FROM biz_object_oam_mapping AS A
|
|
|
LEFT JOIN biz_object AS B ON (A.biz_id = B.biz_id AND A.object_id = B.object_id)
|
|
|
LEFT JOIN biz_object_oam AS C ON (A.biz_id = C.biz_id AND A.object_id = C.object_id AND A.oam_id = C.oam_id)`
|
|
|
- sqlWhere := ` WHERE A.deleted_flag = 0 `
|
|
|
+ sqlWhere := ` WHERE 1=1 `
|
|
|
sqlWhere += fmt.Sprintf(" AND A.biz_id = %d ", bizId)
|
|
|
sqlWhere += fmt.Sprintf(" AND A.object_id = %d ", objectId)
|
|
|
sqlWhere += fmt.Sprintf(" AND A.oam_id = %d ", oamId)
|