Merge branch 'cygx/cygx_need_933' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/yanxuan_special.go

@@ -936,3 +936,55 @@ func (this *YanxuanSpecialController) AuthorUpdate() {
 	br.Success = true
 	br.Msg = "修改成功"
 }
+
+// @Title 作者列表
+// @Description 作者列表
+// @Param   KeyWord   query   string  false       "搜索关键词"
+// @Success 200 {object} models.AddEnglishReportResp
+// @router /yanxuan_special/author/search [get]
+func (this *YanxuanSpecialController) AuthorSearch() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+
+	keyWord := this.GetString("KeyWord")
+	var condition string
+	var pars []interface{}
+
+	//关键词搜索
+	if keyWord != "" {
+		keyWord = "%" + keyWord + "%"
+		condition += ` AND art.nick_name like  ? `
+		pars = append(pars, keyWord)
+	}
+
+	list, tmpErr := cygx.GetYanxuanSpecialAuthorList(condition, pars, 0, 99)
+	if tmpErr != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败, Err:" + tmpErr.Error()
+		return
+	}
+	resp := new(cygx.CygxYanxuanSpecialKeyWordListReesp)
+	if len(list) > 0 {
+		for _, v := range list {
+			item := new(cygx.CygxYanxuanSpecialKeyWordReesp)
+			item.KeyWord = v.NickName
+			resp.List = append(resp.List, item)
+		}
+	} else {
+		resp.List = make([]*cygx.CygxYanxuanSpecialKeyWordReesp, 0)
+	}
+	br.Data = resp
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}

models/cygx/cygx_yanxuan_special_user.go

@@ -57,6 +57,13 @@ type CygxYanxuanSpecialAuthorItem struct {
 	Remark             string //备注
 }
 
+type CygxYanxuanSpecialKeyWordReesp struct {
+	KeyWord string //引荐人
+}
+type CygxYanxuanSpecialKeyWordListReesp struct {
+	List []*CygxYanxuanSpecialKeyWordReesp //引荐人
+}
+
 func AddCygxYanxuanSpecialAuthor(item *CygxYanxuanSpecialAuthor) (lastId int64, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
 	lastId, err = o.Insert(item)

routers/commentsRouter.go

@@ -3112,6 +3112,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:YanxuanSpecialController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:YanxuanSpecialController"],
+        beego.ControllerComments{
+            Method: "AuthorSearch",
+            Router: `/yanxuan_special/author/search`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:YanxuanSpecialController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:YanxuanSpecialController"],
         beego.ControllerComments{
             Method: "AuthorUpdate",