init

pkg/bpm/repository/wf_activity_action_def_repo.go

@@ -20,9 +20,8 @@ func NewWfActivityActionDefRepo(engine *xorm.Engine) *WfActivityActionDefRepo {
 }
 
 func (d *WfActivityActionDefRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
-    limit   := m["limit"].(int)
-    page    := m["page"].(int)
-
+    limit       := m["limit"].(int)
+    page        := m["page"].(int)
     sqlSelect   := `    SELECT      A.wf_def_id,
                                     A.activity_def_id,
                                     A.action_id,

pkg/bpm/repository/wf_activity_action_ins_repo.go

@@ -20,10 +20,9 @@ func NewWfActivityActionInsRepo(engine *xorm.Engine) *WfActivityActionInsRepo {
 }
 
 func (d *WfActivityActionInsRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
-    limit := m["limit"].(int)
-    page := m["page"].(int)
-
-    sqlSelect := `    SELECT      A.wf_def_id,
+    limit       := m["limit"].(int)
+    page        := m["page"].(int)
+    sqlSelect   := `    SELECT      A.wf_def_id,
                                     A.wf_ins_id,
                                     A.activity_def_id,
                                     A.activity_ins_id,
@@ -46,9 +45,9 @@ func (d *WfActivityActionInsRepo) GetPage(m map[string]interface{}) (*base.PageR
                                     A.position_name,
                                     A.account_id,
                                     A.account_name                              `
-    sqlFrom := `    FROM        wf_activity_action_ins AS A
+    sqlFrom     := `    FROM        wf_activity_action_ins AS A
                         LEFT JOIN   wf_activity_ins        AS B ON (A.oc_id = B.oc_id AND A.wf_ins_id = B.wf_ins_id  )`
-    sqlWhere := `    WHERE       A.deleted_flag = 0           `
+    sqlWhere    := `    WHERE       A.deleted_flag = 0           `
 
     if ocId, ok := m["ocId"]; ok {
         sqlWhere += fmt.Sprintf(" AND A.oc_id = %d ", ocId)
@@ -82,16 +81,17 @@ func (d *WfActivityActionInsRepo) GetPage(m map[string]interface{}) (*base.PageR
         return nil, err
     }
 
-    pageResult := &base.PageResult{}
-    pageResult.Data = datalist
-    pageResult.Total = total
-    pageResult.PageSize = limit
-    pageResult.Page = page
+    pageResult := &base.PageResult{
+        Total:    total,
+        PageSize: limit,
+        Page:     page,
+        Data:     datalist,
+    }
     return pageResult, nil
 }
 
 func (d *WfActivityActionInsRepo) GetList(m map[string]interface{}) ([]viewmodel.WfActivityActionInsInfo, error) {
-    sqlSelect := `    SELECT      A.wf_def_id,
+    sqlSelect   := `    SELECT      A.wf_def_id,
                                     A.wf_ins_id,
                                     A.activity_def_id,
                                     A.activity_ins_id,
@@ -114,9 +114,9 @@ func (d *WfActivityActionInsRepo) GetList(m map[string]interface{}) ([]viewmodel
                                     A.position_name,
                                     A.account_id,
                                     A.account_name                              `
-    sqlFrom := `    FROM        wf_activity_action_ins AS A
+    sqlFrom     := `    FROM        wf_activity_action_ins AS A
                         LEFT JOIN   wf_activity_ins        AS B ON (A.oc_id = B.oc_id AND A.wf_ins_id = B.wf_ins_id  ) `
-    sqlWhere := `    WHERE       A.deleted_flag = 0           `
+    sqlWhere    := `    WHERE       A.deleted_flag = 0           `
 
     if ocId, ok := m["ocId"]; ok {
         sqlWhere += fmt.Sprintf(" AND A.oc_id = %d ", ocId)
@@ -134,8 +134,8 @@ func (d *WfActivityActionInsRepo) GetList(m map[string]interface{}) ([]viewmodel
         sqlWhere += ` AND A.action_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
     }
 
