|
|
@@ -912,6 +912,8 @@ func (this *ContractAllocationController) CompanyContractStatistics() {
|
|
|
mapPermissionAllocation := make(map[string]float64)
|
|
|
mapPermissionMoney := make(map[string]float64)
|
|
|
mapPermissionMoneyAvg := make(map[string]float64)
|
|
|
+ mapPermissionContract := make(map[string]float64) // 行业关联的合同数量
|
|
|
+ mapPermissionContractKey := make(map[string]bool) // 行业关联的合同数量键值对
|
|
|
|
|
|
//totalContract := lenArr //所有的关联合同
|
|
|
var totalMoney float64 //所有的关联合同的金额 单位万
|
|
|
@@ -941,6 +943,11 @@ func (this *ContractAllocationController) CompanyContractStatistics() {
|
|
|
mapPermissionMoney[v.ChartPermissionName] += v.Money
|
|
|
totalMoney += v.Money
|
|
|
companyContractIdBool[v.CompanyContractId] = true
|
|
|
+ //统计单个行业所关的合同数量
|
|
|
+ if !mapPermissionContractKey[fmt.Sprint("ChartPermissionName_", v.ChartPermissionName, "CompanyContractId_", v.CompanyContractId)] {
|
|
|
+ mapPermissionContract[v.ChartPermissionName] += 1
|
|
|
+ mapPermissionContractKey[fmt.Sprint("ChartPermissionName_", v.ChartPermissionName, "CompanyContractId_", v.CompanyContractId)] = true
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
for _, v := range allocationCompanyContractPermissionList {
|
|
|
@@ -993,7 +1000,7 @@ func (this *ContractAllocationController) CompanyContractStatistics() {
|
|
|
lenUser := len(v)
|
|
|
item := new(cygx.AllocationRealNameStatisticsListResp)
|
|
|
item.RealName = "合计"
|
|
|
- item.TotalRelatedContract = mapPermissionAllocation[k]
|
|
|
+ item.TotalRelatedContract = mapPermissionContract[k]
|
|
|
item.TotalDispatchPoint = fmt.Sprint(utils.SubFloatToString(mapPermissionMoney[k], 2), "/", utils.SubFloatToString(mapPermissionMoneyAvg[k], 2))
|
|
|
item.GroupProportion = "100%"
|
|
|
|
xingzai