Merge remote-tracking branch 'origin/debug' into debug

# Conflicts:
#	controllers/analyst.go

controllers/analyst.go

@@ -8,6 +8,7 @@ import (
 	"eta/eta_mini_crm_ht/services"
 	"eta/eta_mini_crm_ht/utils"
 	"fmt"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	"os"
 	"path"
 	"strconv"
@@ -184,3 +185,85 @@ func (this *AnalystController) Edit() {
 	br.Success = true
 	br.Ret = 200
 }
+
+// GetAnalystByName
+// @Title 查询研究员信息
+// @Description 查询研究员信息
+// @Param   File   query   file  true       "文件"
+// @Success 200 {object} models.ReportAuthorResp
+// @router /analyst [get]
+func (this *AnalystController) GetAnalystByName(AnalystName string) {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	analyst, err := models.GetAnalystByName(AnalystName)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+		return
+	}
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = analyst
+}
+
+// List
+// @Title 列表
+// @Description 列表
+// @Param   File   query   file  true       "文件"
+// @Success 200 {object} models.ReportAuthorResp
+// @router /list [get]
+func (this *AnalystController) List() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	pageSize, _ := this.GetInt("PageSize")
+	currentIndex, _ := this.GetInt("CurrentIndex")
+
+	var startSize int
+	if pageSize <= 0 {
+		pageSize = utils.PageSize20
+	}
+	if currentIndex <= 0 {
+		currentIndex = 1
+	}
+	startSize = utils.StartIndex(currentIndex, pageSize)
+
+	total, err := models.GetAnalystCount()
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+		return
+	}
+	list, err := models.GetAnalystList(startSize, pageSize)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+		return
+	}
+	analystList := make([]*models.AnalystView, 0)
+	for _, v := range list {
+		analystList = append(analystList, &models.AnalystView{
+			Id:           v.Id,
+			Name:         v.Name,
+			HeadImgURL:   v.HeadImgURL,
+			Introduction: v.Introduction,
+			CreatedTime:  v.CreatedTime.Format(time.DateTime),
+		})
+
+	}
+	page := paging.GetPaging(currentIndex, pageSize, total)
+	resp := new(response.AnalystListResp)
+	resp.List = analystList
+	resp.Paging = page
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}

controllers/seller.go

@@ -1,100 +0,0 @@
-package controllers
-
-import (
-	"eta/eta_mini_crm_ht/models"
-	"eta/eta_mini_crm_ht/models/response"
-)
-
-type SellerController struct {
-	BaseAuthController
-}
-
-// List
-// @Title 获取部门下销售
-// @Description 获取部门下销售接口
-// @Param   AllEnabled   query   bool  true       "是否获取包含禁用的用户"
-// @Success 200 {object} company.DepartmentGroupSellersResp
-// @router /list [get]
-func (this *SellerController) List() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	getAllEnabled, _ := this.GetBool("AllEnabled", false)
-	enabled := true    //默认只获取正常状态的用户
-	if getAllEnabled { //获取所有状态的用户
-		enabled = false
-	}
-	departmentList, err := models.GetSysDepartmentList()
-	if err != nil {
-		br.Msg = "获取部门失败"
-		br.ErrMsg = "获取部门失败，系统异常，Err:" + err.Error()
-		return
-	}
-	seller, err := models.GetSysUserListByIsEnabled(enabled)
-	if err != nil {
-		br.Msg = "获取销售失败"
-		br.ErrMsg = "获取销售失败，系统异常，Err:" + err.Error()
-		return
-	}
-	// 遍历获取销售的层级结构
-	list := make([]*response.DepartmentSellers, 0)
-	for _, dep1 := range departmentList {
-		if dep1.ParentId == 0 {
-			v1 := new(response.DepartmentSellers)
-			v1.SysDepartmentId = dep1.SysDepartmentId
-			v1.SysDepartmentName = dep1.SysDepartmentName
-			for _, s := range seller {
-				if s.SysDepartmentId1 == dep1.SysDepartmentId && s.SysDepartmentId2 == 0 {
-					s1 := new(response.DepartmentSellers)
-					s1.SysUserId = s.SysUserId
-					s1.SysRealName = s.SysRealName
-					v1.ChildrenList = append(v1.ChildrenList, s1)
-				}
-			}
-			for _, dep2 := range departmentList {
-				if dep2.ParentId == dep1.SysDepartmentId {
-					v2 := new(response.DepartmentSellers)
-					v2.SysDepartmentId = dep2.SysDepartmentId
-					v2.SysDepartmentName = dep2.SysDepartmentName
-					for _, s := range seller {
-						if s.SysDepartmentId2 == dep2.SysDepartmentId && s.SysDepartmentId3 == 0 {
-							s1 := new(response.DepartmentSellers)
-							s1.SysUserId = s.SysUserId
-							s1.SysRealName = s.SysRealName
-							v2.ChildrenList = append(v2.ChildrenList, s1)
-						}
-					}
-					v1.ChildrenList = append(v1.ChildrenList, v2)
-					for _, dep3 := range departmentList {
-						if dep3.ParentId == dep2.SysDepartmentId {
-							v3 := new(response.DepartmentSellers)
-							v3.SysDepartmentId = dep3.SysDepartmentId
-							v3.SysDepartmentName = dep3.SysDepartmentName
-							for _, s := range seller {
-								if s.SysDepartmentId3 == dep3.SysDepartmentId {
-									s1 := new(response.DepartmentSellers)
-									s1.SysUserId = s.SysUserId
-									s1.SysRealName = s.SysRealName
-									v3.ChildrenList = append(v3.ChildrenList, s1)
-								}
-							}
-							v2.ChildrenList = append(v2.ChildrenList, v3)
-						}
-					}
-				}
-			}
-			list = append(list, v1)
-		}
-
-	}
-	resp := new(response.DepartmentGroupSellersResp)
-	resp.List = list
-
-	br.Msg = "获取成功"
-	br.Success = true
-	br.Ret = 200
-	br.Data = resp
-}