-    sqlOrderBy := " ORDER BY A.wf_def_id, A.activity_def_id, A.action_id ASC "
-    datalist := make([]viewmodel.WfActivityActionInsInfo, 0)
+    sqlOrderBy  := " ORDER BY A.wf_def_id, A.activity_def_id, A.action_id ASC "
+    datalist    := make([]viewmodel.WfActivityActionInsInfo, 0)
     err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
     if err != nil {
         return nil, err
@@ -145,7 +145,7 @@ func (d *WfActivityActionInsRepo) GetList(m map[string]interface{}) ([]viewmodel
 }
 
 func (d *WfActivityActionInsRepo) GetById(ocId, wfInsId, activityInsId, actionInsId int64) (*viewmodel.WfActivityActionInsInfo, error) {
-    sqlSelect := `    SELECT      A.wf_def_id,
+    sqlSelect   := `    SELECT      A.wf_def_id,
                                     A.wf_ins_id,
                                     A.activity_def_id,
                                     A.activity_ins_id,
@@ -168,9 +168,9 @@ func (d *WfActivityActionInsRepo) GetById(ocId, wfInsId, activityInsId, actionIn
                                     A.position_name,
                                     A.account_id,
                                     A.account_name                              `
-    sqlFrom := `    FROM        wf_activity_action_ins AS A
+    sqlFrom     := `    FROM        wf_activity_action_ins AS A
                         LEFT JOIN   wf_activity_ins        AS B ON (A.oc_id = B.oc_id AND A.wf_ins_id = B.wf_ins_id )`
-    sqlWhere := `    WHERE       A.deleted_flag = 0           `
+    sqlWhere    := `    WHERE       A.deleted_flag = 0           `
 
     sqlWhere += fmt.Sprintf(" AND A.oc_id           = %d ", ocId)
     sqlWhere += fmt.Sprintf(" AND A.wf_ins_id       = %d ", wfInsId)
@@ -210,11 +210,11 @@ func (d *WfActivityActionInsRepo) Update(data *datamodel.WfActivityActionIns) er
 }
 
 func (d *WfActivityActionInsRepo) Delete(m map[string]interface{}) error {
-    ocId := m["ocId"].(int64)
-    wfInsId := m["wfInsId"].(int64)
-    activityInsId := m["activityInsId"].(int64)
-    actionInsId := m["actionInsId"].(int64)
-    deletedBy := m["deletedBy"].(int64)
+    ocId            := m["ocId"].(int64)
+    wfInsId         := m["wfInsId"].(int64)
+    activityInsId   := m["activityInsId"].(int64)
+    actionInsId     := m["actionInsId"].(int64)
+    deletedBy       := m["deletedBy"].(int64)
 
     data := &datamodel.WfActivityActionIns{}
     data.DeletedFlag = 1

pkg/bpm/repository/wf_activity_def_repo.go

@@ -20,17 +20,16 @@ func NewWfActivityDefRepo(engine *xorm.Engine) *WfActivityDefRepo {
 }
 
 func (d *WfActivityDefRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
-    limit := m["limit"].(int)
-    page := m["page"].(int)
-
-    sqlSelect := ` SELECT A.wf_def_id,
+    limit       := m["limit"].(int)
+    page        := m["page"].(int)
+    sqlSelect   := ` SELECT A.wf_def_id,
                             A.activity_def_id,
                             A.activity_def_title,
                             A.activity_def_desc,
                             A.activity_code,
                             A.form_code                  `
-    sqlFrom := ` FROM   wf_activity_def AS A         `
-    sqlWhere := ` WHERE  A.deleted_flag = 0           `
+    sqlFrom     := ` FROM   wf_activity_def AS A         `
+    sqlWhere    := ` WHERE  A.deleted_flag = 0           `
 
     if wfDefId, ok := m["wfDefId"]; ok {
         sqlWhere += fmt.Sprintf(" AND A.wf_def_id = %d ", wfDefId)
@@ -45,33 +44,33 @@ func (d *WfActivityDefRepo) GetPage(m map[string]interface{}) (*base.PageResult,
         return nil, err
     }
 
-    sqlOrderBy := " ORDER BY A.wf_def_id, A.activity_def_id ASC "
-    pageStart := (limit - 1) * limit
-    sqlLimit := fmt.Sprintf(" LIMIT %d OFFSET %d ", limit, pageStart)
-
-    datalist := make([]viewmodel.WfActivityDefInfo, 0)
+    sqlOrderBy  := " ORDER BY A.wf_def_id, A.activity_def_id ASC "
+    pageStart   := (limit - 1) * limit
+    sqlLimit    := fmt.Sprintf(" LIMIT %d OFFSET %d ", limit, pageStart)
+    datalist    := make([]viewmodel.WfActivityDefInfo, 0)
     err = d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy + sqlLimit).Find(&datalist)
     if err != nil {
         return nil, err
     }
 
-    pageResult := &base.PageResult{}
-    pageResult.Data = datalist
-    pageResult.Total = total
-    pageResult.PageSize = limit
-    pageResult.Page = page
+    pageResult := &base.PageResult{
+        Total:    total,
+        PageSize: limit,
+        Page:     page,
+        Data:     datalist,
+    }
     return pageResult, nil
 }
 
 func (d *WfActivityDefRepo) GetList(m map[string]interface{}) ([]viewmodel.WfActivityDefInfo, error) {
-    sqlSelect := ` SELECT A.wf_def_id,
+    sqlSelect   := ` SELECT A.wf_def_id,
                             A.activity_def_id,
                             A.activity_def_title,
                             A.activity_def_desc,
                             A.activity_code,
                             A.form_code                  `
-    sqlFrom := ` FROM   wf_activity_def  AS A        `
-    sqlWhere := ` WHERE  A.deleted_flag = 0           `
+    sqlFrom     := ` FROM   wf_activity_def  AS A        `
+    sqlWhere    := ` WHERE  A.deleted_flag = 0           `
 
     if wfDefId, ok := m["wfDefId"]; ok {
         sqlWhere += fmt.Sprintf(" AND A.wf_def_id = %d ", wfDefId)
@@ -80,8 +79,8 @@ func (d *WfActivityDefRepo) GetList(m map[string]interface{}) ([]viewmodel.WfAct
         sqlWhere += ` AND A.activity_def_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
     }
 
-    sqlOrderBy := " ORDER BY A.wf_def_id, A.activity_def_id ASC "
-    datalist := make([]viewmodel.WfActivityDefInfo, 0)
+    sqlOrderBy  := " ORDER BY A.wf_def_id, A.activity_def_id ASC "
+    datalist    := make([]viewmodel.WfActivityDefInfo, 0)
     err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
     if err != nil {
         return nil, err
@@ -91,16 +90,16 @@ func (d *WfActivityDefRepo) GetList(m map[string]interface{}) ([]viewmodel.WfAct
 }
 
 func (d *WfActivityDefRepo) GetById(wfDefId, activityDefId int64) (*viewmodel.WfActivityDefInfo, error) {
-    sqlSelect := ` SELECT A.wf_def_id,
+    sqlSelect   := ` SELECT A.wf_def_id,
                             A.activity_def_id,
                             A.activity_def_title,
                             A.activity_def_desc,
                             A.activity_code,
                             A.form_code                  `
-    sqlFrom := ` FROM   wf_activity_def AS A         `
-    sqlWhere := ` WHERE  A.deleted_flag = 0           `
-    sqlWhere += fmt.Sprintf(" AND A.wf_def_id       = %d ", wfDefId)
-    sqlWhere += fmt.Sprintf(" AND A.activity_def_id = %d ", activityDefId)
+    sqlFrom     := ` FROM   wf_activity_def AS A         `
+    sqlWhere    := ` WHERE  A.deleted_flag = 0           `
+    sqlWhere    += fmt.Sprintf(" AND A.wf_def_id       = %d ", wfDefId)
+    sqlWhere    += fmt.Sprintf(" AND A.activity_def_id = %d ", activityDefId)
 
     data := &viewmodel.WfActivityDefInfo{}
     has, err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere).Get(data)