Merge branch 'crm/crm_15.4' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/enter_score.go

@@ -681,9 +681,9 @@ func (this *EnterScoreController) EnterScoreScoreOverview() {
 		pars = append(pars, startDate, endDate)
 	}
 
-	if enterScoreType == 2 {
+	//if enterScoreType == 2 {
-		condition += ` AND enter_score_type = 2 `
+	//condition += ` AND enter_score_type = 2 `
-	}
+	//}
 
 	if keyWord != "" {
 		condition += ` AND securities_firms_name LIKE '%` + keyWord + `%' `
@@ -703,10 +703,12 @@ func (this *EnterScoreController) EnterScoreScoreOverview() {
 			return
 		}
 		mapenterScoreTypeCompanyIds := make(map[int]bool)
+		mapenterScoreProportionTotal := make(map[int]float64)
 		var enterScoreIds []int
 		mapenterScore := make(map[int]*cygx.CygxEnterScore) //录分详情放在map中
 		for _, v := range list {
 			mapenterScore[v.CompanyId] = v
+			mapenterScoreProportionTotal[v.CompanyId] = v.ProportionTotal
 			enterScoreIds = append(enterScoreIds, v.EnterScoreId)
 			if v.EnterScoreType == 2 {
 				mapenterScoreTypeCompanyIds[v.CompanyId] = true //记录按照百分比录入的公司
@@ -785,7 +787,13 @@ func (this *EnterScoreController) EnterScoreScoreOverview() {
 				researcherArr = append(researcherArr, v.RealName)
 				mapResearcherbool[v.RealName] = true
 			}
-			mapResearcherProportion[fmt.Sprint(v.RealName, "_", v.CompanyId)] = fmt.Sprint(v.Proportion) //研究员姓名、公司ID，占比值对应关系绑定
+
+			if enterScoreType == 2 && !mapenterScoreTypeCompanyIds[v.CompanyId] {
+				mapResearcherProportion[fmt.Sprint(v.RealName, "_", v.CompanyId)] = utils.SubFloatToString(v.Proportion/mapenterScoreProportionTotal[v.CompanyId]*100, 2) //研究员姓名、公司ID，占比值对应关系绑定
+			} else {
+				mapResearcherProportion[fmt.Sprint(v.RealName, "_", v.CompanyId)] = fmt.Sprint(v.Proportion) //研究员姓名、公司ID，占比值对应关系绑定
+			}
+
 		}
 
 		mapResearcherProportionText := make(map[string][]string)
@@ -798,7 +806,7 @@ func (this *EnterScoreController) EnterScoreScoreOverview() {
 				} else {
 					proportionText = "0"
 				}
-				if mapenterScoreTypeCompanyIds[vC.CompanyId] { //按照百分比展示的拼接 %
+				if mapenterScoreTypeCompanyIds[vC.CompanyId] || enterScoreType == 2 { //按照百分比展示的拼接 %
 					proportionText += "%"
 				}
 				mapResearcherProportionText[vR] = append(mapResearcherProportionText[vR], proportionText)
@@ -832,7 +840,13 @@ func (this *EnterScoreController) EnterScoreScoreOverview() {
 			if v.Proportion == 0 {
 				continue
 			}
-			mapPermissionProportion[fmt.Sprint(v.ChartPermissionName, "_", v.CompanyId)] = fmt.Sprint(v.Proportion) //行业名称、公司ID，占比值对应关系绑定
+			//mapPermissionProportion[fmt.Sprint(v.ChartPermissionName, "_", v.CompanyId)] = fmt.Sprint(v.Proportion) //行业名称、公司ID，占比值对应关系绑定
+
+			if enterScoreType == 2 && !mapenterScoreTypeCompanyIds[v.CompanyId] {
+				mapPermissionProportion[fmt.Sprint(v.ChartPermissionName, "_", v.CompanyId)] = utils.SubFloatToString(v.Proportion/mapenterScoreProportionTotal[v.CompanyId]*100, 2) //研究员姓名、公司ID，占比值对应关系绑定
+			} else {
+				mapPermissionProportion[fmt.Sprint(v.ChartPermissionName, "_", v.CompanyId)] = fmt.Sprint(v.Proportion) //行业名称、公司ID，占比值对应关系绑定
+			}
 		}
 
 		var permissionArr []string // 会出现的行业名称
@@ -854,7 +868,7 @@ func (this *EnterScoreController) EnterScoreScoreOverview() {
 				} else {
 					proportionText = "0"
 				}
-				if mapenterScoreTypeCompanyIds[vC.CompanyId] { //按照百分比展示的拼接 %
+				if mapenterScoreTypeCompanyIds[vC.CompanyId] || enterScoreType == 2 { //按照百分比展示的拼接 %
 					proportionText += "%"
 				}
 				mapPermissionProportionText[vP] = append(mapPermissionProportionText[vP], proportionText)
@@ -880,7 +894,14 @@ func (this *EnterScoreController) EnterScoreScoreOverview() {
 		var groupArr []string // 会出现的自定义分组名称
 		mapGroupbool := make(map[string]bool)
 		for _, v := range listGroup {
-			mapGroupProportion[fmt.Sprint(v.GroupName, "_", v.CompanyId)] = fmt.Sprint(v.Proportion) //自定义分组名称、公司ID，占比值对应关系绑定
+
+			if enterScoreType == 2 && !mapenterScoreTypeCompanyIds[v.CompanyId] {
+				mapGroupProportion[fmt.Sprint(v.GroupName, "_", v.CompanyId)] = utils.SubFloatToString(v.Proportion/mapenterScoreProportionTotal[v.CompanyId]*100, 2) //自定义分组名称、公司ID，占比值对应关系绑定
+			} else {
+				mapGroupProportion[fmt.Sprint(v.GroupName, "_", v.CompanyId)] = fmt.Sprint(v.Proportion) //自定义分组名称、公司ID，占比值对应关系绑定
+			}
+
+			//mapGroupProportion[fmt.Sprint(v.GroupName, "_", v.CompanyId)] = fmt.Sprint(v.Proportion) //自定义分组名称、公司ID，占比值对应关系绑定
 			if mapGroupbool[v.GroupName] {
 				continue
 			}
@@ -896,7 +917,7 @@ func (this *EnterScoreController) EnterScoreScoreOverview() {
 				} else {
 					proportionText = "0"
 				}
-				if mapenterScoreTypeCompanyIds[vC.CompanyId] { //按照百分比展示的拼接 %
+				if mapenterScoreTypeCompanyIds[vC.CompanyId] || enterScoreType == 2 { //按照百分比展示的拼接 %
 					proportionText += "%"
 				}
 				mapGroupProportionText[vP] = append(mapGroupProportionText[vP], proportionText)