feat:xiugai

api/internal/handler/routes.go

@@ -13,112 +13,94 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 	server.AddRoutes(
 		[]rest.Route{
 			{
-				// 删除缓存
 				Method:  http.MethodPost,
-				Path:    "/networkManage/deleteCache",
-				Handler: deleteCacheHandler(serverCtx),
-			},
-			{
-				// 获取企业名单
-				Method:  http.MethodGet,
-				Path:    "/networkManage/getEntNameList",
-				Handler: entNameListHandler(serverCtx),
+				Path:    "/networkManage/owner/list",
+				Handler: ownerListHandler(serverCtx),
 			},
 			{
-				// 情报详情
 				Method:  http.MethodPost,
-				Path:    "/networkManage/infomation/detail",
-				Handler: infoDetailHandler(serverCtx),
+				Path:    "/networkManage/network/project/list",
+				Handler: projectListHandler(serverCtx),
 			},
 			{
-				// 初始化设置查看
 				Method:  http.MethodPost,
-				Path:    "/networkManage/init/findInitInfo",
-				Handler: findInitInfoHandler(serverCtx),
+				Path:    "/networkManage/pr/pname/ass",
+				Handler: PrPnameAssHandler(serverCtx),
 			},
 			{
-				// 初始化设置
 				Method:  http.MethodPost,
-				Path:    "/networkManage/init/updateInitInfo",
-				Handler: updateInitInfoHandler(serverCtx),
+				Path:    "/networkManage/pr/project/analyse",
+				Handler: CoopHistoryListHandler(serverCtx),
 			},
 			{
-				// 人脉库-添加/修改人脉
 				Method:  http.MethodPost,
 				Path:    "/networkManage/network/addOrUpdate",
 				Handler: addOrUpdateHandler(serverCtx),
 			},
 			{
-				// 人脉库-全部人脉项目
-				Method:  http.MethodPost,
-				Path:    "/networkManage/network/allProject",
-				Handler: allProjectHandler(serverCtx),
-			},
-			{
-				// 人脉库-业主名称联想
 				Method:  http.MethodPost,
 				Path:    "/networkManage/network/associate",
 				Handler: associateHandler(serverCtx),
 			},
 			{
-				// 人脉库-列表
 				Method:  http.MethodPost,
-				Path:    "/networkManage/network/networkList",
-				Handler: networkListHandler(serverCtx),
+				Path:    "/networkManage/network/allProject",
+				Handler: allProjectHandler(serverCtx),
 			},
 			{
-				// 人脉可达商机列表
 				Method:  http.MethodPost,
-				Path:    "/networkManage/network/project/list",
-				Handler: projectListHandler(serverCtx),
+				Path:    "/networkManage/network/networkList",
+				Handler: networkListHandler(serverCtx),
 			},
 			{
-				// 可介绍业主合作次数
 				Method:  http.MethodPost,
-				Path:    "/networkManage/owner/cooperate",
-				Handler: ownerCooperateHandler(serverCtx),
+				Path:    "/networkManage/infomation/detail",
+				Handler: infoDetailHandler(serverCtx),
 			},
 			{
-				// 人脉可达潜客业主列表
 				Method:  http.MethodPost,
-				Path:    "/networkManage/owner/list",
-				Handler: ownerListHandler(serverCtx),
+				Path:    "/networkManage/pr/project/history",
+				Handler: projectHistoryHandler(serverCtx),
 			},
 			{
-				// 可介绍业主路径
 				Method:  http.MethodPost,
 				Path:    "/networkManage/owner/route",
 				Handler: ownerRouteHandler(serverCtx),
 			},
 			{
-				// 公关渠道-标讯收藏项目找人脉
 				Method:  http.MethodPost,
-				Path:    "/networkManage/pr/collect/list",
-				Handler: PrCollectListHandler(serverCtx),
+				Path:    "/networkManage/owner/cooperate",
+				Handler: ownerCooperateHandler(serverCtx),
 			},
 			{
-				// 公关渠道-业主监控项目找人脉
 				Method:  http.MethodPost,
 				Path:    "/networkManage/pr/monitor/list",
 				Handler: PrMonitorListHandler(serverCtx),
 			},
 			{
-				// 项目公关渠道分析-项目名称联想
 				Method:  http.MethodPost,
-				Path:    "/networkManage/pr/pname/ass",
-				Handler: PrPnameAssHandler(serverCtx),
+				Path:    "/networkManage/pr/collect/list",
+				Handler: PrCollectListHandler(serverCtx),
 			},
 			{
-				// 项目公关渠道分析-与业主合作历史
 				Method:  http.MethodPost,
-				Path:    "/networkManage/pr/project/analyse",
-				Handler: CoopHistoryListHandler(serverCtx),
+				Path:    "/networkManage/init/findInitInfo",
+				Handler: findInitInfoHandler(serverCtx),
 			},
 			{
-				// 人脉项目分析-业主合作历史
 				Method:  http.MethodPost,
-				Path:    "/networkManage/pr/project/history",
-				Handler: projectHistoryHandler(serverCtx),
+				Path:    "/networkManage/init/updateInitInfo",
+				Handler: updateInitInfoHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/networkManage/deleteCache",
+				Handler: deleteCacheHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodGet,
+				Path:    "/networkManage/getEntNameList",
+				Handler: entNameListHandler(serverCtx),
 			},
 		},
 	)