models/financial_analyst.go

@@ -0,0 +1,55 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+type AnalystStatus string
+
+const (
+	AnalystStatusEnabled  AnalystStatus = "enabled"
+	AnalystStatusDisabled AnalystStatus = "disabled"
+	columns                             = "id,eta_id,name,head_img_url,introduction"
+)
+
+type CrmFinancialAnalyst struct {
+	Id           int           `gorm:"primaryKey;autoIncrement;column:id;comment:主键"`
+	ETAId        int           `gorm:"column:eta_id"`
+	HTId         int           `gorm:"column:ht_id"`
+	Name         string        `gorm:"column:name"`
+	HeadImgURL   string        `gorm:"column:head_img_url"`
+	Introduction string        `gorm:"column:introduction"`
+	Status       AnalystStatus `gorm:"column:status"`
+	Deleted      bool          `gorm:"column:deleted"`
+	CreatedTime  time.Time     `gorm:"column:created_time;type:timestamps;comment:创建时间"`
+	UpdatedTime  time.Time     `gorm:"column:updated_time;type:timestamps;comment:更新时间"`
+}
+type AnalystView struct {
+	Id           int    `json:"Id"`
+	Name         string `json:"Name"`
+	HeadImgURL   string `json:"HeadImgURL"`
+	Introduction string `json:"Introduction"`
+	CreatedTime  string `json:"CreatedTime"`
+}
+
+func GetAnalystByName(name string) (analyst CrmFinancialAnalyst, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM crm_financial_analysts  where name =?`
+	err = o.Raw(sql, name).QueryRow(&analyst)
+	return
+}
+
+func GetAnalystCount() (count int, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT COUNT(*) AS count FROM crm_financial_analysts`
+	err = o.Raw(sql).QueryRow(&count)
+	return
+}
+
+func GetAnalystList(startSize int, pageSize int) (item []*CrmFinancialAnalyst, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM crm_financial_analysts  ORDER BY created_time desc LIMIT ?,?`
+	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&item)
+	return
+}

models/response/analyst.go

@@ -0,0 +1,11 @@
+package response
+
+import (
+	"eta/eta_mini_crm_ht/models"
+	"github.com/rdlucklib/rdluck_tools/paging"
+)
+
+type AnalystListResp struct {
+	List   []*models.AnalystView
+	Paging *paging.PagingItem `description:"分页数据"`
+}

routers/commentsRouter.go

@@ -7,6 +7,26 @@ import (
 
 func init() {
 
+    beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:AnalystController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:AnalystController"],
+        beego.ControllerComments{
+            Method: "GetAnalystByName",
+            Router: `/analyst`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(
+				param.New("AnalystName"),
+			),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:AnalystController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:AnalystController"],
+        beego.ControllerComments{
+            Method: "List",
+            Router: `/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:AnalystController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:AnalystController"],
         beego.ControllerComments{
             Method: "UploadImage",
@@ -146,15 +166,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:SellerController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:SellerController"],
-        beego.ControllerComments{
-            Method: "List",
-            Router: `/list`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:SysDepartmentController"] = append(beego.GlobalControllerRouter["eta/eta_mini_crm_ht/controllers:SysDepartmentController"],
         beego.ControllerComments{
             Method: "Add",

routers/router.go

@@ -46,11 +46,7 @@ func init() {
 				&controllers.SysMessageReportController{},
 			),
 		),
-		beego.NSNamespace("/seller",
-			beego.NSInclude(
-				&controllers.SellerController{},
-			),
-		),
+
 		beego.NSNamespace("/classify",
 			beego.NSInclude(
 				&controllers.ClassifyController{},