|
|
@@ -58,10 +58,15 @@ func (d *BizObjectOAMMappingRepo) GetById(bizId, objectId, oamId, orId int64) (*
|
|
|
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)`
|
|
|
+ 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 `
|
|
|
sqlWhere += fmt.Sprintf(" AND A.biz_id = %d ", bizId)
|
|
|
sqlWhere += fmt.Sprintf(" AND A.object_id = %d ", objectId)
|
|
|
@@ -82,10 +87,15 @@ func (d *BizObjectOAMMappingRepo) GetListById(bizId, objectId, oamId int64) ([]v
|
|
|
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)`
|
|
|
+ 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 `
|
|
|
sqlWhere += fmt.Sprintf(" AND A.biz_id = %d ", bizId)
|
|
|
sqlWhere += fmt.Sprintf(" AND A.object_id = %d ", objectId)
|