no message

controllers/company.go

@@ -1695,9 +1695,7 @@ func (this *CompanyController) List() {
 				todoButtonColor = "gray"
 			}
 			//永续客户X类试用客户出参转换
-			//if v.StatusStr == utils.COMPANY_STATUS_FOREVER {
-			//	v.StatusStr = utils.COMPANY_STATUS_X_CLASS_TRY_OUT
-			//}
+			v.StatusStr = strings.Replace(v.StatusStr, utils.COMPANY_STATUS_FOREVER, utils.COMPANY_STATUS_X_CLASS_TRY_OUT, -1)
 
 			companyList := &company.CompanyListItem{
 				CompanyId:        v.CompanyId,

controllers/cygx/enter_score.go

@@ -712,7 +712,6 @@ func (this *EnterScoreController) EnterScoreScoreOverview() {
 				mapenterScoreTypeCompanyIds[v.CompanyId] = true //记录按照百分比录入的公司
 			}
 		}
-		fmt.Println(enterScoreIds)
 		var companyCondition string
 		var companypars []interface{}
 		companyCondition += ` AND b.product_name = ? `
@@ -727,17 +726,25 @@ func (this *EnterScoreController) EnterScoreScoreOverview() {
 			br.ErrMsg = "获取失败，GetAdminLookUserCompanyIds Err:" + err.Error()
 			return
 		}
+		var newcompanyIds []int
+		lencompanyIds := len(companyIds)
+
 		//如果机构搜索做了限制 ，那么公司列表的纵向展示也做限制
 		if keyWord != "" {
+			var searchcompanyIds []int
 			for _, v := range list {
-				companyIds = append(companyIds, v.CompanyId)
+				searchcompanyIds = append(searchcompanyIds, v.CompanyId)
 			}
+			newcompanyIds = utils.IntersectInt(searchcompanyIds, companyIds) //获取销售可见权限，与搜索权限的交集
+		} else {
+			newcompanyIds = companyIds
 		}
 
-		lencompanyIds := len(companyIds)
+		newlencompanyIds := len(newcompanyIds)
+
 		if lencompanyIds > 0 {
-			companyCondition += ` AND a.company_id IN (` + utils.GetOrmInReplace(lencompanyIds) + `)`
-			companypars = append(companypars, companyIds)
+			companyCondition += ` AND a.company_id IN (` + utils.GetOrmInReplace(newlencompanyIds) + `)`
+			companypars = append(companypars, newcompanyIds)
 		}
 
 		if city != "" {
@@ -1095,14 +1102,18 @@ func (this *EnterScoreController) EnterScoreRankingOverview() {
 		companyCondition += ` AND b.seller_id IN (` + adminId + `) `
 	}
 	if city != "" {
-		companyCondition += ` AND a.city = ? `
-		companypars = append(companypars, city)
+		//传过来多个城市的时候的筛选
+		citySlice := strings.Split(city, ",")
+		city = strings.Join(citySlice, "','")
+		city = "'" + city + "'"
+		companyCondition += ` AND a.city  IN  (` + city + `) `
 	}
+
 	//权益申请销售只能看到自己名下的客户的申请
 	companyIds, err := cygxService.GetAdminLookUserCompanyIdsBySelf(AdminUser)
 	if err != nil {
 		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败，GetAdminLookUserCompanyIds Err:" + err.Error()
+		br.ErrMsg = "获取失败，GetAdminLookUserCompanyIdsBySelf Err:" + err.Error()
 		return
 	}
 	lencompanyIds := len(companyIds)

models/company/company_approval.go

@@ -297,7 +297,8 @@ func TryOutToFormalXClassRai(companyId, productId, sellerId, companyApprovalId,
 			err = to.Commit()
 		}
 	}()
-
+	//123月份申请转正通过时，将试用期限延长(更新)至4.30。456月份申请转正通过时，将试用期限延长至7.31。789月份申请转正通过时，将试用期限延长至10.31。101112月份申请转正通过时，将试用期限延长至次年1.31。
+	endDate = utils.GetLastDayOfQuarter(time.Now()).Format(utils.FormatDate)
 	// 套餐类型为0时, 不更新套餐类型，权益与FICC开始与结束时间一起修改
 	sql := `UPDATE company_product SET status='永续',try_out_time=NULL,last_description_time=NULL,freeze_time=NULL,renewal_intention=0,is_suspend=0,is_formal=1,approve_status='已审批',end_date=?,rai_package_type=?,modify_time=NOW(),formal_time=NOW(),try_stage=1  WHERE company_id=?  `
 	_, err = to.Raw(sql, endDate, raiPackageType, companyId).Exec()
@@ -331,7 +332,7 @@ func TryOutToFormalXClassRai(companyId, productId, sellerId, companyApprovalId,
 		go AddCompanyPermissionLog(cpLog)
 	}
 
-	sql = `UPDATE company_report_permission SET end_date=? WHERE  company_id=?  ` // 更改权限的开始时间结束时间
+	sql = `UPDATE company_report_permission SET  status='永续', end_date=? WHERE  company_id=?  ` // 更改权限的开始时间结束时间
 	_, err = to.Raw(sql, endDate, companyId).Exec()
 	if err != nil {
 		return

services/company_apply/company_approval.go

@@ -670,8 +670,8 @@ func afterApproved(companyApprovalId int, opUserId int, opUserName string) (err
 		//}
 		//如果是权益的用户客户转正审批单独走
 		if companyProduct.Status == utils.COMPANY_STATUS_FOREVER && companyProduct.ProductId == 2 {
-			contractInfo.StartDate = contractStartDate.AddDate(0, 4, 0).Format(utils.FormatDate) // 开始时间与结束时间都加三个月
-			contractInfo.EndDate = contractEndDate.AddDate(0, 4, 0).Format(utils.FormatDate)
+			//contractInfo.StartDate = contractStartDate.AddDate(0, 4, 0).Format(utils.FormatDate) // 开始时间与结束时间都加三个月
+			//contractInfo.EndDate = contractEndDate.AddDate(0, 4, 0).Format(utils.FormatDate)
 			startDate = contractInfo.StartDate
 			endDate = contractInfo.EndDate
 			companyReportPermissionList, tmpErr = company.TryOutToFormalXClassRai(recodeInfo.CompanyId, recodeInfo.ProductId, opUser.AdminId, recodeInfo.CompanyApprovalId, contractInfo.CompanyContractId, contractInfo.StartDate, contractInfo.EndDate, opUser.RealName, companyProduct.ProductName, contractInfo.RaiPackageType)

utils/common.go

@@ -2305,3 +2305,17 @@ func GetQuarterStrStartDatesInRangeHaveYear(startTimeStr, endTimeStr string) (qu
 	quartersStar = strings.Join(quarters, ",")
 	return quartersStar, nil
 }
+
+// 获取当前时间所属季度的最后一天，并往后推一个月
+func GetLastDayOfQuarter(t time.Time) time.Time {
+	month := (t.Month()-1)/3*3 + 1 // 计算当前季度的第一个月份
+	nextQuarter := month + 3
+	year := t.Year()
+	if nextQuarter > 12 {
+		nextQuarter -= 12
+		year++
+	}
+	// 构建当前季度的最后一天
+	lastDay := time.Date(year, time.Month(nextQuarter), 1, 0, 0, 0, 0, time.UTC).AddDate(0, 1, 0).Add(-time.Second)
+	return lastDay
+}