up

repositories/repo_object.go

@@ -19,8 +19,14 @@ func NewRepoObjectRepo(engine *xorm.Engine) *RepoObjectRepo {
 }
 
 func (d *RepoObjectRepo) GetListById(repoId int64) ([]viewmodels.RepoObjectInfo, error) {
-    sqlSelect := ` SELECT A.*                  `
-    sqlFrom   := ` FROM  repo_object   AS A    `
+    sqlSelect := ` SELECT A.*  ,
+                          B.model_title,
+                          C.object_title,
+                          C.object_code,
+                          C.object_type           `
+    sqlFrom   := ` FROM  repo_object   AS A
+                   LEFT JOIN ds_model  AS B ON (A.model_id = B.model_id)
+                   LEFT JOIN ds_object AS C ON (A.model_id = C.model_id AND A.object_id = C.object_id) `
     sqlWhere  := ` WHERE A.deleted_flag = 0    `
     sqlWhere  += fmt.Sprintf(" AND A.repo_id = %d ", repoId)
     sqlOrderBy := " ORDER BY A.model_id, A.object_id ASC "

viewmodels/repo_object_info.go

@@ -1,12 +1,13 @@
 package viewmodels
 
 type RepoObjectInfo struct {
-    RepoId          int64     `json:"repoId"          xorm:"'repo_id'         bigint      pk comment('主键ID')    "`
-    ModelId         int64     `json:"modelId"         xorm:"'model_id'        bigint      pk comment('主键ID')    "`
-    ObjectId        int64     `json:"objectId"        xorm:"'object_id'       bigint      pk comment('Object ID')        "`
-    ObjectType      int64     `json:"objectType"      xorm:"'object_type'     bigint         comment('Object Type')      "`
-    ObjectTitle     string    `json:"objectTitle"     xorm:"'object_title'    varchar(127)   comment('Object Title')     "`
-    ObjectCode      string    `json:"objectCode"      xorm:"'object_code'     varchar(127)   comment('Object Code')      "`
+    RepoId          int64     `json:"repoId"          xorm:"'repo_id'         bigint      pk comment('主键ID')        "`
+    ModelId         int64     `json:"modelId"         xorm:"'model_id'        bigint      pk comment('主键ID')        "`
+    ModelTitle      string    `json:"modelTitle"      xorm:"'model_title'     varchar(127)   comment('Object Title') "`
+    ObjectId        int64     `json:"objectId"        xorm:"'object_id'       bigint      pk comment('Object ID')    "`
+    ObjectType      int64     `json:"objectType"      xorm:"'object_type'     bigint         comment('Object Type')  "`
+    ObjectTitle     string    `json:"objectTitle"     xorm:"'object_title'    varchar(127)   comment('Object Title') "`
+    ObjectCode      string    `json:"objectCode"      xorm:"'object_code'     varchar(127)   comment('Object Code')  "`
 }
 
 func (t *RepoObjectInfo) TableName() string {