no message

controllers/company_seller.go

@@ -191,7 +191,7 @@ func (this *CompanySellerController) CheckListV2() {
 	getAllUser, _ := this.GetBool("AllUser", false)
 	status, _ := this.GetInt("Status", 0)
 	getAllEnabled, _ := this.GetBool("AllEnabled", false)
-	enabled := -1       //默认只获取正常状态的用户
+	enabled := -1      //默认只获取正常状态的用户
 	if getAllEnabled { //获取所有状态的用户
 		enabled = -1
 	}
@@ -5572,7 +5572,7 @@ func (this *CompanySellerController) InvoicePaymentCheckList() {
 	getAllUser, _ := this.GetBool("AllUser", false)
 	status, _ := this.GetInt("Status", 0)
 	//getAllEnabled, _ := this.GetBool("AllEnabled", false)
-	enabled := -1       //默认只获取正常状态的用户
+	enabled := -1 //默认只获取正常状态的用户
 	//if getAllEnabled { //获取所有状态的用户
 	//	enabled = -1
 	//}
@@ -7485,4 +7485,122 @@ func (this *CompanySellerController) InvoicePaymentCheckList() {
 	br.Data = company.DepartmentGroupSellersResp{
 		List: list,
 	}
-}
+}
+
+// CheckListV2
+// @Title 获取权益开拓组或者服务组下面的销售
+// @Description 获取权益开拓组或者服务组下面的销售接口
+// @Param   ServerType   query   string  true       "筛选类型，枚举值：'开拓','服务';不传默认返回开拓组内容"
+// @Success 200 {object} company.DepartmentGroupSellersResp
+// @router /seller/check/list_rai/server_type [get]
+func (this *CompanySellerController) CheckListRaiServerType() {
+	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
+	}
+	serverType := this.GetString("ServerType", "开拓")
+	list := make([]company.DepartmentGroupSellers, 0)
+
+	condition := " AND role_type_code IN ('rai_seller','rai_group') AND enabled = 1 AND  rai_enabled = 1"
+	var pars []interface{}
+	//名字带6 的属于服务组
+	if serverType == "开拓" {
+		condition += " AND  real_name   NOT LIKE '%6%' "
+	} else {
+		condition += " AND  real_name LIKE '%6%' "
+	}
+	sellerList, err := system.GetSysUserItemsOrderByCreated(condition, pars)
+	if err != nil {
+		br.Msg = "获取管理账号失败"
+		br.ErrMsg = "获取管理账号失败,Err:" + err.Error()
+		return
+	}
+	//部门管理员看小组、销售
+	departmentId := 5
+	groupList, err := system.GetSysGroupByDepartmentId(departmentId)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取分组失败,Err:" + err.Error()
+		return
+	}
+	for _, group := range groupList {
+		groupSellerList := make([]company.DepartmentGroupSellers, 0)
+		groupItem := company.DepartmentGroupSellers{
+			AdminId: fmt.Sprint("group_", group.DepartmentId),
+			//AdminName string `description:"系统用户名称"`
+			RealName:     group.GroupName,
+			ChildrenList: groupSellerList,
+		}
+		for _, seller := range sellerList {
+			if seller.GroupId != group.GroupId {
+				continue
+			}
+
+			sellerItem := company.DepartmentGroupSellers{
+				AdminId:      fmt.Sprint(seller.AdminId),
+				RealName:     seller.RealName,
+				Authority:    seller.Authority,
+				RoleTypeCode: seller.RoleTypeCode,
+			}
+			groupSellerList = append(groupSellerList, sellerItem)
+
+		}
+		//teamList, err := system.GetSysTeamByDepartmentId(group.GroupId)
+		//if err != nil {
+		//	br.Msg = "获取小组失败"
+		//	br.ErrMsg = "获取小组失败,Err:" + err.Error()
+		//	return
+		//}
+		//for _, team := range teamList {
+		//	teamSellerList := make([]company.DepartmentGroupSellers, 0)
+		//	teamItem := company.DepartmentGroupSellers{
+		//		AdminId: fmt.Sprint("team_", team.GroupId),
+		//		//AdminName string `description:"系统用户名称"`
+		//		RealName:     team.GroupName,
+		//		ChildrenList: teamSellerList,
+		//	}
+		//	sellerList, err := system.GetTeamSysUserList(team.GroupId, enabled)
+		//	if err != nil {
+		//		br.Msg = "获取销售失败"
+		//		br.ErrMsg = "获取销售失败,Err:" + err.Error()
+		//		return
+		//	}
+		//	for _, seller := range sellerList {
+		//		sellerItem := company.DepartmentGroupSellers{
+		//			AdminId: fmt.Sprint(seller.AdminId),
+		//			//AdminName string `description:"系统用户名称"`
+		//			RealName:     seller.RealName,
+		//			Authority:    seller.Authority,
+		//			RoleTypeCode: seller.RoleTypeCode,
+		//		}
+		//		//fmt.Println("seller.RealName:", seller.RealName)
+		//		teamSellerList = append(teamSellerList, sellerItem)
+		//	}
+		//	teamSellerList = sortDepartmentGroupSellers(teamSellerList)
+		//	teamItem.ChildrenList = teamSellerList
+		//	if len(teamSellerList) > 0 {
+		//		groupSellerList = append(groupSellerList, teamItem)
+		//	}
+		//}
+
+		groupItem.ChildrenList = groupSellerList
+		if len(groupSellerList) > 0 {
+			list = append(list, groupItem)
+		}
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = company.DepartmentGroupSellersResp{
+		List: list,
+	}
+}

