bug修复

@@ -243,11 +243,11 @@ func (c *CommonController) SelectChanceList() {
 		msg = protocol.BadRequestParam("1")
 		msg = protocol.BadRequestParam("1")
 		return
 		return
 	}
 	}
-	// companyid := c.GetCompanyId()
-	// listData := servecommon.SelectCompanyUserList(param.PageIndex, param.PageSize, companyid, param.UserName)
-	// rspData := map[string]interface{}{
-	// 	"gridResult": listData,
-	// }
-	// msg = protocol.NewReturnResponse(rspData, nil)
+	companyid := c.GetCompanyId()
+	listData := servecommon.SelectChanceList(param.PageIndex, param.PageSize, companyid, param.ChanceCode)
+	rspData := map[string]interface{}{
+		"gridResult": listData,
+	}
+	msg = protocol.NewReturnResponse(rspData, nil)
 	return
 	return
 }
 }

@@ -90,3 +90,23 @@ type SelectCompanyUserList struct {
 	ResponsePageInfo
 	ResponsePageInfo
 	List []SelectCompanyUserListItem `json:"list"`
 	List []SelectCompanyUserListItem `json:"list"`
 }
 }
+
+type SelectChanceListItem struct {
+	Id                string `json:"id"  orm:"column(id)"`
+	DepartmentId      int64  `json:"deparment_id" orm:"column(department_id)"`
+	DepartmentName    string `json:"department_name" orm:"-"`
+	ChanceTypeId      int    `json:"chance_type_id" orm:"column(chance_type_id)"`
+	ChanceTypeName    string `json:"chance_type_name" orm:"-"`
+	AuditTemplateId   int64  `json:"audit_template_id" orm:"column(audit_template_id)"`
+	AuditTemplateName string `json:"audit_template_name" orm:"-"`
+	UserId            int64  `json:"user_id" orm:"column(user_id)"`
+	UserName          string `json:"user_name" orm:"column(-)"`
+	Code              string `json:"code" orm:"column(code)"`
+	CreateAt          string `json:"create_at" orm:"column(create_at)"`
+}
+
+//下拉选择机会
+type SelectChanceList struct {
+	ResponsePageInfo
+	List []SelectChanceListItem `json:"list"`
+}

