Merge branch 'cygx_need_900' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/company.go

@@ -1204,11 +1204,11 @@ func (this *CompanyController) List() {
 
 		var expireDay string
 		itemStatus := item.Status
+		item.Status = strings.Replace(item.Status, utils.COMPANY_STATUS_FOREVER, utils.COMPANY_STATUS_X_CLASS_TRY_OUT, -1) // 永续客户类型，映射成 X类试用
 		if itemStatus != "" {
 			if !strings.Contains(item.Status, "/") {
 				if itemStatus == utils.COMPANY_STATUS_FOREVER { //永续
 					expireDay = "-"
-					item.Status = utils.COMPANY_STATUS_X_CLASS_TRY_OUT // 永续客户类型，映射成 X类试用
 				} else if itemStatus == utils.COMPANY_STATUS_TRY_OUT || itemStatus == utils.COMPANY_STATUS_FORMAL { //试用/正式
 					if item.StartDate != "" && item.EndDate != "" {
 						endDateTime, _ := time.Parse(utils.FormatDate, item.EndDate)
@@ -1490,6 +1490,7 @@ func (this *CompanyController) List() {
 	statusMap := make(map[string]int, 0)
 	var totalCount int
 	for _, sv := range statusCount {
+		sv.Status = strings.Replace(sv.Status, utils.COMPANY_STATUS_FOREVER, utils.COMPANY_STATUS_X_CLASS_TRY_OUT, -1) // 永续客户类型，映射成 X类试用
 		totalCount = totalCount + sv.Count
 		statusMap[sv.Status] = sv.Count
 	}