feat:xiugai

api/application.api

@@ -313,6 +313,7 @@ type (
 		Agency       string `json:"agency,optional"`       //代理机构
 		PositionId   int64  `header:"positionId,optional"`
 		EntAccountId int64  `header:"entAccountId,optional"` //企业账户id
+		Type         string `json:"type,optional"`
 	}
 	RouteOwnerListReq {
 		BuyerId    string `json:"buyerId,optional"`
@@ -337,103 +338,103 @@ service crmApplication {
 	@doc "添加线索"
 	@handler clueAdd
 	post /crmApplication/clue/add (ClueAddReq) returns (Reply)
-
+	
 	@doc "创建销售机会"
 	@handler saleChanceAdd
 	post /crmApplication/saleChance/add (SaleChanceReq) returns (Reply)
-
+	
 	@doc "收录操作"
 	@handler employOperate
 	post /crmApplication/employ/operate (EmployOperateReq) returns (Reply)
-
+	
 	@doc "商业资讯的转办"
 	@handler transfer
 	post /crmApplication/information/transfer (TransferReq) returns (Reply)
-
+	
 	@doc "忽略操作"
 	@handler ignoreOperate
 	post /crmApplication/ignore/operate (IgnoreOperateReq) returns (Reply)
-
+	
 	@doc "收录情况"
 	@handler employInfo
 	post /crmApplication/employ/info (InfoEmployinfoReq) returns (InfoReply)
-
+	
 	@doc "创建客户"
 	@handler customAdd
 	post /crmApplication/custom/add (CustomAddReq) returns (Reply)
-
+	
 	@doc "文件上传"
 	@handler fileUpload
 	post /crmApplication/file/upload (FileUploadReq) returns (Reply)
-
+	
 	@doc "分发"
 	@handler employDistribute
 	post /crmApplication/employ/distribute (EmployDistributeReq) returns (Reply)
-
+	
 	@doc "企业详情"
 	@handler entinfo
 	post /crmApplication/ent/info (EntInfoReq) returns (Reply)
-
+	
 	@doc "消息推送"
 	@handler pushMsg
 	post /crmApplication/info/push (PushMsgReq) returns (Reply)
-
+	
 	@doc "是否可以创建"
 	@handler canAddReq
 	post /crmApplication/info/canAdd (CanAddReq) returns (Reply)
-
+	
 	@doc "人脉可达潜客业主列表"
 	@handler ownerList
 	post /crmApplication/owner/list (OwnerListReq) returns (Reply)
-
+	
 	@doc "人脉可达商机列表"
 	@handler projectList
 	post /crmApplication/network/project/list (ProjectListReq) returns (Reply)
-
+	
 	@doc "项目公关渠道分析-项目名称联想"
 	@handler PrPnameAss
 	post /crmApplication/pr/pname/ass (PnameAssReq) returns (Reply)
-
+	
 	@doc "项目公关渠道分析-与业主合作历史"
 	@handler CoopHistoryList
 	post /crmApplication/pr/project/analyse (CoopHistoryReq) returns (Reply)
-
+	
 	@doc "人脉库-添加/修改人脉"
 	@handler addOrUpdate
 	post /crmApplication/network/addOrUpdate (AddOrUpdateReq) returns (Reply)
-
+	
 	@doc "人脉库-业主名称联想"
 	@handler associate
 	post /crmApplication/network/associate (AssociateReq) returns (Reply)
-
+	
 	@doc "人脉库-全部人脉项目"
 	@handler allProject
 	post /crmApplication/network/allProject (AllprojectReq) returns (Reply)
-
+	
 	@doc "人脉库-列表"
 	@handler networkList
 	post /crmApplication/network/networkList (NetWorkListReq) returns (Reply)
-
+	
 	@doc "忽略操作"
 	@handler ignoreAction
 	post /crmApplication/ignore/action (IgnoreReq) returns (Reply)
-
+	
 	@doc "情报详情"
 	@handler infoDetail
 	post /crmApplication/infomation/detail (InfoDetailReq) returns (Reply)
-
+	
 	@doc "人脉项目分析-业主合作历史"
 	@handler projectHistory
 	post /crmApplication/pr/project/history (PrjectHistoryReq) returns (Reply)
-
+	
 	@doc "可介绍业主路径"
 	@handler ownerRoute
 	post /crmApplication/owner/route (RouteOwnerListReq) returns (Reply)
-
+	
 	@doc "可介绍业主合作次数"
 	@handler ownerCooperate
 	post /crmApplication/owner/cooperate (CooperateOwnerListReq) returns (Reply)
-
+	
 	@doc "候选渠道列表"
 	@handler candidateChannelList
 	post /crmApplication/candidate/channel/list (ChannelListReq) returns (Reply)

api/internal/handler/routes.go

@@ -143,6 +143,5 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Handler: candidateChannelListHandler(serverCtx),
 			},
 		},
-		rest.WithMaxBytes(104857600),
 	)
 }

api/internal/logic/candidatechannellistlogic.go

@@ -1,10 +1,11 @@
 package logic
 
 import (
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/service"
 	"context"
 	"fmt"
 
+	"bp.jydev.jianyu360.cn/CRM/application/api/internal/service"
+
 	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
 	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
 
@@ -37,6 +38,7 @@ func (l *CandidateChannelListLogic) CandidateChannelList(req *types.ChannelListR
 		Agency:       req.Agency,
 		PositionId:   req.PositionId,
 		EntAccountId: req.EntAccountId,
+		Type:         req.Type,
 	}
 	data, a1, a2, a3, a4 := ownerService.CandidateChannel()
 	resp.Data = map[string]interface{}{

api/internal/service/network_test.go

@@ -164,6 +164,7 @@ func TestCandidateChannel(t *testing.T) {
 		Intermediary: "30154",
 		//Heterotophy:  req.Heterotophy,
 		//Agency:       req.Agency,
+		Type:         "middleman",
 		EntAccountId: 64,
 		PositionId:   935,
 	}

api/internal/service/owner.go

@@ -45,6 +45,7 @@ type OwnerService struct {
 	CooperateType    string
 	EntAccountId     int64
 	ProjectType      string
+	Type             string
 }
 
 type BuyerProject struct {
@@ -1156,6 +1157,7 @@ func (t *OwnerService) CandidateChannel() ([]*ResultData, int, int, int, int) {
 		}
 	}
 	//状态处理
+	result := []*ResultData{}
 	if len(returnData) > 0 {
 		monitorMap := NetworkCom.EntMonitor(gconv.String(t.PositionId))
 		_, ignoredMap, createdMap := FindStatus(t.PositionId)
@@ -1171,7 +1173,11 @@ func (t *OwnerService) CandidateChannel() ([]*ResultData, int, int, int, int) {
 				value.IsMonitor = true
 			}
 			returnData[k] = value
+			if t.Type != "" && t.Type != value.SourceType {
+				continue
+			}
+			result = append(result, value)
 		}
 	}
-	return returnData, a1, a2, a3, a4
+	return result, a1, a2, a3, a4
 }

api/internal/types/types.go

@@ -339,6 +339,7 @@ type ChannelListReq struct {
 	Agency       string `json:"agency,optional"`       //代理机构
 	PositionId   int64  `header:"positionId,optional"`
 	EntAccountId int64  `header:"entAccountId,optional"` //企业账户id
+	Type         string `json:"type,optional"`
 }
 
 type RouteOwnerListReq struct {