@@ -76,6 +76,8 @@ func init() {
 			beego.NSRouter("/default_image", &controllers.CommonController{}, "post:DefaultImage"),
 			beego.NSRouter("/default_image", &controllers.CommonController{}, "post:DefaultImage"),
 			beego.NSRouter("/role/user", &controllers.CommonController{}, "post:SelectorRoleUser"),
 			beego.NSRouter("/role/user", &controllers.CommonController{}, "post:SelectorRoleUser"),
 			beego.NSRouter("/chance_type", &controllers.CommonController{}, "post:SelectorChanceType"),
 			beego.NSRouter("/chance_type", &controllers.CommonController{}, "post:SelectorChanceType"),
+			beego.NSRouter("/user", &controllers.CommonController{}, "post:SelectCompanyUserList"),
+			beego.NSRouter("/chance", &controllers.CommonController{}, "post:SelectChanceList"),
 		),
 		),
 		beego.NSNamespace("/template",
 		beego.NSNamespace("/template",
 			beego.NSRouter("/add", &controllers.TemplateController{}, "post:TemplateAdd"),
 			beego.NSRouter("/add", &controllers.TemplateController{}, "post:TemplateAdd"),

@@ -209,6 +209,7 @@ func SelectCompanyUserList(pageIndex int, pageSize int, companyid int64, userNam
 	var (
 	var (
 		err     error
 		err     error
 		cnt     int
 		cnt     int
+		sqlData = make([]protocol.SelectCompanyUserListItem, 0)
 	)
 	)
 	rspData := protocol.SelectCompanyUserList{
 	rspData := protocol.SelectCompanyUserList{
 		ResponsePageInfo: protocol.ResponsePageInfo{
 		ResponsePageInfo: protocol.ResponsePageInfo{
@@ -224,20 +225,20 @@ func SelectCompanyUserList(pageIndex int, pageSize int, companyid int64, userNam
 	if cnt == 0 {
 	if cnt == 0 {
 		return rspData
 		return rspData
 	}
 	}
-	err = utils.ExecuteQueryAll(&rspData, datasql, cond...)
+	err = utils.ExecuteQueryAll(&sqlData, datasql, cond...)
 	if err != nil {
 	if err != nil {
 		log.Error("SQL EXECUTE ERR:%s", err)
 		log.Error("SQL EXECUTE ERR:%s", err)
 		return rspData
 		return rspData
 	}
 	}
+	rspData.List = sqlData
 	return rspData
 	return rspData
 }
 }
 
 
-func SelectChanceList(pageIndex int, pageSize int, companyid int64, chanceCode string) protocol.SelectCompanyUserList {
+func SelectChanceList(pageIndex int, pageSize int, companyid int64, chanceCode string) protocol.SelectChanceList {
 	datasql := ` SELECT id ,department_id,chance_type_id,audit_template_id,user_id,create_at,code
 	datasql := ` SELECT id ,department_id,chance_type_id,audit_template_id,user_id,create_at,code
 				FROM chance  WHERE company_id =? `
 				FROM chance  WHERE company_id =? `
 	countsql := `SELECT count(*)
 	countsql := `SELECT count(*)
-				FROM chance WHERE company_id =?
-				 `
+				FROM chance WHERE company_id =? `
 	cond := []interface{}{companyid}
 	cond := []interface{}{companyid}
 	where := ""
 	where := ""
 	if len(chanceCode) > 0 {
 	if len(chanceCode) > 0 {
@@ -248,24 +249,16 @@ func SelectChanceList(pageIndex int, pageSize int, companyid int64, chanceCode s
 	countsql += where
 	countsql += where
 	pageStart := (pageIndex - 1) * pageSize
 	pageStart := (pageIndex - 1) * pageSize
 	datasql += fmt.Sprintf(` ORDER BY create_at DESC limit %d,%d `, pageStart, pageSize)
 	datasql += fmt.Sprintf(` ORDER BY create_at DESC limit %d,%d `, pageStart, pageSize)
-	type SqlData struct {
-		Id            int64  `orm:"column(id)"`
-		DeparmentId   int64  `orm:"column(DeparmentId)"`
-		ChanceType    int64  `orm:"column(ChanceType)"`
-		AuditTemplate int64  `orm:"column(AuditTemplate)"`
-		UserId        int64  `orm:"column(UserId)"`
-		CreateAt      string `orm:"column(CreateAt)"`
-		Code          string `orm:"column(Code)"`
-	}
 	var (
 	var (
 		err     error
 		err     error
 		cnt     int
 		cnt     int
+		sqldata []protocol.SelectChanceListItem
 	)
 	)
-	rspData := protocol.SelectCompanyUserList{
+	rspData := protocol.SelectChanceList{
 		ResponsePageInfo: protocol.ResponsePageInfo{
 		ResponsePageInfo: protocol.ResponsePageInfo{
 			TotalPage: 0, CurrentPage: pageIndex,
 			TotalPage: 0, CurrentPage: pageIndex,
 		},
 		},
-		List: make([]protocol.SelectCompanyUserListItem, 0),
+		List: make([]protocol.SelectChanceListItem, 0),
 	}
 	}
 	err = utils.ExecuteQueryOne(&cnt, countsql, cond...)
 	err = utils.ExecuteQueryOne(&cnt, countsql, cond...)
 	if err != nil {
 	if err != nil {
@@ -275,10 +268,33 @@ func SelectChanceList(pageIndex int, pageSize int, companyid int64, chanceCode s
 	if cnt == 0 {
 	if cnt == 0 {
 		return rspData
 		return rspData
 	}
 	}
-	err = utils.ExecuteQueryAll(&rspData, datasql, cond...)
+	err = utils.ExecuteQueryAll(&sqldata, datasql, cond...)
 	if err != nil {
 	if err != nil {
 		log.Error("SQL EXECUTE ERR:%s", err)
 		log.Error("SQL EXECUTE ERR:%s", err)
 		return rspData
 		return rspData
 	}
 	}
+
+	for i, v := range sqldata {
+		d, err := models.GetDepartmentById(v.DepartmentId)
+		if err == nil {
+			sqldata[i].DepartmentName = d.Name
+		}
+		ct, err := models.GetChanceTypeById(v.ChanceTypeId)
+		if err == nil {
+			sqldata[i].ChanceTypeName = ct.Name
+		}
+		at, err := models.GetAuditTemplateById(v.AuditTemplateId)
+		if err == nil {
+			sqldata[i].AuditTemplateName = at.Name
+		}
+		uc, err := models.GetUserCompanyById(v.UserId)
+		if err == nil {
+			u, err := models.GetUserById(uc.UserId)
+			if err == nil {
+				sqldata[i].UserName = u.NickName
+			}
+		}
+	}
+	rspData.List = sqldata
 	return rspData
 	return rspData
 }
 }