Merge branch 'crm/crm_16.5' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/user_rai_label.go

@@ -112,8 +112,8 @@ func (this *UserRaiLabelController) Delte() {
 	br.Msg = "操作成功"
 }
 
-// @Title  活动详情
-// @Description 获取活动详情接口
+// @Title  标签详情
+// @Description 获取标签详情接口
 // @Param   RaiLabelId   query   int  true       "标签ID"
 // @Success Ret=200 {object} cygx.ActivityDetail
 // @router /use_rai_label/detail [get]
@@ -221,3 +221,40 @@ func (this *UserRaiLabelController) Detail() {
 	br.Msg = "获取成功"
 	br.Data = resp
 }
+
+// @Title  标签详情
+// @Description 获取标签详情接口
+// @Param   UserId   query   int  true       "用户ID"
+// @Success Ret=200 {object} cygx.ActivityDetail
+// @router /use_rai_label/list [get]
+func (this *UserRaiLabelController) List() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	AdminUser := this.SysUser
+	if AdminUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，用户信息为空"
+		br.Ret = 408
+		return
+	}
+	userId, _ := this.GetInt("UserId")
+
+	resp := new(cygx.WxUserRaiLabelList)
+	list, err := cygx.GetWxUserRaiLabelListByUserId(userId)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error() + "userId：" + strconv.Itoa(userId)
+		return
+	}
+	if len(list) == 0 {
+		list = make([]*cygx.WxUserRaiLabelListResp, 0)
+	}
+	resp.List = list
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}

models/cygx/wx_user_rai_label.go

@@ -23,6 +23,10 @@ type WxUserRaiLabel struct {
 	ModifyTime      time.Time `description:"更新时间"`
 }
 
+type WxUserRaiLabelList struct {
+	List []*WxUserRaiLabelListResp
+}
+
 type WxUserRaiLabelListResp struct {
 	UserId     int    `description:"用户ID"`
 	RaiLabelId int    `description:"ID"`
@@ -94,6 +98,24 @@ func GetWxUserRaiLabelListByUserIds(userIdArr []int) (list []*WxUserRaiLabelList
 	return
 }
 
+// GetWxUserRaiLabelListByUserId 根据用户ID，获取最近四个月的数据信息
+func GetWxUserRaiLabelListByUserId(userId int) (list []*WxUserRaiLabelListResp, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT
+			rai_label_id,
+			user_id,
+			label,
+			source_type 
+		FROM
+			wx_user_rai_label
+		WHERE
+			 user_id = ? AND  create_time >= ?
+		ORDER BY
+		    create_time DESC  LIMIT  1000  `
+	_, err = o.Raw(sql, userId, time.Now().AddDate(0, -4, 0).Format(utils.FormatDate)).QueryRows(&list)
+	return
+}
+
 // 通过纪要ID获取详情
 func GetWxUserRaiLabelDetailById(raiLabelId int) (item *WxUserRaiLabel, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")

routers/commentsRouter.go

@@ -3355,6 +3355,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:UserRaiLabelController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/cygx:UserRaiLabelController"],
+        beego.ControllerComments{
+            Method: "List",
+            Router: `/use_rai_label/list`,
+            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: "ApprovalLogList",