Browse Source

fix:审核详情

zqbao 5 months ago
parent
commit
8d3eaec4e9
2 changed files with 5 additions and 4 deletions
  1. 3 3
      models/bi_approve/bi_approve_node.go
  2. 2 1
      services/bi_approve/bi_approve.go

+ 3 - 3
models/bi_approve/bi_approve_node.go

@@ -28,7 +28,7 @@ var BiApproveNodeCols = struct {
 	ApproveType     string
 	Users           string
 	CurrVersion     string
-	CreateTime      string
+	CreatedTime     string
 }{
 	BiApproveNodeId: "bi_approve_node_id",
 	BiApproveFlowId: "bi_approve_flow_id",
@@ -38,7 +38,7 @@ var BiApproveNodeCols = struct {
 	ApproveType:     "approve_type",
 	Users:           "users",
 	CurrVersion:     "curr_version",
-	CreateTime:      "create_time",
+	CreatedTime:     "created_time",
 }
 
 func (b *BiApproveNode) TableName() string {
@@ -50,7 +50,7 @@ func (m *BiApproveNode) GetItemsByCondition(condition string, pars []interface{}
 	if len(fieldArr) == 0 {
 		fields = `*`
 	}
-	order := `ORDER BY create_time DESC, bi_approve_node_id ASC`
+	order := `ORDER BY created_time DESC, bi_approve_node_id ASC`
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}

+ 2 - 1
services/bi_approve/bi_approve.go

@@ -637,7 +637,7 @@ func MyApplyBiApproves(adminId, classifyId, timeType, sortField, sortRule, appro
 	return
 }
 
-func GetApproveDetail(approveId int) (resp response.BiApproveDetail, msg string, err error) {
+func GetApproveDetail(approveId int) (resp *response.BiApproveDetail, msg string, err error) {
 	approveItem, e := biapprove.GetBiApproveById(approveId)
 	if e != nil {
 		if utils.IsErrNoRow(e) {
@@ -755,6 +755,7 @@ func GetApproveDetail(approveId int) (resp response.BiApproveDetail, msg string,
 	detail.Bi.BiId = approveItem.BiId
 	detail.Bi.BiTitle = approveItem.BiTitle
 	detail.Bi.BiClassify = cnClassifyIdName[approveItem.ClassifyId]
+	resp = detail
 	return
 }