Merge remote-tracking branch 'origin/dev' into test

@@ -248,6 +248,27 @@ func (this *ChanceController) Templates() {
 	msg = protocol.NewReturnResponse(chance.Templates(header, request))
 	msg = protocol.NewReturnResponse(chance.Templates(header, request))
 }
 }
 
 
+//Template 模板详情
+//@router /template [post]
+func (this *ChanceController) Template() {
+	var msg *protocol.ResponseMessage
+	defer func() {
+		this.Resp(msg)
+	}()
+	var request *protocol.TemplateRequest
+	if err := json.Unmarshal(this.ByteBody, &request); err != nil {
+		log.Error(err)
+		msg = protocol.BadRequestParam(1)
+		return
+	}
+	if b, m := this.Valid(request); !b {
+		msg = m
+		return
+	}
+	header := controllers.GetRequestHeader(this.Ctx)
+	msg = protocol.NewReturnResponse(chance.Template(header, request))
+}
+
 //ChanceSubmit 提交机会
 //ChanceSubmit 提交机会
 //@router /submit [post]
 //@router /submit [post]
 func (this *ChanceController) ChanceSubmit() {
 func (this *ChanceController) ChanceSubmit() {
@@ -266,11 +287,32 @@ func (this *ChanceController) ChanceSubmit() {
 		return
 		return
 	}
 	}
 	header := controllers.GetRequestHeader(this.Ctx)
 	header := controllers.GetRequestHeader(this.Ctx)
-	if request.Id > 0 {
-		msg = protocol.NewReturnResponse(chance.ChanceUpdate(header, request))
+	//if request.Id > 0 {
+	//	msg = protocol.NewReturnResponse(chance.ChanceUpdate(header, request))
+	//	return
+	//}
+	msg = protocol.NewReturnResponse(chance.ChanceSubmit(header, request))
+}
+
+//ChanceUpdate 机会更新
+//@router /update [post]
+func (this *ChanceController) ChanceUpdate() {
+	var msg *protocol.ResponseMessage
+	defer func() {
+		this.Resp(msg)
+	}()
+	var request *protocol.ChanceUpdateRequest
+	if err := json.Unmarshal(this.ByteBody, &request); err != nil {
+		log.Error(err)
+		msg = protocol.BadRequestParam(1)
 		return
 		return
 	}
 	}
-	msg = protocol.NewReturnResponse(chance.ChanceSubmit(header, request))
+	if b, m := this.Valid(request); !b {
+		msg = m
+		return
+	}
+	header := controllers.GetRequestHeader(this.Ctx)
+	msg = protocol.NewReturnResponse(chance.ChanceUpdate(header, request))
 }
 }
 
 
 //ChanceStatistics 机会统计
 //ChanceStatistics 机会统计

@@ -139,3 +139,32 @@ func CloseAuditFlowProcess(chanceId int64) (err error) {
 	}
 	}
 	return
 	return
 }
 }
+
+//获取当前审批节点 是否已经有人审核通过的
+func GetAuditFlowProcessApproved(chanceId int64, level int) (v *[]AuditFlowProcess, err error) {
+	o := orm.NewOrm()
+	sql := "select id from audit_flow_process  where chance_id=? and level=? and is_active=1 and review_status<>1 and enable_status=1"
+	if _, err = o.Raw(sql, chanceId, level).QueryRows(&v); err != nil {
+		return
+	}
+	return
+}
+
+//按审核状态获取审核流程
+func GetAuditFlowProcessByReview(chanceId int64, level int, reviewStatus int) (v *AuditFlowProcess, err error) {
+	o := orm.NewOrm()
+	sql := "select * from audit_flow_process  where chance_id=? and level=? and is_active=1 and review_status=? and enable_status=1"
+	if err = o.Raw(sql, chanceId, level, reviewStatus).QueryRow(&v); err != nil {
+		return
+	}
+	return
+}
+
+//更新提交
+func UpdatetAuditFlowProcessToSubmit(o orm.Ormer, chanceId int64, level int, reviewStatus int, userId int64) (err error) {
+	sql := "update audit_flow_process set enable_status =1,is_active=0,update_at=now(),review_status=?  where chance_id=? and uid=? and level=? and review_status=0 and enable_status=1"
+	if err = utils.ExecuteSQLWithOrmer(o, sql, reviewStatus, chanceId, userId, level); err != nil {
+		return
+	}
+	return
+}

