zwxi 1 year ago
parent
commit
096c9c7ff7

+ 2 - 1
controllers/company.go

@@ -1745,12 +1745,13 @@ func (this *CompanyController) List() {
 				IsShare:         v.IsShare,
 				CloseTime:       v.CloseTime,
 				CloseReason:     v.CloseReason,
+				ShareSellerId:   v.ShareSellerId,
 				ShareSellerIds:  v.ShareSellerIds,
 			}
 			if v.ShareSellerIds != "" {
 				shareSellerIds := strings.Split(v.ShareSellerIds, ",")
 				for _, idStr := range shareSellerIds {
-					shareSellerId ,e:= strconv.Atoi(idStr)
+					shareSellerId, e := strconv.Atoi(idStr)
 					if e != nil {
 						err = e
 						return

+ 2 - 1
controllers/full_company.go

@@ -1128,7 +1128,7 @@ func (this *FullCompanyController) List() {
 			//viewTotal:=GetviewTotal(v.CompanyId)
 
 			//活跃(客户状态)
-			if v.IsShare != 1  {
+			if v.IsShare != 1 {
 				if v.BtnItem.BtnModifySeller == true {
 					v.BtnItem.BtnModifySeller = false
 				}
@@ -1282,6 +1282,7 @@ func (this *FullCompanyController) List() {
 				IsShare:         v.IsShare,
 				CloseTime:       v.CloseTime,
 				CloseReason:     v.CloseReason,
+				ShareSellerId:   v.ShareSellerId,
 			}
 			companyLists = append(companyLists, companyList)
 		}

+ 3 - 3
models/company/company.go

@@ -89,7 +89,7 @@ type CompanySearchItem struct {
 	FreezeEndDate   string `description:"冻结结束日期"`
 	RegionType      string `description:"地区类型,国内,国外"`
 	ShareSeller     string `description:"共享销售员"`
-	ShareSellerId   string `description:"共享销售员id"`
+	ShareSellerId   int `description:"共享销售员id"`
 	ShareSellerIds  string `description:"共享销售员id"`
 	IsShare         int    `description:"0:非共享用户,1:共享客户"`
 	IsScrounge      int    `description:"是否白嫖 0不是 1是"`
@@ -161,7 +161,7 @@ type CompanyItem struct {
 	SellerId         int    `description:"销售ID"`
 	SellerIds        string `description:"销售ID集合,包含ficc和权益的销售id"`
 	ShareSeller      string `description:"共享销售员"`
-	ShareSellerId    string `description:"共享销售员id"`
+	ShareSellerId    int    `description:"共享销售员id"`
 	ShareSellerIds   string `description:"共享销售员ids"`
 	PackageTypes     string `description:"套餐类型集合,包含ficc和权益的套餐类型" json:"-"`
 	FiccPackageType  int    `description:"ficc的套餐类型"`
@@ -270,7 +270,7 @@ type CompanyListItem struct {
 	WeekViewActive   int                  `description:"周阅读活跃: 0-七日内无阅读; 1-活跃"`
 	IsShare          int                  `description:"0:非共享用户,1:共享客户"`
 	ShareSeller      string               `description:"共享销售员"`
-	ShareSellerId    string               `description:"共享销售员id"`
+	ShareSellerId    int               `description:"共享销售员id"`
 	ShareSellerIds   string               `description:"共享销售员ids"`
 	LastServiceTime  string               `description:"最后服务时间"`
 	ServiceTimes     int                  `description:"服务次数"`

+ 1 - 0
services/statistic_report/company.go

@@ -556,6 +556,7 @@ func CompanyList(sysUser *system.Admin, req statisticModels.IncrementalCompanyLi
 				IsShow:          isShow,
 				TryStageSlice:   tryStageSlice,
 				ShareSeller:     v.ShareSeller,
+				ShareSellerId: v.ShareSellerId,
 			}
 			if strings.Contains(companyList.ApproveStatus, "已审批") {
 				companyList.ApproveStatus = ""