api/internal/service/network.go

@@ -200,7 +200,7 @@ func (n *network) AddOrUpdate(in *types.AddOrUpdateReq) *types.Reply {
 					return false
 				}
 			}
-			r1 := CrmMysql.UpdateOrDeleteBySqlByTx(tx, `update crm.connection set company_name=?,company_id=?,contact_person=?,contact_phone=?,update_time=? where id=? and position_id=?`, in.Company_name, in.Company_id, in.Contact_person, in.Contact_phone, nowFormat, in.Id, in.PositionId)
+			r1 := CrmMysql.UpdateOrDeleteBySqlByTx(tx, `update crm.connection set company_name=?,company_id=?,contact_person=?,contact_phone=?,source=1,update_time=? where id=? and position_id=?`, in.Company_name, in.Company_id, in.Contact_person, in.Contact_phone, nowFormat, in.Id, in.PositionId)
 			return r1 >= 0 && saveIntroduce(tx, in.Id, true)
 		}) {
 			reply.Data = map[string]interface{}{

api/internal/service/network_test.go

@@ -125,7 +125,8 @@ func TestOwner(t *testing.T) {
 	ownerService := &OwnerService{
 		//PartyA:      "30604a74c36f47daa532503ac496914c",
 		//Heterotophy: "ffe7b3b526f048f9999b803a4241ce77",
-		Agency:      "wcj_11111111c,112233445566,001dfe3364b8480c965f81ab64d76bb4,00172d07d1fd4d90bd95fe5a348a845d",
+		//Agency:      "wcj_11111111c,112233445566,001dfe3364b8480c965f81ab64d76bb4,00172d07d1fd4d90bd95fe5a348a845d",
+		Agency:      "00172d07d1fd4d90bd95fe5a348a845d",
 		PositionId:  935,
 		PageIndex:   1,
 		PageSize:    100,
@@ -187,3 +188,24 @@ func TestIntroduceSupplier(t *testing.T) {
 		log.Println(k, fmt.Sprintf("%+v", v))
 	}
 }
+func TestGetProjectList(t *testing.T) {
+	InitConf()
+	req := &types.ProjectListReq{
+		PositionId:   935,
+		EntId:        221,
+		PartyA:       "",
+		Supplier:     "",
+		Heterotophy:  "3a0068dcbf4041aebfdd38f77f553d87",
+		Intermediary: "",
+		Agency:       "",
+		PageNum:      1,
+		PageSize:     10,
+		BusinessType: "全部",
+	}
+
+	list, hasNextPage, count := GetProjectList(req)
+	log.Println(hasNextPage, count, list)
+	for _, v := range list {
+		log.Println(v)
+	}
+}

api/internal/service/plistService.go

@@ -65,6 +65,10 @@ type ProjectEntry struct {
 }
 
 func GetProjectList(req *types.ProjectListReq) (resultList []*ProjectEntry, hasNextPage bool, total int) {
+	businessStr := FindBusiness(req.EntId, req.UserId)
+	if businessStr == "" {
+		return []*ProjectEntry{}, false, 0
+	}
 	buyerM := BuyerList(req.PartyA, req.Supplier, req.Heterotophy, "", req.Agency, req.PositionId)
 	var plist []string
 	if req.Intermediary != "" {
@@ -83,7 +87,7 @@ func GetProjectList(req *types.ProjectListReq) (resultList []*ProjectEntry, hasN
 	//if req.SaleStatus == "0" {
 	//	isSqlPage = true // 是否sql分页
 	//}
-	countSql, findSql := getQuerySql(req, true, buyerArr, plist)
+	countSql, findSql := getQuerySql(req, true, buyerArr, plist, businessStr)
 	// 缓存
 	rkey := fmt.Sprintf(NetworkManageProjectList, req.PositionId, common.GetMd5String(fmt.Sprintf("%+v", req)))
 	if ret, err := redis.GetBytes("newother", rkey); err == nil {
@@ -158,7 +162,7 @@ func getIyProList(iy string, positionId int64) (array []string) {
 	return
 }
 
-func getQuerySql(req *types.ProjectListReq, isPage bool, buyerArr, plist []string) (countSql, findSql string) {
+func getQuerySql(req *types.ProjectListReq, isPage bool, buyerArr, plist []string, businessStr string) (countSql, findSql string) {
 	querys := []string{}
 	// 左侧选中的业主id
 	if len(buyerArr) > 0 || len(plist) > 0 {
@@ -259,16 +263,10 @@ func getQuerySql(req *types.ProjectListReq, isPage bool, buyerArr, plist []strin
 			}
 		}
 	}
-	//物业业态
-	if req.PropertyForm != "" {
-		arr := []string{}
-		for _, v := range strings.Split(req.PropertyForm, ",") {
-			arr = append(arr, fmt.Sprintf("has(a.property_form, '%s')", v))
-		}
-		querys = append(querys, arr...)
-	}
+	//业务类型
+	querys = append(querys, `hasAny(topscopeclass,['`+strings.ReplaceAll(businessStr, `,`, `','`)+`'])`)
 	//过滤掉已中标的招标项目数据
-	querys = append(querys, fmt.Sprintf(" a.project_bidstatus in (%s) ", "2,3,4"))
+	querys = append(querys, " a.project_bidstatus>1 ")
 	findSql = "select a.project_id, a.project_name, a.business_type, a.buyer, a.buyer_id, a.area, a.city, a.district, a.zbtime, a.endtime, a.project_money, a.info_id, a.information_id, a.info_ids "
 	if len(querys) > 0 {
 		countSql = fmt.Sprintf("select count(1) from %s a where %s ", "information.transaction_info_all", strings.Join(querys, " and "))

api/internal/types/types.go

@@ -1,6 +1,73 @@
 // Code generated by goctl. DO NOT EDIT.
 package types
 
+type Reply struct {
+	Error_code int64       `json:"error_code"`
+	Error_msg  string      `json:"error_msg"`
+	Data       interface{} `json:"data"`
+}
+
+type OwnerListReq struct {
+	PartyA           string `json:"partyA,optional"`           //甲方
+	Supplier         string `json:"supplier,optional"`         //供应商
+	Heterotophy      string `json:"heterotophy,optional"`      //同甲异业
+	Intermediary     string `json:"intermediary,optional"`     //中间人
+	Agency           string `json:"agency,optional"`           //代理机构
+	SearchEntName    string `json:"searchEntName,optional"`    //搜索企业名称
+	SourceType       string `json:"sourceType,optional"`       //搜索类型 1 只看转介绍成功率高2只看已监控的
+	ProcessingStatus string `json:"processingStatus,optional"` //处理状态1未处理2已忽略3已建客户
+	Area             string `json:"area,optional"`             //项目地区
+	PositionId       int64  `header:"positionId,optional"`
+	PageSize         int64  `json:"pageSize,optional"`
+	PageIndex        int64  `json:"pageIndex,optional"`
+	ProjectType      string `json:"projectType,optional"`
+	EntAccountId     int64  `header:"entAccountId"`
+	EntId            int64  `header:"entId,optional"`
+	MgoUserId        string `header:"mgoUserId,optional"` //原userId
+}
+
+type ProjectListReq struct {
+	UserId       string `header:"userId,optional"`
+	PositionId   int64  `header:"positionId,optional"`
+	EntId        int64  `header:"entId,optional"`
+	EntUserId    int64  `header:"entUserId,optional"`
+	DeptId       int64  `header:"deptId,optional"`     //部门id
+	PartyA       string `json:"partyA,optional"`       //甲方
+	Supplier     string `json:"supplier,optional"`     //供应商
+	Heterotophy  string `json:"heterotophy,optional"`  //同甲异业
+	Intermediary string `json:"intermediary,optional"` //中间人
+	Agency       string `json:"agency,optional"`       //代理机构
+	PageNum      int    `json:"pageNum"`
+	PageSize     int    `json:"pageSize"`
+	BusinessType string `json:"businessType"`
+	SaleStatus   string `json:"saleStatus"`
+	ProjectName  string `json:"projectName,optional"`
+	StartTime    int64  `json:"startTime,optional"`
+	EntTime      int64  `json:"entTime,optional"`
+	Area         string `json:"area,optional"`
+	City         string `json:"city,optional"`
+	District     string `json:"district,optional"`
+	PropertyForm string `json:"propertyForm,optional"`
+	SubClass     string `json:"subClass,optional"`
+	Amount       string `json:"amount,optional"`
+}
+
+type PnameAssReq struct {
+	ProjectName string `json:"projectName"`
+}
+
+type CoopHistoryReq struct {
+	EntAccountId int64  `header:"entAccountId,optional"` //企业账户id
+	PositionId   int64  `header:"positionId,optional"`
+	EntId        int64  `header:"entId,optional"`
+	EntUserId    string `header:"entUserId,optional"`
+	DeptId       string `header:"deptId,optional"` //部门id
+	Pid          string `json:"projectId,optional"`
+	Bid          string `json:"infoId,optional"`
+	ChannelType  string `json:"channelType"`
+	Buyer        string `json:"buyer,optional"`
+}
+
 type AddOrUpdateReq struct {
 	PositionId              int64  `header:"positionId"`
 	EntUserId               int64  `header:"entUserId,optional"`
@@ -20,16 +87,6 @@ type AddOrUpdateReq struct {
 	Type                    string `json:"type"`
 }
 
-type AllprojectReq struct {
-	EntId        int64  `header:"entId"`
-	MgoUserId    string `header:"mgoUserId"`
-	EntAccountId int64  `header:"entAccountId"`
-	PositionId   int64  `header:"positionId"`
-	Name         string `json:"name,optional"`
-	Type         string `json:"type,optional"`
-	Id           string `json:"id,optional"`
-}
-
 type AssociateReq struct {
 	EntId        int64  `header:"entId"`
 	MgoUserId    string `header:"mgoUserId"`
@@ -39,44 +96,14 @@ type AssociateReq struct {
 	Type         string `json:"type"`
 }
 
-type CoopHistoryReq struct {
-	EntAccountId int64  `header:"entAccountId,optional"` //企业账户id
-	PositionId   int64  `header:"positionId,optional"`
-	EntId        int64  `header:"entId,optional"`
-	EntUserId    string `header:"entUserId,optional"`
-	DeptId       string `header:"deptId,optional"` //部门id
-	Pid          string `json:"projectId,optional"`
-	Bid          string `json:"infoId,optional"`
-	ChannelType  string `json:"channelType"`
-	Buyer        string `json:"buyer,optional"`
-}
-
-type CooperateOwnerListReq struct {
-	BuyerId       string `json:"buyerId,optional"`
-	BuyerName     string `json:"buyerName,optional"`
-	WinnerId      string `json:"winnerId,optional"`
-	WinnerName    string `json:"winnerName,optional"`
-	CooperateType string `json:"cooperateType,optional"`
-	PositionId    int64  `header:"positionId,optional"`
-}
-
-type DeleteCacheInfoReq struct {
-	PositionId int64 `header:"positionId,optional"`
-}
-
-type FindInitInfoReq struct {
-	EntId        int64  `header:"entId,optional"`
-	MgoUserId    string `header:"mgoUserId,optional"` //原userId
-	PositionType int64  `header:"positionType,optional"`
-	NewUserId    int64  `header:"newUserId"`
-	AccountId    int64  `header:"accountId,optional"`
-	PositionId   int64  `header:"positionId,optional"`
-	EntUserId    int64  `header:"entUserId,optional"`
-	EntRole      int64  `header:"entRole,optional"`
-}
-
-type InfoDetailReq struct {
-	InfoId string `json:"infoId"`
+type AllprojectReq struct {
+	EntId        int64  `header:"entId"`
+	MgoUserId    string `header:"mgoUserId"`
+	EntAccountId int64  `header:"entAccountId"`
+	PositionId   int64  `header:"positionId"`
+	Name         string `json:"name,optional"`
+	Type         string `json:"type,optional"`
+	Id           string `json:"id,optional"`
 }
 
 type NetWorkListReq struct {
@@ -100,44 +127,8 @@ type NetWorkListReq struct {
 	Monitorcount_end   int64  `json:"monitorcount_end,optional"`
 }
 
-type OwnerListReq struct {
-	PartyA           string `json:"partyA,optional"`           //甲方
-	Supplier         string `json:"supplier,optional"`         //供应商
-	Heterotophy      string `json:"heterotophy,optional"`      //同甲异业
-	Intermediary     string `json:"intermediary,optional"`     //中间人
-	Agency           string `json:"agency,optional"`           //代理机构
-	SearchEntName    string `json:"searchEntName,optional"`    //搜索企业名称
-	SourceType       string `json:"sourceType,optional"`       //搜索类型 1 只看转介绍成功率高2只看已监控的
-	ProcessingStatus string `json:"processingStatus,optional"` //处理状态1未处理2已忽略3已建客户
-	Area             string `json:"area,optional"`             //项目地区
-	PositionId       int64  `header:"positionId,optional"`
-	PageSize         int64  `json:"pageSize,optional"`
-	PageIndex        int64  `json:"pageIndex,optional"`
-	ProjectType      string `json:"projectType,optional"`
-	EntAccountId     int64  `header:"entAccountId"`
-	EntId            int64  `header:"entId,optional"`
-	MgoUserId        string `header:"mgoUserId,optional"` //原userId
-}
-
-type PnameAssReq struct {
-	ProjectName string `json:"projectName"`
-}
-
-type PrCollectListReq struct {
-	UserId     string `header:"userId,optional"`
-	MgoUserId  string `header:"mgoUserId,optional"`
-	PositionId int64  `header:"positionId,optional"`
-	EntId      int64  `header:"entId,optional"`
-	PageSize   int    `json:"pageSize"`
-	PageNum    int    `json:"pageNum"`
-}
-
-type PrMonitorListReq struct {
-	UserId     string `header:"userId,optional"`
-	PositionId int64  `header:"positionId,optional"`
-	EntId      int64  `header:"entId,optional"`
-	PageSize   int    `json:"pageSize"`
-	PageNum    int    `json:"pageNum"`
+type InfoDetailReq struct {
+	InfoId string `json:"infoId"`
 }
 
 type PrjectHistoryReq struct {
@@ -146,44 +137,21 @@ type PrjectHistoryReq struct {
 	WinnerId string `json:"winnerId"`
 }
 
-type ProjectListReq struct {
-	UserId       string `header:"userId,optional"`
-	PositionId   int64  `header:"positionId,optional"`
-	EntId        string `header:"entId,optional"`
-	EntUserId    string `header:"entUserId,optional"`
-	DeptId       string `header:"deptId,optional"`     //部门id
-	PartyA       string `json:"partyA,optional"`       //甲方
-	Supplier     string `json:"supplier,optional"`     //供应商
-	Heterotophy  string `json:"heterotophy,optional"`  //同甲异业
-	Intermediary string `json:"intermediary,optional"` //中间人
-	Agency       string `json:"agency,optional"`       //代理机构
-	PageNum      int    `json:"pageNum"`
-	PageSize     int    `json:"pageSize"`
-	BusinessType string `json:"businessType"`
-	SaleStatus   string `json:"saleStatus"`
-	ProjectName  string `json:"projectName,optional"`
-	StartTime    int64  `json:"startTime,optional"`
-	EntTime      int64  `json:"entTime,optional"`
-	Area         string `json:"area,optional"`
-	City         string `json:"city,optional"`
-	District     string `json:"district,optional"`
-	PropertyForm string `json:"propertyForm,optional"`
-	SubClass     string `json:"subClass,optional"`
-	Amount       string `json:"amount,optional"`
-}
-
-type Reply struct {
-	Error_code int64       `json:"error_code"`
-	Error_msg  string      `json:"error_msg"`
-	Data       interface{} `json:"data"`
-}
-
 type RouteOwnerListReq struct {
 	BuyerId    string `json:"buyerId,optional"`
 	BuyerName  string `json:"buyerName,optional"`
 	PositionId int64  `header:"positionId,optional"`
 }
 
+type CooperateOwnerListReq struct {
+	BuyerId       string `json:"buyerId,optional"`
+	BuyerName     string `json:"buyerName,optional"`
+	WinnerId      string `json:"winnerId,optional"`
+	WinnerName    string `json:"winnerName,optional"`
+	CooperateType string `json:"cooperateType,optional"`
+	PositionId    int64  `header:"positionId,optional"`
+}
+
 type UpdateInitInfoReq struct {
 	Business     string `json:"business,optional"`
 	Company      string `json:"company,optional"`
@@ -198,3 +166,35 @@ type UpdateInitInfoReq struct {
 	EntName      string `header:"entName,optional"`
 	EntDeptId    int64  `header:"entDeptId,optional"`
 }
+
+type FindInitInfoReq struct {
+	EntId        int64  `header:"entId,optional"`
+	MgoUserId    string `header:"mgoUserId,optional"` //原userId
+	PositionType int64  `header:"positionType,optional"`
+	NewUserId    int64  `header:"newUserId"`
+	AccountId    int64  `header:"accountId,optional"`
+	PositionId   int64  `header:"positionId,optional"`
+	EntUserId    int64  `header:"entUserId,optional"`
+	EntRole      int64  `header:"entRole,optional"`
+}
+
+type PrMonitorListReq struct {
+	UserId     string `header:"userId,optional"`
+	PositionId int64  `header:"positionId,optional"`
+	EntId      int64  `header:"entId,optional"`
+	PageSize   int    `json:"pageSize"`
+	PageNum    int    `json:"pageNum"`
+}
+
+type PrCollectListReq struct {
+	UserId     string `header:"userId,optional"`
+	MgoUserId  string `header:"mgoUserId,optional"`
+	PositionId int64  `header:"positionId,optional"`
+	EntId      int64  `header:"entId,optional"`
+	PageSize   int    `json:"pageSize"`
+	PageNum    int    `json:"pageNum"`
+}
+
+type DeleteCacheInfoReq struct {
+	PositionId int64 `header:"positionId,optional"`
+}

api/networkmanage.api

@@ -7,15 +7,15 @@ type (
 		Data       interface{} `json:"data"`
 	}
 	OwnerListReq {
-		PartyA           string `json:"partyA,optional"` //甲方
-		Supplier         string `json:"supplier,optional"` //供应商
-		Heterotophy      string `json:"heterotophy,optional"` //同甲异业
-		Intermediary     string `json:"intermediary,optional"` //中间人
-		Agency           string `json:"agency,optional"` //代理机构
-		SearchEntName    string `json:"searchEntName,optional"` //搜索企业名称
-		SourceType       string `json:"sourceType,optional"` //搜索类型 1 只看转介绍成功率高2只看已监控的
+		PartyA           string `json:"partyA,optional"`           //甲方
+		Supplier         string `json:"supplier,optional"`         //供应商
+		Heterotophy      string `json:"heterotophy,optional"`      //同甲异业
+		Intermediary     string `json:"intermediary,optional"`     //中间人
+		Agency           string `json:"agency,optional"`           //代理机构
+		SearchEntName    string `json:"searchEntName,optional"`    //搜索企业名称
+		SourceType       string `json:"sourceType,optional"`       //搜索类型 1 只看转介绍成功率高2只看已监控的
 		ProcessingStatus string `json:"processingStatus,optional"` //处理状态1未处理2已忽略3已建客户
-		Area             string `json:"area,optional"` //项目地区
+		Area             string `json:"area,optional"`             //项目地区
 		PositionId       int64  `header:"positionId,optional"`
 		PageSize         int64  `json:"pageSize,optional"`
 		PageIndex        int64  `json:"pageIndex,optional"`
@@ -27,14 +27,14 @@ type (
 	ProjectListReq {
 		UserId       string `header:"userId,optional"`
 		PositionId   int64  `header:"positionId,optional"`
-		EntId        string `header:"entId,optional"`
-		EntUserId    string `header:"entUserId,optional"`
-		DeptId       string `header:"deptId,optional"` //部门id
-		PartyA       string `json:"partyA,optional"` //甲方
-		Supplier     string `json:"supplier,optional"` //供应商
-		Heterotophy  string `json:"heterotophy,optional"` //同甲异业
+		EntId        int64  `header:"entId,optional"`
+		EntUserId    int64  `header:"entUserId,optional"`
+		DeptId       int64  `header:"deptId,optional"`     //部门id
+		PartyA       string `json:"partyA,optional"`       //甲方
+		Supplier     string `json:"supplier,optional"`     //供应商
+		Heterotophy  string `json:"heterotophy,optional"`  //同甲异业
 		Intermediary string `json:"intermediary,optional"` //中间人
-		Agency       string `json:"agency,optional"` //代理机构
+		Agency       string `json:"agency,optional"`       //代理机构
 		PageNum      int    `json:"pageNum"`
 		PageSize     int    `json:"pageSize"`
 		BusinessType string `json:"businessType"`
@@ -187,73 +187,72 @@ service networkManage {
 	@doc "人脉可达潜客业主列表"
 	@handler ownerList
 	post /networkManage/owner/list (OwnerListReq) returns (Reply)
-
+	
 	@doc "人脉可达商机列表"
 	@handler projectList
 	post /networkManage/network/project/list (ProjectListReq) returns (Reply)
-
+	
 	@doc "项目公关渠道分析-项目名称联想"
 	@handler PrPnameAss
 	post /networkManage/pr/pname/ass (PnameAssReq) returns (Reply)
-
+	
 	@doc "项目公关渠道分析-与业主合作历史"
 	@handler CoopHistoryList
 	post /networkManage/pr/project/analyse (CoopHistoryReq) returns (Reply)
-
+	
 	@doc "人脉库-添加/修改人脉"
 	@handler addOrUpdate
 	post /networkManage/network/addOrUpdate (AddOrUpdateReq) returns (Reply)
-
+	
 	@doc "人脉库-业主名称联想"
 	@handler associate
 	post /networkManage/network/associate (AssociateReq) returns (Reply)
-
+	
 	@doc "人脉库-全部人脉项目"
 	@handler allProject
 	post /networkManage/network/allProject (AllprojectReq) returns (Reply)
-
+	
 	@doc "人脉库-列表"
 	@handler networkList
 	post /networkManage/network/networkList (NetWorkListReq) returns (Reply)
-
+	
 	@doc "情报详情"
 	@handler infoDetail
 	post /networkManage/infomation/detail (InfoDetailReq) returns (Reply)
-
+	
 	@doc "人脉项目分析-业主合作历史"
 	@handler projectHistory
 	post /networkManage/pr/project/history (PrjectHistoryReq) returns (Reply)
-
+	
 	@doc "可介绍业主路径"
 	@handler ownerRoute
 	post /networkManage/owner/route (RouteOwnerListReq) returns (Reply)
-
+	
 	@doc "可介绍业主合作次数"
 	@handler ownerCooperate
 	post /networkManage/owner/cooperate (CooperateOwnerListReq) returns (Reply)
-
+	
 	@doc "公关渠道-业主监控项目找人脉"
 	@handler PrMonitorList
 	post /networkManage/pr/monitor/list (PrMonitorListReq) returns (Reply)
-
+	
 	@doc "公关渠道-标讯收藏项目找人脉"
 	@handler PrCollectList
 	post /networkManage/pr/collect/list (PrCollectListReq) returns (Reply)
-
+	
 	@doc "初始化设置查看"
 	@handler findInitInfo
 	post /networkManage/init/findInitInfo (FindInitInfoReq) returns (Reply)
-
+	
 	@doc "初始化设置"
 	@handler updateInitInfo
 	post /networkManage/init/updateInitInfo (UpdateInitInfoReq) returns (Reply)
-
+	
 	@doc "删除缓存"
 	@handler deleteCache
 	post /networkManage/deleteCache (DeleteCacheInfoReq) returns (Reply)
-
+	
 	@doc "获取企业名单"
 	@handler entNameList
 	get /networkManage/getEntNameList returns (Reply)
-}
-
+}