fix

controllers/company.go

@@ -1694,7 +1694,7 @@ func (this *CompanyController) List() {
 				RenewalReason:    v.RenewalReason,
 				FreezeReason:     v.FreezeReason,
 				LossTime:         v.LossTime,
-				Status:           v.Status,
+				Status:           v.StatusStr,
 				CompanyType:      v.CompanyType,
 				ApproveStatus:    v.ApproveStatus,
 				SellerName:       v.SellerName,

controllers/full_company.go

@@ -1231,7 +1231,7 @@ func (this *FullCompanyController) List() {
 				RenewalReason:    v.RenewalReason,
 				FreezeReason:     v.FreezeReason,
 				LossTime:         v.LossTime,
-				Status:           v.Status,
+				Status:           v.StatusStr,
 				CompanyType:      v.CompanyType,
 				ApproveStatus:    v.ApproveStatus,
 				SellerName:       v.SellerName,

models/company/company.go

@@ -89,7 +89,7 @@ type CompanySearchItem struct {
 	FreezeEndDate   string `description:"冻结结束日期"`
 	RegionType      string `description:"地区类型，国内，国外"`
 	ShareSeller     string `description:"共享销售员"`
-	ShareSellerId   int `description:"共享销售员id"`
+	ShareSellerId   int    `description:"共享销售员id"`
 	ShareSellerIds  string `description:"共享销售员id"`
 	IsShare         int    `description:"0:非共享用户,1:共享客户"`
 	IsScrounge      int    `description:"是否白嫖 0不是 1是"`
@@ -156,6 +156,7 @@ type CompanyItem struct {
 	FreezeReason     string `description:"冻结理由"`
 	LossTime         string `description:"流失时间"`
 	Status           string `description:"客户状态：'试用','永续','冻结','流失','正式' "`
+	StatusStr        string `description:"客户状态：'试用','永续','冻结','流失','正式' 如果是共享客户会加上 '(共享)'" `
 	CompanyType      string `description:"客户类型：ficc/权益"`
 	ApproveStatus    string `description:"审批状态：'待审批','已审批','驳回' 审批状态为空时，表示没有审批申请"`
 	SellerName       string `description:"销售：吉根龙/颖丹"`
@@ -271,7 +272,7 @@ type CompanyListItem struct {
 	WeekViewActive   int                  `description:"周阅读活跃: 0-七日内无阅读; 1-活跃"`
 	IsShare          int                  `description:"0:非共享用户,1:共享客户"`
 	ShareSeller      string               `description:"共享销售员"`
-	ShareSellerId    int               `description:"共享销售员id"`
+	ShareSellerId    int                  `description:"共享销售员id"`
 	ShareSellerIds   string               `description:"共享销售员ids"`
 	LastServiceTime  string               `description:"最后服务时间"`
 	ServiceTimes     int                  `description:"服务次数"`
@@ -340,7 +341,8 @@ as sort_todo_end_time,
 			GROUP_CONCAT(CASE 
             WHEN b.is_share = 1 THEN CONCAT(b.status, '(共享)')
             ELSE b.status 
-        END ORDER BY b.product_id ASC SEPARATOR '/') AS status,
+        END ORDER BY b.product_id ASC SEPARATOR '/') AS status_str,
+			GROUP_CONCAT(b.status ORDER BY b.product_id ASC SEPARATOR '/') AS status,
 			GROUP_CONCAT(DISTINCT b.seller_name ORDER BY b.product_id ASC SEPARATOR '/') AS seller_name,
 			GROUP_CONCAT(DISTINCT b.seller_id ORDER BY b.product_id ASC SEPARATOR '/') AS seller_ids,
 			GROUP_CONCAT(DISTINCT b.package_type ORDER BY b.product_id ASC SEPARATOR '/') AS package_types,