@@ -100,3 +100,14 @@ func GetAuditTemplateExample(id int64) (v string, err error) {
 	}
 	}
 	return
 	return
 }
 }
+
+//按 1.公司编号 2.机会类型编号 3.模板编号
+//获取审核模板列表
+func GetAuditTemplate(companyId int64, chanceTypeId, templateId int) (v *AuditTemplate, err error) {
+	o := orm.NewOrm()
+	sql := "select * from audit_template where id=? and company_id=? and chance_type_id=? and enable_status=1"
+	if err = o.Raw(sql, templateId, companyId, chanceTypeId).QueryRow(&v); err == nil {
+		return
+	}
+	return
+}

@@ -15,8 +15,8 @@ const (
 )
 )
 
 
 const (
 const (
-	ActionTypeOr  = 1
-	ActionTypeAnd = 2
+	ActionTypeAnd = 1 //会签
+	ActionTypeOr  = 2 //或签
 )
 )
 
 
 //审核类型
 //审核类型
@@ -92,6 +92,15 @@ type TemplatesResponse struct {
 	Templates []*Template `json:"list"`
 	Templates []*Template `json:"list"`
 }
 }
 
 
+/*Template 模板详情*/
+type TemplateRequest struct {
+	ChanceTypeId int `json:"chanceTypeId" valid:"Required"`
+	TemplateId   int `json:"templateId" valid:"Required"`
+}
+type TemplateResponse struct {
+	Template *Template `json:"template"`
+}
+
 /*ChanceExample 机会示例*/
 /*ChanceExample 机会示例*/
 type ChanceExampleRequest struct {
 type ChanceExampleRequest struct {
 	TemplateId int `json:"templateId" valid:"Required"`
 	TemplateId int `json:"templateId" valid:"Required"`
@@ -114,6 +123,22 @@ type ChanceSubmitRequest struct {
 type ChanceSubmitResponse struct {
 type ChanceSubmitResponse struct {
 }
 }
 
 
+/*ChanceUpdate 机会更新*/
+type ChanceUpdateRequest struct {
+	Id int64 `json:"id"` // = 0添加  >0 编辑
+	//AuditTemplateId   int64     `json:"auditTemplateId" valid:"Required"`
+	Content           string    `json:"content"`
+	FormList          []*Form   `json:"formList" valid:"Required"`
+	Speechs           []Speech  `json:"speechs"`
+	Pictures          []Picture `json:"pictures"`
+	Videos            []Video   `json:"videos"`
+	RelatedDepartment int64     `json:"relatedDepartments" valid:"Required"`
+
+	IsPublish bool `json:"isPublish"` //是否重新发布
+}
+type ChanceUpdateResponse struct {
+}
+
 /*ChanceStatistics 首页-机会池统计*/
 /*ChanceStatistics 首页-机会池统计*/
 type ChanceStatisticsRequest struct {
 type ChanceStatisticsRequest struct {
 }
 }
@@ -361,6 +386,8 @@ type ChanceChangeScoreRequest struct {
 	Score    Score `json:"score"`
 	Score    Score `json:"score"`
 }
 }
 type ChanceChangeScoreResponse struct {
 type ChanceChangeScoreResponse struct {
+	DiscoveryScore        float64 `json:"discoveryScore"`        //发现分
+	DiscoveryScorePercent int     `json:"discoveryScorePercent"` //发现分-百分比
 }
 }
 
 
 /*ChanceCalculateScore 计算发现分*/
 /*ChanceCalculateScore 计算发现分*/

@@ -54,6 +54,18 @@ func init() {
 	MapStaticName[MyAuditChanceReturn] = "我审核的机会-已退回"
 	MapStaticName[MyAuditChanceReturn] = "我审核的机会-已退回"
 }
 }
 
 
+var ApproveLog = map[int]string{
+	1: "提交了机会",                                         //提交人提交机会
+	2: "删除了机会",                                         //提交人删除机会
+	3: "退回了机会",                                         //审批人退回机会
+	4: "通过了机会；基础评分：%v分，附加评分：%v分，价值评分：%v分，公开状态：公司公开",    //审批人通过机会（公司公开）
+	5: "通过了机会；基础评分：%v分，附加评分：%v分，价值评分：%v分，公开状态：%v",      //审批人通过机会（部门公开） 测试部、销售部
+	6: "系统  自动通过了机会；基础评分：0，附加评分：0，价值评分：0，公开状态：公司公开",    //审批人通过了机会（系统自动通过）
+	7: "修改了公开状态：公司公开",                                  //审批通过后修改公开状态（公司公开）
+	8: "修改了公开状态：%v",                                    //审批通过后修改公开状态（部门公开)
+	9: "修改了基础评分：“修改后的基础评分%v分，修改后的附加评分%v分，修改后的价值评分%v分“", //审批通过后修改评分
+}
+
 //用户项
 //用户项
 type UserItem struct {
 type UserItem struct {
 	Uid  int64  `json:"uid"`
 	Uid  int64  `json:"uid"`

@@ -241,6 +241,14 @@ func init() {
 
 
 	beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"],
 	beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"],
 		beego.ControllerComments{
 		beego.ControllerComments{
+			Method:           "Template",
+			Router:           `/template`,
+			AllowHTTPMethods: []string{"post"},
+			MethodParams:     param.Make(),
+			Params:           nil})
+
+	beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"],
+		beego.ControllerComments{
 			Method:           "Templates",
 			Method:           "Templates",
 			Router:           `/templates`,
 			Router:           `/templates`,
 			AllowHTTPMethods: []string{"post"},
 			AllowHTTPMethods: []string{"post"},
@@ -255,6 +263,14 @@ func init() {
 			MethodParams:     param.Make(),
 			MethodParams:     param.Make(),
 			Params:           nil})
 			Params:           nil})
 
 
+	beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"],
+		beego.ControllerComments{
+			Method:           "ChanceUpdate",
+			Router:           `/update`,
+			AllowHTTPMethods: []string{"post"},
+			MethodParams:     param.Make(),
+			Params:           nil})
+
 	beego.GlobalControllerRouter["opp/controllers/v1:CommendController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:CommendController"],
 	beego.GlobalControllerRouter["opp/controllers/v1:CommendController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:CommendController"],
 		beego.ControllerComments{
 		beego.ControllerComments{
 			Method:           "Company",
 			Method:           "Company",

@@ -349,7 +349,7 @@ func ChanceApprove(header *protocol.RequestHeader, request *protocol.ChanceAppro
 		mapChance["ReviewStatus"] = int8(request.ReviewStatus) //退回也要更新审核状态
 		mapChance["ReviewStatus"] = int8(request.ReviewStatus) //退回也要更新审核状态
 		//增加一条待处理记录到审核列表
 		//增加一条待处理记录到审核列表
 		//生成提交记录
 		//生成提交记录
-		if _, err = orm.Insert(GenAuditFlowProcess_Submit(header, chance.Id, chance.AuditTemplateId, protocol.ReviewStatusWait)); err != nil {
+		if _, err = orm.Insert(GenAuditFlowProcess_Submit(chance.UserId, chance.Id, chance.AuditTemplateId, protocol.ReviewStatusWait)); err != nil {
 			log.Error(err)
 			log.Error(err)
 			orm.Rollback()
 			orm.Rollback()
 			return
 			return

@@ -235,6 +235,48 @@ func Templates(header *protocol.RequestHeader, request *protocol.TemplatesReques
 	return
 	return
 }
 }
 
 
+//模板详情
+func Template(header *protocol.RequestHeader, request *protocol.TemplateRequest) (rsp *protocol.TemplateResponse, err error) {
+	var (
+		templates *models.AuditTemplate
+		forms     []*models.AuditForm
+	)
+	rsp = &protocol.TemplateResponse{}
+	if templates, err = models.GetAuditTemplate(header.CompanyId, request.ChanceTypeId, request.TemplateId); err != nil {
+		log.Error(fmt.Sprintf("公司:%v chance_type_id:%v  id:%v无模板 ", header.CompanyId, request.ChanceTypeId, request.TemplateId), err)
+		return
+	}
+	item := templates
+	//TODO:检查模板可见
+	//
+	//查询表单
+	if forms, err = models.GetAuditForms(header.CompanyId, item.Id); err != nil {
+		log.Error(err)
+		return
+	}
+	template := &protocol.Template{
+		Id:       item.Id,
+		Name:     item.Name,
+		Icon:     item.Icon,
+		Doc:      item.Doc,
+		FormList: make([]*protocol.Form, len(forms)),
+		Link:     fmt.Sprintf("%v/#/ability/opportunity?id=%v", beego.AppConfig.String("h5_host"), item.Id),
+	}
+	for j := range forms {
+		form := forms[j]
+		template.FormList[j] = &protocol.Form{
+			Id:          form.Id,
+			Label:       form.Label,
+			Value:       "",
+			InputType:   form.InputType,
+			SectionType: form.Section,
+			Required:    form.Required,
+		}
+	}
+	rsp.Template = template
+	return
+}
+
 func checkTemplateIsVisible(header *protocol.RequestHeader, template *models.AuditTemplate) (result bool, err error) {
 func checkTemplateIsVisible(header *protocol.RequestHeader, template *models.AuditTemplate) (result bool, err error) {
 	//if template.VisibleType ==
 	//if template.VisibleType ==
 	return
 	return
@@ -302,7 +344,7 @@ func ChanceSubmit(header *protocol.RequestHeader, request *protocol.ChanceSubmit
 	}
 	}
 
 
 	//生成提交记录
 	//生成提交记录
-	if _, err = orm.Insert(GenAuditFlowProcess_Submit(header, chance.Id, template.Id, protocol.ReviewStatusSubmit)); err != nil {
+	if _, err = orm.Insert(GenAuditFlowProcess_Submit(header.UserId, chance.Id, template.Id, protocol.ReviewStatusSubmit)); err != nil {
 		log.Error(err)
 		log.Error(err)
 		orm.Rollback()
 		orm.Rollback()
 		return
 		return
@@ -368,35 +410,67 @@ func ChanceSubmit(header *protocol.RequestHeader, request *protocol.ChanceSubmit
 }
 }
 
 
 //机会编辑
 //机会编辑
-func ChanceUpdate(header *protocol.RequestHeader, request *protocol.ChanceSubmitRequest) (rsp *protocol.ChanceSubmitResponse, err error) {
+func ChanceUpdate(header *protocol.RequestHeader, request *protocol.ChanceUpdateRequest) (rsp *protocol.ChanceUpdateResponse, err error) {
 	var (
 	var (
 		template    *models.AuditTemplate
 		template    *models.AuditTemplate
 		chance      *models.Chance
 		chance      *models.Chance
 		auditConfig *protocol.AuditConfig
 		auditConfig *protocol.AuditConfig
 		chanceData  *models.ChanceData
 		chanceData  *models.ChanceData
-		//auditFlows  []*models.AuditFlowProcess
+		//auditFlows  *models.AuditFlowProcess
 		updateMap = make(map[string]interface{})
 		updateMap = make(map[string]interface{})
+
+		auditFlows    []*models.AuditFlowProcess
+		suplusApprove SuplusApprove
+		chanceType    *models.ChanceType
 	)
 	)
+	//验证机会是否存在
 	if chance, err = models.GetChanceById(request.Id); err != nil {
 	if chance, err = models.GetChanceById(request.Id); err != nil {
-		log.Error(err)
+		log.Error(request.Id, err)
+		err = protocol.NewErrWithMessage(5101)
+		return
+	}
+	//1.模板是否存在
+	if template, err = models.GetAuditTemplateById(int64(chance.AuditTemplateId)); err != nil {
+		log.Error("模板不存在：", chance.AuditTemplateId, err)
 		return
 		return
 	}
 	}
-	//TODO:非本人 1.需要验证角色权限,是否是审核人
+	if chanceType, err = models.GetChanceTypeById(chance.ChanceTypeId); err != nil {
+		log.Error("一级分类不存在：", chance.ChanceTypeId, err)
+		return
+	}
+	//编辑重新发布 是否可以重新发布
+	if request.IsPublish && chance.ReviewStatus == protocol.ReviewStatusReturn && chance.UserId == header.UserId {
+		request.IsPublish = false
+		//当前没有被人审核过
+		//if _, e := models.GetAuditFlowProcessApproved(request.Id, 1); e == orm.ErrNoRows && chance.AuditLevel == 1 {
+		//	//当前状态是退回-待处理
+		//
+		//}
+		if _, e := models.GetAuditFlowProcessByReview(request.Id, 0, protocol.ReviewStatusWait); e == nil {
+			request.IsPublish = true
+		}
+	} else {
+		request.IsPublish = false
+	}
+	//TODO:非本人 1.需要验证角色权限 2是否是审核人 3.是否是本人 (目前本人才可以审核)
 	if chance.UserId != header.Uid {
 	if chance.UserId != header.Uid {
-		err = protocol.NewErrWithMessage(1)
+		err = protocol.NewErrWithMessage(5206)
 		log.Error(fmt.Sprintf("user:%v 无权限操作机会 chance:%v", header.Uid, chance.Id))
 		log.Error(fmt.Sprintf("user:%v 无权限操作机会 chance:%v", header.Uid, chance.Id))
 		return
 		return
 	}
 	}
-	//TODO:验证机会当前是否在审核中
 	//1.模板是否存在
 	//1.模板是否存在
-	if template, err = models.GetAuditTemplateById(request.AuditTemplateId); err != nil {
-		log.Error("模板不存在：", request.AuditTemplateId, err)
+	if template, err = models.GetAuditTemplateById(chance.AuditTemplateId); err != nil {
+		log.Error("模板不存在：", chance.AuditTemplateId, err)
+		err = protocol.NewErrWithMessage(5301)
 		return
 		return
 	}
 	}
 	auditConfig = &protocol.AuditConfig{NoApprover: template.NoApprover}
 	auditConfig = &protocol.AuditConfig{NoApprover: template.NoApprover}
 	orm := orm.NewOrm()
 	orm := orm.NewOrm()
 	orm.Begin()
 	orm.Begin()
 	{
 	{
+		if request.IsPublish {
+			updateMap["ReviewStatus"] = int8(protocol.ReviewStatusAuditging)
+		}
 		updateMap["AuditTemplateConfig"] = common.AssertJson(auditConfig)
 		updateMap["AuditTemplateConfig"] = common.AssertJson(auditConfig)
 		updateMap["Content"] = request.Content
 		updateMap["Content"] = request.Content
 		updateMap["SourceContent"] = common.AssertJson(request.FormList)
 		updateMap["SourceContent"] = common.AssertJson(request.FormList)
@@ -440,11 +514,56 @@ func ChanceUpdate(header *protocol.RequestHeader, request *protocol.ChanceSubmit
 			}
 			}
 		}
 		}
 	}
 	}
-	orm.Commit()
 
 
-	//6.激活审核流
-	//TODO:7.发送消息通知给审核人（审核消息）
-	rsp = &protocol.ChanceSubmitResponse{}
+	{
+		if request.IsPublish {
+
+			//更新待处理->提交
+			if err = models.UpdatetAuditFlowProcessToSubmit(orm, request.Id, 0, protocol.ReviewStatusSubmit, header.UserId); err != nil {
+				log.Error(err)
+				orm.Rollback()
+				return
+			}
+			//4.查询审核配置
+			//5.生成审核流
+			if auditFlows, err = GenAuditFlowProcess(header, chance.Id, chance.DepartmentId, template.Id, auditConfig); err != nil {
+				log.Error(err)
+				orm.Rollback()
+				return
+			}
+			for i := 0; i < len(auditFlows); i++ {
+				auditFlows[i].ApproveMessage = fmt.Sprintf(protocol.MessageApproving, chanceType.Name)
+				//auditFlows[i].TemplateId = int(template.Id)
+				if _, err = orm.Insert(auditFlows[i]); err != nil {
+					log.Error(err)
+					orm.Rollback()
+					return
+				}
+			}
+			if len(auditFlows) > 0 {
+				//7.发送审批实例给审批服务器
+				if m, e := suplusApprove.NewApproveInstance(header, auditFlows); e != nil {
+					log.Error(fmt.Sprintf("uid:%v", header.UserId), "request suplus-approve.NewApproveInstance err", e)
+					orm.Rollback()
+					err = e
+					return
+				} else {
+					//7.发送消息通知给审核人（审核消息）
+					for i := range m.MessageData {
+						message := m.MessageData[i]
+						if err = agg.SendApproveMsg(message.ReceiverInfo.ReceiverUid, message.ReceiverInfo.ReceiverName,
+							header.CompanyId, chance.Id, chance.ChanceTypeId, protocol.ReviewStatusAuditging); err != nil {
+							log.Error(err)
+							orm.Rollback()
+							return
+						}
+					}
+				}
+			}
+		}
+	}
+	orm.Commit()
+	rsp = &protocol.ChanceUpdateResponse{}
 	return
 	return
 }
 }
 
 
@@ -549,7 +668,10 @@ func ChanceChangeScore(header *protocol.RequestHeader, request *protocol.ChanceC
 		return
 		return
 	}
 	}
 	orm.Commit()
 	orm.Commit()
-	rsp = &protocol.ChanceChangeScoreResponse{}
+	rsp = &protocol.ChanceChangeScoreResponse{
+		DiscoveryScore:        result.DiscoveryScore,
+		DiscoveryScorePercent: result.DiscoveryScorePercent,
+	}
 	return
 	return
 }
 }
 
 
@@ -626,18 +748,19 @@ func ChancePermission(header *protocol.RequestHeader, request *protocol.ChancePe
 }
 }
 
 
 //生成审批流-提交记录
 //生成审批流-提交记录
