xingzai 1 vuosi sitten
vanhempi
commit
878de9e01a
1 muutettua tiedostoa jossa 11 lisäystä ja 5 poistoa
  1. 11 5
      controllers/cygx/contract_allocation.go

+ 11 - 5
controllers/cygx/contract_allocation.go

@@ -945,8 +945,6 @@ func (this *ContractAllocationController) CompanyContractStatistics() {
 			item.TotalDispatchPoint = "0"
 		}
 		//组内占比
-		//utils.SubFloatToString(val, 4)
-		//item.GroupProportion = fmt.Sprint(mapUserMoney[v.Name] / mapPermissionMoney[v.ChartPermissionName] * 100)
 		if mapUserMoney[v.Name] == 0 {
 			item.GroupProportion = ""
 		} else {
@@ -958,7 +956,11 @@ func (this *ContractAllocationController) CompanyContractStatistics() {
 		item.GroupProportion += "%"
 
 		//部门占比
-		item.DepartmentProportion = utils.SubFloatToString(mapUserMoney[v.Name]/totalMoney*100, 2)
+		if totalMoney == 0 {
+			item.DepartmentProportion = ""
+		} else {
+			item.DepartmentProportion = utils.SubFloatToString(mapUserMoney[v.Name]/totalMoney*100, 2)
+		}
 		if item.DepartmentProportion == "" {
 			item.DepartmentProportion = "0"
 		}
@@ -974,8 +976,12 @@ func (this *ContractAllocationController) CompanyContractStatistics() {
 		item.TotalDispatchPoint = fmt.Sprint(utils.SubFloatToString(mapPermissionMoney[k], 2), "/", mapPermissionMoneyAvg[k])
 		item.GroupProportion = "100%"
 
-		// 部门占比
-		item.DepartmentProportion = utils.SubFloatToString(mapPermissionMoney[k]/totalMoney*100, 2)
+		//部门占比
+		if totalMoney == 0 {
+			item.DepartmentProportion = ""
+		} else {
+			item.DepartmentProportion = utils.SubFloatToString(mapPermissionMoney[k]/totalMoney*100, 2)
+		}
 		if item.DepartmentProportion == "" {
 			item.DepartmentProportion = "0"
 		}