Merge branch 'dev_v1.0.0_wh' of CRM/networkManage into feature/v1.0.0

api/internal/service/network.go

@@ -143,7 +143,7 @@ func (n *nodeTrees) Swap(i, j int) {
 	(*n)[i], (*n)[j] = (*n)[j], (*n)[i]
 }
 
-//人脉库-添加/修改人脉
+// 人脉库-添加/修改人脉
 func (n *network) AddOrUpdate(in *types.AddOrUpdateReq) *types.Reply {
 	reply := &types.Reply{Data: map[string]interface{}{
 		"status": 0,
@@ -234,7 +234,7 @@ func (n *network) AddOrUpdate(in *types.AddOrUpdateReq) *types.Reply {
 	return reply
 }
 
-//人脉库-业主名称联想
+// 人脉库-业主名称联想
 func (n *network) Associate(in *types.AssociateReq) (reply *types.Reply) {
 	//类型；firstparty：甲方 supplier：供应商 adiffb：同甲异业 middleman：中间人 middleman_owner：中间人-业主 middleman_project：中间人-项目 agency：招标代理机构
 	res := []map[string]string{}
@@ -325,7 +325,7 @@ func (n *network) Associate(in *types.AssociateReq) (reply *types.Reply) {
 	return
 }
 
-//人脉库-全部人脉项目
+// 人脉库-全部人脉项目
 func (n *network) AllProject(in *types.AllprojectReq) (reply *types.Reply) {
 	reply = &types.Reply{}
 	key := fmt.Sprintf(NetworkManageAllProjectKey, in.PositionId)
@@ -578,7 +578,7 @@ func (n *network) AllProject(in *types.AllprojectReq) (reply *types.Reply) {
 	return reply
 }
 
-//人脉库-列表
+// 人脉库-列表
 func (n *network) List(in *types.NetWorkListReq) *types.Reply {
 	if in.Page_size <= 0 {
 		in.Page_size = 10
@@ -874,7 +874,6 @@ func (n *network) List(in *types.NetWorkListReq) *types.Reply {
 	}
 }
 
-//
 func (n *network) FirstpartyNetwork(name string, values []string) map[string][]*firstpartyNetwork {
 	result := map[string][]*firstpartyNetwork{}
 	if len(values) == 0 {
@@ -916,7 +915,6 @@ func (n *network) FirstpartyNetwork(name string, values []string) map[string][]*
 	return result
 }
 
-//
 func (n *network) Introduce_Firstparty(fpn map[string][]*firstpartyNetwork, businessType []string) map[string]*projectInfo {
 	values := []string{}
 	vm := map[string]*projectInfo{}
@@ -983,7 +981,6 @@ func (n *network) Introduce_Firstparty(fpn map[string][]*firstpartyNetwork, busi
 	return result
 }
 
-//
 func (n *network) Introduce_Supplier(values []string, businessType []string) map[string]*projectInfo {
 	if len(values) == 0 {
 		return map[string]*projectInfo{}
@@ -1037,7 +1034,6 @@ func (n *network) Introduce_Supplier(values []string, businessType []string) map
 	return n.MakeProjectInfo(buyers, vbs, businessType)
 }
 
-//
 func (n *network) Introduce_Agency(values []string, businessType []string) map[string]*projectInfo {
 	if len(values) == 0 {
 		return map[string]*projectInfo{}
@@ -1081,7 +1077,6 @@ func (n *network) Introduce_Agency(values []string, businessType []string) map[s
 	return n.MakeProjectInfo(buyers, vbs, businessType)
 }
 
-//
 func (n *network) Introduce_Middleman(values []string, businessType []string) map[string]*projectInfo {
 	result := map[string]*projectInfo{}
 	if len(values) == 0 {
@@ -1120,7 +1115,6 @@ func (n *network) Introduce_Middleman(values []string, businessType []string) ma
 	return result
 }
 
-//
 func (n *network) TypeStrConvert(itype string) int64 {
 	//firstparty：甲方 supplier：供应商 adiffb：同甲异业 middleman：中间人 agency：招标代理机构
 	switch itype {
@@ -1138,7 +1132,6 @@ func (n *network) TypeStrConvert(itype string) int64 {
 	return 0
 }
 
-//
 func (n *network) TypeIntConvert(itype int64) string {
 	//firstparty：甲方 supplier：供应商 adiffb：同甲异业 middleman：中间人 agency：招标代理机构
 	switch itype {
@@ -1156,7 +1149,6 @@ func (n *network) TypeIntConvert(itype int64) string {
 	return ""
 }
 
-//
 func (n *network) GetQyxyId(ids []string) map[string]string {
 	m := map[string]string{}
 	if len(ids) == 0 {
@@ -1187,7 +1179,6 @@ func (n *network) GetQyxyId(ids []string) map[string]string {
 	return m
 }
 
-//
 func (n *network) BuyerProjectInfo(ids []string, businessType []string) map[string]*projectInfo {
 	vm := map[string]*projectInfo{}
 	if len(ids) == 0 {
@@ -1231,7 +1222,6 @@ func (n *network) BuyerProjectInfo(ids []string, businessType []string) map[stri
 	return vm
 }
 
-//
 func (n *network) MakeProjectInfo(buyers []string, vbs map[string][]*idName, businessType []string) map[string]*projectInfo {
 	pis := n.BuyerProjectInfo(buyers, businessType)
 	vm := map[string]*projectInfo{}
@@ -1259,7 +1249,6 @@ func (n *network) MakeProjectInfo(buyers []string, vbs map[string][]*idName, bus
 	return vm
 }
 
-//
 func (n *network) AllIntroduceOwner(sqlAppend1, sqlAppend2 string, args []interface{}, isTjProject bool, businessType []string) *introduceOwnerProject {
 	q := `select a.id,a.company_id,a.company_name,a.qyxy_id,a.itype,a.contact_person as person,a.contact_phone as phone,count(DISTINCT if(b.itype=1,b.relate_id,null)) as buyer_count,count(DISTINCT if(b.itype=2,b.relate_id,null)) as project_count,GROUP_CONCAT(IF(b.itype=1,b.relate_id,NULL)) AS relate_buyer_id,GROUP_CONCAT(IF(b.itype=1,b.relate_name,NULL)) AS relate_buyer_name,GROUP_CONCAT(IF(b.itype=2,b.relate_id,NULL)) AS relate_project_id,a.create_time from crm.connection a 
 		left join crm.connection_introduce b on (a.position_id=? and b.position_id=? and a.id=b.connection_id) where a.position_id=?` + sqlAppend1 + ` GROUP BY a.id order by a.create_time desc` + sqlAppend2
@@ -1318,7 +1307,6 @@ func (n *network) AllIntroduceOwner(sqlAppend1, sqlAppend2 string, args []interf
 	return iop
 }
 
-//
 func (n *network) DeleteCache(positionId int64) {
 	redis.Del("newother", fmt.Sprintf(NetworkManageAllProjectKey, positionId))
 	redis.DelByCodePattern("newother", fmt.Sprintf(NetworkManageList, positionId, "*"))

api/internal/service/owner.go

@@ -700,14 +700,14 @@ func ProjectHandle(buyerArr []string, area, businessStr string, dataMap *map[str
 	projectMap := &map[string]map[string]interface{}{}
 	count := int64(0)
 	tscSql := `'` + strings.ReplaceAll(businessStr, ",", `','`) + `'`
-	sqlStr := `select buyer,buyer_id,groupUniqArray(area) as area,count(if(hasAny(topscopeclass,[`
+	sqlStr := `select buyer,buyer_id,groupUniqArray(area) as areaStr,count(if(hasAny(topscopeclass,[`
 	sqlStr += tscSql + `])=1 and project_bidstatus>1,1,null)) as ocount,SUM(if(hasAny(topscopeclass,[`
 	sqlStr += tscSql + `])=1 and project_bidstatus>1,project_money,0)) as project_money ,MAX(zbtime) as zbtime from transaction_info_all where`
 	buyer, buyerArgs := ConditionHandle(buyerArr)
 	sqlStr += fmt.Sprintf(fmt.Sprintf(" buyer_id in (%s)", buyer), buyerArgs...)
 	if len(area) > 0 && area != "" {
 		areaStr, areaArgs := ConditionHandle(strings.Split(area, ","))
-		sqlStr += fmt.Sprintf(fmt.Sprintf(" area in (%s)", areaStr), areaArgs...)
+		sqlStr += fmt.Sprintf(fmt.Sprintf(" and  area in (%s)", areaStr), areaArgs...)
 	}
 	sqlStr += " GROUP by buyer,buyer_id "
 	if sourceType == "1" {
@@ -753,7 +753,7 @@ func ProjectHandle(buyerArr []string, area, businessStr string, dataMap *map[str
 type BuyerAggStruct struct {
 	Buyer        string          `ch:"buyer"`
 	BuyerId      string          `ch:"buyer_id"`
-	Area         []string        `ch:"area"`
+	Area         []string        `ch:"areaStr"`
 	ProjectMoney decimal.Decimal `ch:"project_money"`
 	Zbtime       int64           `ch:"zbtime"`
 	Ocount       uint64          `ch:"ocount"`

go.mod

@@ -1,6 +1,6 @@
 module bp.jydev.jianyu360.cn/CRM/networkManage
 
-go 1.19
+go 1.20
 
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20241016090300-f39a281ac0ff

go.sum

@@ -6,8 +6,6 @@ app.yhyue.com/moapp/jybase v0.0.0-20220420032112-668025915ee4/go.mod h1:qNRA0sHu
 app.yhyue.com/moapp/jybase v0.0.0-20220421060131-a1001013ba46/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
 app.yhyue.com/moapp/jybase v0.0.0-20241016083144-6514c1b3c6c5 h1:i602vXS1OsRapLatZREDqw/Wo4jGOdN4XEzEkYbmylA=
 app.yhyue.com/moapp/jybase v0.0.0-20241016083144-6514c1b3c6c5/go.mod h1:quV41Rmzzh+XmHqNFTSGoDv0AnbEYiDayHORFYfyGXk=
-app.yhyue.com/moapp/jybase v0.0.0-20241016090300-f39a281ac0ff h1:9jtnqcPNSjkfSfpLqBsIyRLEG8IEoDD68S/KwIqeDl4=
-app.yhyue.com/moapp/jybase v0.0.0-20241016090300-f39a281ac0ff/go.mod h1:XHNATN6tsJKHdCB0DbUtFdPPHXexTUFyB3RlO+lUUoM=
 app.yhyue.com/moapp/jypkg v0.0.0-20230825092743-3bfc415bb5bb h1:J9CQ60meKlABYqeOB6zdZXJtBHAsJqnHeWhd/OOCUtU=
 app.yhyue.com/moapp/jypkg v0.0.0-20230825092743-3bfc415bb5bb/go.mod h1:VaHDi3twSg4G84k2+UFOe7ZCw5EqUZVAkW2N2dHeMbU=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=
@@ -182,7 +180,6 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -205,7 +202,6 @@ github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-redis/redis/v8 v8.11.4/go.mod h1:2Z2wHZXdQpCDXEGzqMockDpNyYvi2l4Pxt6RJr792+w=
 github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
-github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
@@ -284,8 +280,6 @@ github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/gomodule/redigo v1.8.9/go.mod h1:7ArFNvsTjH8GMMzB4uy1snslv2BwmginuMs06a1uzZE=
-github.com/gomodule/redigo v1.9.2 h1:HrutZBLhSIU8abiSfW8pj8mPhOyMYjZT/wcA4/L9L9s=
-github.com/gomodule/redigo v1.9.2/go.mod h1:KsU3hiK/Ay8U42qpaJk+kuNa3C+spxapWpM+ywhcgtw=
 github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0=
 github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -484,7 +478,6 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
-github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=