controllers/statistic/rai_data_summary.go

@@ -22,13 +22,17 @@ type StatisticRaiDataSummaryController struct {
 // MergeCompanyList
 // @Title 权益数据汇总
 // @Description 权益数据汇总统计列表接口
-// @Param   AdminId   query   string  true       "销售id，多个用英文逗号隔开，空字符串为全部"
+// @Param   AdminId   query   string  true       "开拓组销售id，多个用英文逗号隔开，空字符串为全部"
+// @Param   ServiceAdminId   query   string  true       "服务组销售id，多个用英文逗号隔开，空字符串为全部"
 // @Param   StartYear   query   int	  false       "开始日期(年份)"
 // @Param   EndYear   query   int  false       "结束日期(年份)"
 // @Param   DataType   query   string  false       "报表类型，枚举值：`季度`，`年度`，`半年度`"
-// @Param   TryOutType   query   string  false       " '试用'， '非试用' 非试用即为冻结/流失"
+// @Param   DevelopButton   query   int	  false       "开拓组开关，枚举值：1:开启，0：关闭 ，默认关闭"
+// @Param   ServerButton   query   int	  false       "服务组开关，枚举值：1:开启，0：关闭 ，默认关闭"
+// @Param   NewContractButton   query   int	  false       "新签开关，枚举值：1:开启，0：关闭 ，默认开启"
+// @Param   RenewedContractButton   query   int	  false       "续约开关，枚举值：1:开启，0：关闭 ，默认开启"
+// @Param   IncomeButton   query   int	  false       "收入开关，枚举值：1:开启，0：关闭 ，默认开启"
 // @Param   IsExport   query   bool  false       "是否导出excel，默认是false"
-// @Param   IsConfirm   query   int  false       "是否确认续约: -1-默认全部; 0-待确认; 1-已确认 ;2-到期合同"
 // @Success 200 {object} statistic_report.RaiDataSummaryListResp
 // @router /rai_data_summary/list [get]
 func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
@@ -48,8 +52,12 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 
 	//adminId := this.GetString("AdminId")
 	dataType := this.GetString("DataType")
+	adminId := this.GetString("AdminId")
+	serviceAdminId := this.GetString("ServiceAdminId")
 	startYear, _ := this.GetInt("StartYear")
 	endYear, _ := this.GetInt("EndYear")
+	developButton, _ := this.GetInt("DevelopButton")
+	serverButton, _ := this.GetInt("ServerButton")
 
 	dataTypeArr := []string{}
 	var dateIntervalArr []statistic_report.DateInterval //时间区间
@@ -70,6 +78,22 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 
 	condition := " AND role_type_code IN ('rai_seller','rai_group') AND enabled = 1 AND  rai_enabled = 1"
 	var pars []interface{}
+	if adminId != "" {
+		serviceAdminId = ""
+		condition += " AND  admin_id IN (" + adminId + ") "
+	}
+	if serviceAdminId != "" {
+		condition += " AND  admin_id IN (" + serviceAdminId + ") "
+	}
+
+	if developButton == 1 && serverButton == 0 && adminId == "" && serviceAdminId == "" { //开拓组筛选条件
+		condition += " AND  real_name   NOT LIKE '%6%' "
+	}
+
+	if developButton == 0 && serverButton == 1 && adminId == "" && serviceAdminId == "" { //服务组筛选条件
+		condition += " AND  real_name   LIKE '%6%' "
+	}
+
 	sellerList, err := system.GetSysUserItemsOrderByCreated(condition, pars)
 	if err != nil {
 		br.Msg = "获取管理账号失败"

routers/commentsRouter.go

@@ -10132,6 +10132,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:CompanySellerController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:CompanySellerController"],
+        beego.ControllerComments{
+            Method: "CheckListRaiServerType",
+            Router: `/seller/check/list_rai/server_type`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:CompanySellerController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:CompanySellerController"],
         beego.ControllerComments{
             Method: "CheckListForLose",