-func GenAuditFlowProcess_Submit(header *protocol.RequestHeader, chanceId int64, templateId int64, reviewStatus int) (v *models.AuditFlowProcess) {
+func GenAuditFlowProcess_Submit(userId, chanceId int64, templateId int64, reviewStatus int) (v *models.AuditFlowProcess) {
 	v = &models.AuditFlowProcess{
 	v = &models.AuditFlowProcess{
 		Id:           idgen.Next(),
 		Id:           idgen.Next(),
 		ChanceId:     chanceId,
 		ChanceId:     chanceId,
-		Uid:          header.UserId,
+		Uid:          userId,
 		CreateAt:     time.Now(),
 		CreateAt:     time.Now(),
 		UpdateAt:     time.Now(),
 		UpdateAt:     time.Now(),
 		ApproveTime:  time.Now(),
 		ApproveTime:  time.Now(),
 		EnableStatus: 1,
 		EnableStatus: 1,
+		IsActive:     1,
 		ReviewStatus: int8(reviewStatus),
 		ReviewStatus: int8(reviewStatus),
 	}
 	}
-	if approver, err := models.GetUsersById(header.Uid); err != nil {
+	if approver, err := models.GetUsersById(userId); err != nil {
 		log.Error(err)
 		log.Error(err)
 		return
 		return
 	} else {
 	} else {
@@ -656,7 +779,8 @@ func GenAuditFlowProcess(header *protocol.RequestHeader, chanceId int64, related
 		company            *models.Company
 		company            *models.Company
 		roleName           string
 		roleName           string
 		approver           *models.User
 		approver           *models.User
-		roleId             []int
+		roleIds            []int
+		roleId             int
 	)
 	)
 	if configs, err = models.GetAuditFlowConfigsLevel(templateId, 1); err != nil {
 	if configs, err = models.GetAuditFlowConfigsLevel(templateId, 1); err != nil {
 		if err == orm.ErrNoRows {
 		if err == orm.ErrNoRows {
@@ -738,11 +862,15 @@ func GenAuditFlowProcess(header *protocol.RequestHeader, chanceId int64, related
 			}
 			}
 			break
 			break
 		case protocol.AuditByRole:
 		case protocol.AuditByRole:
-			if e := json.Unmarshal([]byte(config.ToRole), &roleId); e == nil {
-				if userIds, err = getRoleUsers(header, roleId[0]); err != nil {
+			if e := json.Unmarshal([]byte(config.ToRole), &roleIds); e == nil {
+				if userIds, err = getRoleUsers(header, roleIds[0]); err != nil {
 					log.Error(err)
 					log.Error(err)
 					return
 					return
 				}
 				}
+				if role, e := models.GetRoleById(roleIds[0]); e == nil {
+					roleName = role.Name
+					roleId = role.Id
+				}
 			} else {
 			} else {
 				log.Error(config.ToRole, e)
 				log.Error(config.ToRole, e)
 			}
 			}
@@ -779,6 +907,7 @@ func GenAuditFlowProcess(header *protocol.RequestHeader, chanceId int64, related
 				ActionType:    int(config.ActionType),
 				ActionType:    int(config.ActionType),
 				RoleName:      roleName,
 				RoleName:      roleName,
 				UserName:      approver.NickName,
 				UserName:      approver.NickName,
+				RoleId:        roleId,
 				ReviewStatus:  protocol.ReviewStatusAuditging,
 				ReviewStatus:  protocol.ReviewStatusAuditging,
 				TemplateId:    int(templateId),
 				TemplateId:    int(templateId),
 			}
 			}
@@ -786,7 +915,7 @@ func GenAuditFlowProcess(header *protocol.RequestHeader, chanceId int64, related
 				item.IsActive = 1
 				item.IsActive = 1
 				item.EnableStatus = 1
 				item.EnableStatus = 1
 			}
 			}
-			log.Info(fmt.Sprintf("生成机会审批流:chance_id:%v audit_id:%v audit_level:%v audit_user:%v action_type:%v", chanceId, item.Id, config.Level, uid, resolveActionType(config.ActionType)))
+			log.Info(fmt.Sprintf("生成机会审批流:chance_id:%v audit_id:%v audit_level:%v audit_user:%v action_type:%v is_active:%v", chanceId, item.Id, config.Level, uid, resolveActionType(config.ActionType), item.IsActive))
 			v = append(v, item)
 			v = append(v, item)
 		}
 		}
 	}
 	}
@@ -794,10 +923,10 @@ func GenAuditFlowProcess(header *protocol.RequestHeader, chanceId int64, related
 }
 }
 func resolveActionType(t uint) string {
 func resolveActionType(t uint) string {
 	if t == 1 {
 	if t == 1 {
-		return "or"
+		return "and"
 	}
 	}
 	if t == 2 {
 	if t == 2 {
-		return "and"
+		return "or"
 	}
 	}
 	return fmt.Sprintf("%v", t)
 	return fmt.Sprintf("%v", t)
 }
 }