增加代码

cmd/static/detail/Common.go

@@ -81,27 +81,28 @@ func GetCompanyModelItemsByProjectidWitchString(project_id int64 , stringVal str
 
 
 func GetScore(projectId int64, stringVal string) (fianlscore float64)  {
 func GetScore(projectId int64, stringVal string) (fianlscore float64)  {
 
 
-	var score float64
-
 	modelTypeInfo,_ := Svclient.GetCompanyModelByProjectid(Conclient,projectId)
 	modelTypeInfo,_ := Svclient.GetCompanyModelByProjectid(Conclient,projectId)
 
 
 	modelInfo := make(map[string]string)
 	modelInfo := make(map[string]string)
 
 
 	//如果是四，就用文本类型查询
 	//如果是四，就用文本类型查询
-	if StringTurnInt64(modelTypeInfo["numeric_type"]) == 4 {
+	if modelTypeInfo["numeric_type"] == "4" {
 		modelInfo = GetCompanyModelItemsByProjectidWitchString(projectId,stringVal)
 		modelInfo = GetCompanyModelItemsByProjectidWitchString(projectId,stringVal)
 	}else{
 	}else{
-		modelInfo = GetCompanyModelItemsByProjectid(projectId,StringTurnFloat64(stringVal))
-	}
 
 
-	switch modelInfo["unit"] {
-	case "万元":
-		score = StringTurnFloat64(modelInfo["score"]) /10000
-		break
-	default:
-		score = StringTurnFloat64(modelInfo["score"]) /1
+		var score float64
+		switch modelTypeInfo["unit"] {
+		case "5":
+			score = StringTurnFloat64(stringVal) /10000
+			break
+		default:
+			score = StringTurnFloat64(stringVal) /1
+		}
+
+		modelInfo = GetCompanyModelItemsByProjectid(projectId,score)
 	}
 	}
-	return score
+
+	return StringTurnFloat64(modelInfo["score"])
 }
 }
 
 
 //设置分数
 //设置分数

internal/service/service.go

@@ -2,12 +2,10 @@ package service
 
 
 import (
 import (
 	"context"
 	"context"
-	"fmt"
-	"kaopu-server/internal/dao"
-	"kaopu-server/internal/model"
 	"github.com/bilibili/kratos/pkg/conf/paladin"
 	"github.com/bilibili/kratos/pkg/conf/paladin"
 	"github.com/pkg/errors"
 	"github.com/pkg/errors"
-
+	"kaopu-server/internal/dao"
+	"kaopu-server/internal/model"
 )
 )
 
 
 // Service service.
 // Service service.
@@ -53,7 +51,7 @@ func (s *Service) GetUserList(ctx context.Context) (res []*model.Users, err erro
 	
 	
 	//调用DB方法，获取会员数据
 	//调用DB方法，获取会员数据
 	res, _ = s.dao.GetUserList(ctx)
 	res, _ = s.dao.GetUserList(ctx)
-	fmt.Println(res)
+	//fmt.Println(res)
 	
 	
 	return
 	return
 }
 }
@@ -66,7 +64,7 @@ func (s *Service) GetCompanyCresitsList(c context.Context) (res []map[string]str
 
 
 	//调用DB方法，获取会员数据
 	//调用DB方法，获取会员数据
 	res, err = s.dao.GetCompanyCresitsList(c)
 	res, err = s.dao.GetCompanyCresitsList(c)
-	fmt.Print(err)
+	//fmt.Print(err)
 	return
 	return
 }
 }
 
 
@@ -75,7 +73,7 @@ func (s *Service) GetCompanyBaseInfoByCid(c context.Context, companyId int64) (r
 
 
 	//调用DB方法，获取会员数据
 	//调用DB方法，获取会员数据
 	res, err = s.dao.GetCompanyBaseInfoByCid(c,companyId)
 	res, err = s.dao.GetCompanyBaseInfoByCid(c,companyId)
-	fmt.Print(err)
+	//fmt.Print(err)
 	return
 	return
 }
 }
 
 
@@ -84,7 +82,7 @@ func (s *Service) GetCompanyScoreFieldsByCid(c context.Context, companyId int64)
 
 
 	//调用DB方法，获取会员数据
 	//调用DB方法，获取会员数据
 	res, err = s.dao.GetCompanyScoreFieldsByCid(c,companyId)
 	res, err = s.dao.GetCompanyScoreFieldsByCid(c,companyId)
-	fmt.Print(err)
+	//fmt.Print(err)
 	return
 	return
 }
 }
 
 
@@ -93,7 +91,7 @@ func (s *Service) GetBasicInfoByCid(c context.Context, erpCompanyCode string) (r
 
 
 	//调用DB方法，获取会员数据
 	//调用DB方法，获取会员数据
 	res, err = s.dao.GetBasicInfoByCid(c,erpCompanyCode)
 	res, err = s.dao.GetBasicInfoByCid(c,erpCompanyCode)
-	fmt.Print(err)
+	//fmt.Print(err)
 	return
 	return
 }
 }
 
 
@@ -102,7 +100,7 @@ func (s *Service) GetCompanyModelByProjectid(c context.Context, projectId int64)
 
 
 	//调用DB方法，获取会员数据
 	//调用DB方法，获取会员数据
 	res, err = s.dao.GetCompanyModelByProjectid(c,projectId)
 	res, err = s.dao.GetCompanyModelByProjectid(c,projectId)
-	fmt.Print(err)
+	//fmt.Print(err)
 	return
 	return
 }
 }
 
 
@@ -112,7 +110,7 @@ func (s *Service) GetCompanyAddSore(c context.Context, companyId int64) (res []m
 
 
 	//调用DB方法，获取会员数据
 	//调用DB方法，获取会员数据
 	res, err = s.dao.GetCompanyAddSoreByCid(c,companyId)
 	res, err = s.dao.GetCompanyAddSoreByCid(c,companyId)
-	fmt.Print(err)
+	//fmt.Print(err)
 	return
 	return
 }
 }
 
 
@@ -140,7 +138,7 @@ func (s *Service) UpdateStaticSumScores(c context.Context,com_credits model.ComC
 
 
 	//调用DB方法，获取会员数据
 	//调用DB方法，获取会员数据
 	res, err = s.dao.UpdateStaticSumScores(c,com_credits)
 	res, err = s.dao.UpdateStaticSumScores(c,com_credits)
-	fmt.Print(err)
+	//fmt.Print(err)
 	return
 	return
 }
 }
 
 
@@ -149,7 +147,7 @@ func (s *Service) InsertScores(c context.Context,score model.Scores) (res int64,
 
 
 	//调用DB方法，获取会员数据
 	//调用DB方法，获取会员数据
 	res, err = s.dao.InsertScores(c,score)
 	res, err = s.dao.InsertScores(c,score)
-	fmt.Print(err)
+	//fmt.Print(err)
 	return
 	return
 }
 }
 
 
@@ -157,7 +155,7 @@ func (s *Service) InsertScores(c context.Context,score model.Scores) (res int64,
 func (s *Service)GetCompanyAddSoreByCid(c context.Context, companyId int64) (res []map[string]string, err error){
 func (s *Service)GetCompanyAddSoreByCid(c context.Context, companyId int64) (res []map[string]string, err error){
 	//调用DB方法，获取会员数据
 	//调用DB方法，获取会员数据
 	res, err = s.dao.GetCompanyAddSoreByCid(c,companyId)
 	res, err = s.dao.GetCompanyAddSoreByCid(c,companyId)
-	fmt.Print(err)
+	//fmt.Print(err)
 	return
 	return
 }
 }