|
|
@@ -522,7 +522,7 @@ func (this *ContractAllocationController) CompanyContracDetail() {
|
|
|
for _, p := range hasPermissions {
|
|
|
hasMap[p.ChartPermissionId] = p
|
|
|
}
|
|
|
- checkItems := make([]*company.PermissionLookItem, 0)
|
|
|
+ //checkItems := make([]*company.PermissionLookItem, 0)
|
|
|
raiPermissions, e := company.GetPermissionLookItemsExt("2", utils.COMPANY_PRODUCT_RAI_NAME)
|
|
|
if e != nil {
|
|
|
br.Msg = "获取失败"
|
|
|
@@ -533,24 +533,25 @@ func (this *ContractAllocationController) CompanyContracDetail() {
|
|
|
var expensiveYx int
|
|
|
for _, n := range raiPermissions {
|
|
|
match := hasMap[n.ChartPermissionId]
|
|
|
+ fmt.Println(match, n.ChartPermissionId)
|
|
|
if match == nil {
|
|
|
continue
|
|
|
}
|
|
|
// 升级
|
|
|
- if match.IsUpgrade == 1 {
|
|
|
- n.IsUpgrade = 1
|
|
|
- checkItems = append(checkItems, n)
|
|
|
- continue
|
|
|
- }
|
|
|
+ //if match.IsUpgrade == 1 {
|
|
|
+ // n.IsUpgrade = 1
|
|
|
+ // checkItems = append(checkItems, n)
|
|
|
+ // continue
|
|
|
+ //}
|
|
|
mapPermissionNameHave[n.PermissionName] = true
|
|
|
// 买方研选(3w/5w)
|
|
|
if n.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN {
|
|
|
expensiveYx = match.ExpensiveYx
|
|
|
n.PermissionName += expMap[match.ExpensiveYx]
|
|
|
- checkItems = append(checkItems, n)
|
|
|
+ //checkItems = append(checkItems, n)
|
|
|
continue
|
|
|
}
|
|
|
- checkItems = append(checkItems, n)
|
|
|
+ //checkItems = append(checkItems, n)
|
|
|
}
|
|
|
|
|
|
resp.Money = contractItem.Money / 10000
|
|
|
@@ -912,7 +913,7 @@ func (this *ContractAllocationController) CompanyContractStatistics() {
|
|
|
return
|
|
|
}
|
|
|
for _, v := range allocationCompanyContractList {
|
|
|
- if v.Proportion != 0 {
|
|
|
+ if v.Proportion != 0 && v.ChartPermissionName != utils.CHART_PERMISSION_NAME_MF_YANXUAN {
|
|
|
mapUserAllocation[v.RealName] += 1
|
|
|
mapUserMoney[v.RealName] += v.Money
|
|
|
mapPermissionAllocation[v.ChartPermissionName] += 1
|
xingzai