no message

controllers/cygx/contract_allocation.go

@@ -191,7 +191,7 @@ func (this *ContractAllocationController) CompanyContractList() {
 
 	//是否派点
 	if isAllocation != -1 {
-		condition += ` AND a.product_id = ? `
+		condition += ` AND a.is_allocation = ? `
 		pars = append(pars, isAllocation)
 	}
 
@@ -570,7 +570,8 @@ func (this *ContractAllocationController) CompanyContracDetail() {
 			resp.TotalPointsContent = fmt.Sprint(resp.Money, "W")
 		}
 		resp.Money = resp.Money - moneyYx
-		respItemYx.Proportion = moneyYx
+		respItemYx.Proportion = 0
+		respItemYx.Money = moneyYx
 		respItemYx.ChartPermissionName = utils.CHART_PERMISSION_NAME_MF_YANXUAN
 		respItemYx.List = append(respItemYx.List, &cygx.AllocationRealNameListResp{utils.CHART_PERMISSION_NAME_MF_YANXUAN, 0, moneyYx})
 	} else {
@@ -851,7 +852,7 @@ func (this *ContractAllocationController) CompanyContractStatistics() {
 	var pars []interface{}
 
 	//根据当前角色来获取查询条件
-	condition, pars = getQueryParams(condition, pars, sysUser, "c.")
+	//condition, pars = getQueryParams(condition, pars, sysUser, "c.")
 
 	companyIds, err := cygxService.GetAdminLookUserCompanyIdsBySelf(sysUser)
 	if err != nil {
@@ -871,7 +872,7 @@ func (this *ContractAllocationController) CompanyContractStatistics() {
 	}
 
 	//默认只查询权益 2023-06-01 之后的合同
-	condition += ` AND c.product_id = ?  AND a.start_date > ? `
+	condition += ` AND c.product_id = ?  AND a.start_date > ?   `
 	pars = append(pars, 2, "2023-01-01")
 
 	//列表页数据
@@ -882,6 +883,7 @@ func (this *ContractAllocationController) CompanyContractStatistics() {
 		return
 	}
 	var companyContractIds []int
+	companyContractIdBool := make(map[int]bool)
 	for _, v := range listContract {
 		companyContractIds = append(companyContractIds, v.CompanyContractId)
 	}
@@ -893,8 +895,8 @@ func (this *ContractAllocationController) CompanyContractStatistics() {
 	mapPermissionMoney := make(map[string]float64)
 	mapPermissionMoneyAvg := make(map[string]float64)
 
-	totalContract := lenArr //所有的关联合同
-	var totalMoney float64  //所有的关联合同的金额 单位万
+	//totalContract := lenArr //所有的关联合同
+	var totalMoney float64 //所有的关联合同的金额 单位万
 	if lenArr > 0 {
 		var conditionAllocation string
 		var parsAllocation []interface{}
@@ -913,13 +915,14 @@ func (this *ContractAllocationController) CompanyContractStatistics() {
 			return
 		}
 		for _, v := range allocationCompanyContractList {
+
 			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
 				mapPermissionMoney[v.ChartPermissionName] += v.Money
-
 				totalMoney += v.Money
+				companyContractIdBool[v.CompanyContractId] = true
 			}
 		}
 		for _, v := range allocationCompanyContractPermissionList {
@@ -1005,7 +1008,12 @@ func (this *ContractAllocationController) CompanyContractStatistics() {
 		item.GroupProportion += "%"
 
 		// 部门占比
-		item.DepartmentProportion = utils.SubFloatToString(mapPermissionMoney[k]/totalMoney*100/float64(len(mapPermissionUser[k])), 2)
+		if totalMoney == 0 {
+			item.DepartmentProportion = ""
+		} else {
+			item.DepartmentProportion = utils.SubFloatToString(mapPermissionMoney[k]/totalMoney*100/float64(len(mapPermissionUser[k])), 2)
+		}
+
 		if item.DepartmentProportion == "" {
 			item.DepartmentProportion = "0"
 		}
@@ -1025,7 +1033,7 @@ func (this *ContractAllocationController) CompanyContractStatistics() {
 	resp := cygx.CygxAllocationCompanyContractDetailStatisticsResp{
 		List: list,
 	}
-	resp.TotalContract = totalContract
+	resp.TotalContract = len(companyContractIdBool)
 	resp.TotalMoney = utils.SubFloatToFloat(totalMoney, 2)
 	//导出excel
 	if isExport {