排行榜修改

@@ -12,6 +12,7 @@ type ChanceReviseLog struct {
 	UserCompanyId  int64     `orm:"column(user_company_id);null" description:"用户编号 编辑机会的人"`
 	UserCompanyId  int64     `orm:"column(user_company_id);null" description:"用户编号 编辑机会的人"`
 	Data           string    `orm:"column(data);null" description:"机会数据"`
 	Data           string    `orm:"column(data);null" description:"机会数据"`
 	CreateAt       time.Time `orm:"column(create_at);type(timestamp);null" description:"创建时间"`
 	CreateAt       time.Time `orm:"column(create_at);type(timestamp);null" description:"创建时间"`
+	AuditFlowLogId int64     `orm:"column(audit_flow_log_id)" description:"审核流日志表"`
 }
 }
 
 
 func (t *ChanceReviseLog) TableName() string {
 func (t *ChanceReviseLog) TableName() string {

@@ -68,6 +68,7 @@ var ApproveLog = map[int]string{
 	7:  "修改了公开状态：公司公开",                                     //审批通过后修改公开状态（公司公开）
 	7:  "修改了公开状态：公司公开",                                     //审批通过后修改公开状态（公司公开）
 	8:  "修改了公开状态：%v",                                       //审批通过后修改公开状态（部门公开)
 	8:  "修改了公开状态：%v",                                       //审批通过后修改公开状态（部门公开)
 	9:  "修改了基础评分：“修改后的基础评分%v分，修改后的附加评分%v分，修改后的价值评分%v分“",    //审批通过后修改评分
 	9:  "修改了基础评分：“修改后的基础评分%v分，修改后的附加评分%v分，修改后的价值评分%v分“",    //审批通过后修改评分
+	10: "补充了机会信息",                                          //审批通过后补充机会
 }
 }
 
 
 //用户项
 //用户项

@@ -278,6 +278,12 @@ func logMsgWithHeaer(header *protocol.RequestHeader, msg *models.UserMsg, name s
 
 
 //保查审核日志
 //保查审核日志
 func SaveApproveLog(orm orm.Ormer, code int, userId int64, chanceId int64, param ...interface{}) (err error) {
 func SaveApproveLog(orm orm.Ormer, code int, userId int64, chanceId int64, param ...interface{}) (err error) {
+	_, err = SaveApproveLogResult(orm, code, userId, chanceId, param...)
+	return
+}
+
+//保查审核日志
+func SaveApproveLogResult(orm orm.Ormer, code int, userId int64, chanceId int64, param ...interface{}) (id int64, err error) {
 	var (
 	var (
 		message string
 		message string
 		ok      bool
 		ok      bool
@@ -287,7 +293,7 @@ func SaveApproveLog(orm orm.Ormer, code int, userId int64, chanceId int64, param
 		return
 		return
 	}
 	}
 	message = fmt.Sprintf(message, param...)
 	message = fmt.Sprintf(message, param...)
-	if _, err = orm.Insert(&models.AuditFlowLog{
+	if id, err = orm.Insert(&models.AuditFlowLog{
 		ChanceId:      chanceId,
 		ChanceId:      chanceId,
 		Content:       message,
 		Content:       message,
 		ApproveUserId: userId,
 		ApproveUserId: userId,

@@ -578,7 +578,7 @@ func ChanceUpdate(header *protocol.RequestHeader, request *protocol.ChanceUpdate
 	}
 	}
 	auditConfig = &protocol.AuditConfig{NoApprover: template.NoApprover}
 	auditConfig = &protocol.AuditConfig{NoApprover: template.NoApprover}
 
 
-	CheckChanceDifferent(header, chance, request)
+	go CheckChanceDifferent(header, chance, request)
 
 
 	orm := orm.NewOrm()
 	orm := orm.NewOrm()
 	orm.Begin()
 	orm.Begin()
@@ -727,6 +727,9 @@ func CheckChanceDifferent(header *protocol.RequestHeader, chance *models.Chance,
 	if header.UserId == chance.UserId {
 	if header.UserId == chance.UserId {
 		return
 		return
 	}
 	}
+	if chance.ReviewStatus != protocol.ReviewStatusPass {
+		return
+	}
 	var modifyLog = protocol.ChanceReviseLog{}
 	var modifyLog = protocol.ChanceReviseLog{}
 	checkIsSaveLog := func() {
 	checkIsSaveLog := func() {
 		if !isSaveLog {
 		if !isSaveLog {
@@ -799,6 +802,15 @@ func CheckChanceDifferent(header *protocol.RequestHeader, chance *models.Chance,
 	if isSaveLog {
 	if isSaveLog {
 		orm := orm.NewOrm()
 		orm := orm.NewOrm()
 		orm.Begin()
 		orm.Begin()
+		var logId int64
+		//发送日志
+		if id, err := agg.SaveApproveLogResult(orm, 10, header.UserId, chance.Id); err != nil {
+			log.Error(err)
+			orm.Rollback()
+			return
+		} else {
+			logId = id
+		}
 		//保存修改详情
 		//保存修改详情
 		chanceReviseLog = &models.ChanceReviseLog{
 		chanceReviseLog = &models.ChanceReviseLog{
 			Id:             idgen.Next(),
 			Id:             idgen.Next(),
@@ -806,6 +818,7 @@ func CheckChanceDifferent(header *protocol.RequestHeader, chance *models.Chance,
 			UserCompanyId:  header.UserId,
 			UserCompanyId:  header.UserId,
 			Data:           common.AssertJson(modifyLog),
 			Data:           common.AssertJson(modifyLog),
 			CreateAt:       time.Now(),
 			CreateAt:       time.Now(),
+			AuditFlowLogId: logId,
 		}
 		}
 		if _, e := orm.Insert(chanceReviseLog); e != nil {
 		if _, e := orm.Insert(chanceReviseLog); e != nil {
 			log.Error(e)
 			log.Error(e)

@@ -14,6 +14,10 @@ import (
 	"time"
 	"time"
 )
 )
 
 
+const (
+	RankGoroutineNum = 1
+)
+
 var ComputeRankScoreFlag int32
 var ComputeRankScoreFlag int32
 var rankList = initRankList()
 var rankList = initRankList()
 
 
@@ -44,7 +48,7 @@ type RankOption struct {
 type RankResult struct{}
 type RankResult struct{}
 
 
 //计算排行分
 //计算排行分
-func ComputeRankScore() error {
+func ComputeRankScore() (err error) {
 	defer func() {
 	defer func() {
 		if p := recover(); p != nil {
 		if p := recover(); p != nil {
 			log.Error(p)
 			log.Error(p)
@@ -60,7 +64,14 @@ func ComputeRankScore() error {
 		atomic.CompareAndSwapInt32(&ComputeRankScoreFlag, 1, 0)
 		atomic.CompareAndSwapInt32(&ComputeRankScoreFlag, 1, 0)
 	}()
 	}()
 	//TODO:启用多个协程执行
 	//TODO:启用多个协程执行
-	return computeRankScore()
+	if err = computeRankScore(); err != nil {
+		log.Error(err)
+	}
+
+	//更新状态
+	//结束过期的到期的榜单
+	//开始等待的榜单
+	return
 }
 }
 func computeRankScore() (err error) {
 func computeRankScore() (err error) {
 	var (
 	var (