no message

controllers/cygx/contract_allocation.go

@@ -564,6 +564,7 @@ func (this *ContractAllocationController) CompanyContracDetail() {
 			respItemYx.Proportion = 0
 			respItemYx.Money = moneyYx
 			respItemYx.ChartPermissionName = utils.CHART_PERMISSION_NAME_MF_YANXUAN
+			respItemYx.ChartPermissionId = utils.CHART_PERMISSION_ID_YANXUAN
 			respItemYx.List = append(respItemYx.List, &cygx.AllocationRealNameListResp{utils.CHART_PERMISSION_NAME_MF_YANXUAN, 0, moneyYx})
 		}
 
@@ -571,6 +572,7 @@ func (this *ContractAllocationController) CompanyContracDetail() {
 			respItemYxKouDian.Proportion = 0
 			respItemYxKouDian.Money = pointMoney
 			respItemYxKouDian.ChartPermissionName = utils.YAN_XUAN_KOU_DIAN_BAO_NAME
+			respItemYxKouDian.ChartPermissionId = utils.YAN_XUAN_KOU_DIAN_BAO_ID
 			respItemYxKouDian.List = append(respItemYxKouDian.List, &cygx.AllocationRealNameListResp{utils.YAN_XUAN_KOU_DIAN_BAO_NAME, 0, pointMoney})
 		}
 
@@ -602,9 +604,23 @@ func (this *ContractAllocationController) CompanyContracDetail() {
 			mapPermissionUser[v.ChartPermissionName] = append(mapPermissionUser[v.ChartPermissionName], item)
 		}
 
+		listPermission, err := cygx.GetChartPermissionAll()
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
+			return
+		}
+
+		mapPermissionId := make(map[string]int)
+
+		for _, v := range listPermission {
+			mapPermissionId[v.PermissionName] = v.ChartPermissionId
+		}
+
 		for k, v := range mapPermissionUser {
 			respItem := new(cygx.AllocationPermissionListResp)
 			respItem.ChartPermissionName = k
+			respItem.ChartPermissionId = mapPermissionId[k]
 			respItem.List = v
 			respList = append(respList, respItem)
 		}
@@ -646,6 +662,7 @@ func (this *ContractAllocationController) CompanyContracDetail() {
 			}
 			respItem := new(cygx.AllocationPermissionListResp)
 			respItem.ChartPermissionName = v.ChartPermissionName
+			respItem.ChartPermissionId = v.ChartPermissionId
 			respItem.Money = v.Money
 			respItem.Proportion = v.Proportion
 			respItem.List = mapPermissionUser[v.ChartPermissionName]

controllers/cygx/industrial_management.go

@@ -64,7 +64,7 @@ func (this *IndustrialManagementController) ChartPermissionList() {
 		resp.List = append(resp.List, item)
 	} else {
 		for _, v := range list {
-			if v.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN && isHideResearch {
+			if (v.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN || v.PermissionName == utils.YAN_XUAN_KOU_DIAN_BAO_NAME) && isHideResearch {
 				continue
 			}
 			resp.List = append(resp.List, v)

models/cygx/allocation_company_contract.go

@@ -169,6 +169,7 @@ type CygxAllocationCompanyContractDetailResp struct {
 // 行业
 type AllocationPermissionListResp struct {
 	ChartPermissionName string  `description:"行业名称"`
+	ChartPermissionId   int     `description:"行业id"`
 	Proportion          float64 `description:"占比"`
 	Money               float64 `description:"金额（单位万）"`
 	MoneyAvg            float64 `description:"行业所占合同的平均金额"`