no message

controllers/company_apply.go

@@ -1918,6 +1918,7 @@ func (this *CompanyApplyController) ApplyContract() {
 		//升级
 		mapUpgrade := make(map[int]int)
 		mapExpensive := make(map[int]bool)
+		var expensiveYx int
 		permissionList, err := company.GetCompanyContractPermissionByCompanyContractId(contractItem.CompanyContractId)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"
@@ -1929,8 +1930,9 @@ func (this *CompanyApplyController) ApplyContract() {
 			if v.IsUpgrade == 1 {
 				mapUpgrade[v.ChartPermissionId] = v.ChartPermissionId
 			}
-			if v.ExpensiveYx == 1 {
+			if v.ExpensiveYx > 0 {
 				mapExpensive[v.ChartPermissionId] = true
+				expensiveYx = v.ExpensiveYx
 			}
 			permissionIds = append(permissionIds, v.ChartPermissionId)
 		}
@@ -1951,8 +1953,12 @@ func (this *CompanyApplyController) ApplyContract() {
 					checkList = append(checkList, n.ChartPermissionId+utils.PERMISSION_ID_UPGRADE)
 				} else {
 					if mapExpensive[n.ChartPermissionId] {
-						// 研选5w
-						checkList = append(checkList, n.ChartPermissionId+utils.PERMISSION_ID_YANXUAN_DIFF)
+						// 研选5w与10W
+						if expensiveYx == 1 {
+							checkList = append(checkList, n.ChartPermissionId+utils.PERMISSION_ID_YANXUAN_DIFF) // 5W
+						} else {
+							checkList = append(checkList, utils.PERMISSION_ID_YANXUAN_10W_DIFF) // 10W
+						}
 					} else {
 						// 非内部人员, 忽略掉已有的客观权限, 否则前端升级的反选会出现问题, 重新提交的时候只提交主观权限也有对应的处理
 						if !strings.Contains(n.Remark, "客观") {
@@ -1967,9 +1973,9 @@ func (this *CompanyApplyController) ApplyContract() {
 				//mapChartPermissionId[n.ChartPermissionId] = n.ChartPermissionId
 			}
 
-			// 买方研选3w/5w
+			// 买方研选3w/5w/10w
 			if n.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN {
-				m3, m5 := new(company.PermissionLookItem), new(company.PermissionLookItem)
+				m3, m5, m10 := new(company.PermissionLookItem), new(company.PermissionLookItem), new(company.PermissionLookItem)
 				m3.ChartPermissionId = n.ChartPermissionId
 				m3.PermissionName = fmt.Sprint(n.PermissionName, "(3w)")
 				plist.Items = append(plist.Items, m3)
@@ -1977,6 +1983,10 @@ func (this *CompanyApplyController) ApplyContract() {
 				m5.ChartPermissionId = n.ChartPermissionId + utils.PERMISSION_ID_YANXUAN_DIFF
 				m5.PermissionName = fmt.Sprint(n.PermissionName, "(5w)")
 				plist.Items = append(plist.Items, m5)
+
+				m10.ChartPermissionId = utils.PERMISSION_ID_YANXUAN_10W_DIFF
+				m10.PermissionName = fmt.Sprint(n.PermissionName, "(10w)")
+				plist.Items = append(plist.Items, m10)
 				continue
 			}
 

controllers/company_apply_v2.go

@@ -451,6 +451,14 @@ func (this *CompanyApplyController) ApplyTurnPositive() {
 				continue
 			}
 
+			// 研选10w的处理
+			if permissionId == utils.PERMISSION_ID_YANXUAN_10W_DIFF {
+				//permissionIdsNew += strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + ","
+				strPermissionIdArr = append(strPermissionIdArr, strconv.Itoa(utils.PERMISSION_ID_YANXUAN_10W_DIFF))
+				expensiveYx = 2
+				continue
+			}
+
 			if permissionId > utils.PERMISSION_ID_UPGRADE {
 				//permissionIdsNew += strconv.Itoa(permissionId-utils.PERMISSION_ID_UPGRADE) + ","
 				permissionIdOnly = permissionId - utils.PERMISSION_ID_UPGRADE

services/company_permission.go

@@ -295,13 +295,21 @@ func CheckCompanyUpgradeV2(strPermissionIds string, isRai bool) (newPermissions
 			continue
 		}
 		// 买方研选5w
-		if p > utils.PERMISSION_ID_YANXUAN_DIFF {
+		if p > utils.PERMISSION_ID_YANXUAN_DIFF && p < utils.PERMISSION_ID_YANXUAN_10W_DIFF {
 			o := p - utils.PERMISSION_ID_YANXUAN_DIFF
 			expensiveMap[o] = 1
 			existsId[o] = true
 			newPermissionArr = append(newPermissionArr, strconv.Itoa(o))
 			continue
 		}
+		// 买方研选10w
+		if p == utils.PERMISSION_ID_YANXUAN_10W_DIFF {
+			o := utils.PERMISSION_ID_YANXUAN_10W_DIFF
+			expensiveMap[o] = 1
+			existsId[o] = true
+			newPermissionArr = append(newPermissionArr, strconv.Itoa(o))
+			continue
+		}
 		// 非升级权限
 		existsId[p] = true
 		newPermissionArr = append(newPermissionArr, strconv.Itoa(p))

services/cygx/contract_allocation.go

@@ -64,6 +64,8 @@ func GetCompanyContractPermissionNameMapById(companyContractIds []int) (mapContr
 			if v.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
 				if v.ExpensiveYx == 1 {
 					mapContractIdPerssion[(v.CompanyContractId)] += utils.CHART_PERMISSION_NAME_MF_YANXUAN + "(5w),"
+				} else if v.ExpensiveYx == 2 {
+					mapContractIdPerssion[(v.CompanyContractId)] += utils.CHART_PERMISSION_NAME_MF_YANXUAN + "(10w),"
 				} else {
 					mapContractIdPerssion[(v.CompanyContractId)] += utils.CHART_PERMISSION_NAME_MF_YANXUAN + "(3w),"
 				}