作者 yangfu

审批修改

@@ -123,7 +123,7 @@ func UpdatetAuditFlowProcessNoApprove(o orm.Ormer, chanceId int64, level int, re @@ -123,7 +123,7 @@ func UpdatetAuditFlowProcessNoApprove(o orm.Ormer, chanceId int64, level int, re
123 //获取机会审核流信息 123 //获取机会审核流信息
124 func GetAuditFlowProcessList(chanceId int64) (v []*AuditFlowProcess, err error) { 124 func GetAuditFlowProcessList(chanceId int64) (v []*AuditFlowProcess, err error) {
125 o := orm.NewOrm() 125 o := orm.NewOrm()
126 - sql := "select * from audit_flow_process where chance_id=? and enable_status=1 order by approve_time ASC,review_status desc" 126 + sql := "select * from audit_flow_process where chance_id=? and enable_status=1 order by update_at ,level "
127 if _, err = o.Raw(sql, chanceId).QueryRows(&v); err == nil { 127 if _, err = o.Raw(sql, chanceId).QueryRows(&v); err == nil {
128 return v, nil 128 return v, nil
129 } 129 }
@@ -325,6 +325,7 @@ func ChanceApprove(header *protocol.RequestHeader, request *protocol.ChanceAppro @@ -325,6 +325,7 @@ func ChanceApprove(header *protocol.RequestHeader, request *protocol.ChanceAppro
325 mapProcess["ApproveTime"] = time.Now() 325 mapProcess["ApproveTime"] = time.Now()
326 mapProcess["IsActive"] = int8(0) 326 mapProcess["IsActive"] = int8(0)
327 mapChance["ApproveTime"] = time.Now() 327 mapChance["ApproveTime"] = time.Now()
  328 + mapChance["UpdateAt"] = time.Now()
328 if request.ReviewStatus == protocol.ReviewStatusPass { 329 if request.ReviewStatus == protocol.ReviewStatusPass {
329 mapProcess["BasicScore"] = request.ApproveData.Score.BasicScore 330 mapProcess["BasicScore"] = request.ApproveData.Score.BasicScore
330 mapProcess["ExtraScore"] = request.ApproveData.Score.ExtraScore 331 mapProcess["ExtraScore"] = request.ApproveData.Score.ExtraScore