Jianghan 1 жил өмнө
parent
commit
97f3be4383

+ 106 - 104
api/application.api

@@ -20,15 +20,15 @@ type (
 		EntId        int64   `header:"entId,optional"`
 		AccountId    int64   `header:"accountId,optional"`
 		EntDeptId    int64   `header:"entDeptId,optional"`
-		CluesSource  string  `json:"cluesSource"`           //线索来源
-		ClueName     string  `json:"clueName"`              //线索名称
-		Summary      string  `json:"summary"`               //概要信息
+		CluesSource  string  `json:"cluesSource"` //线索来源
+		ClueName     string  `json:"clueName"` //线索名称
+		Summary      string  `json:"summary"` //概要信息
 		FollowUpTime int64   `json:"followUpTime,optional"` //下次跟进时间(时间戳)
-		Types        int64   `json:"types"`                 //处理方式 1自办;2转办;3待处理
-		User         []int64 `json:"user,optional"`         //企业用户id
+		Types        int64   `json:"types"` //处理方式 1自办;2转办;3待处理
+		User         []int64 `json:"user,optional"` //企业用户id
 		EmployInfoId int64   `json:"employInfoId,optional"` //资讯收录id
-		CreateName   string  `json:"createName"`            //创建人
-		Channel      string  `json:"channel"`               //渠道来源:网页、手动创建
+		CreateName   string  `json:"createName"` //创建人
+		Channel      string  `json:"channel"` //渠道来源:网页、手动创建
 	}
 	SaleChanceReq {
 		AppId             string  `header:"appId,default=10000"`
@@ -38,23 +38,23 @@ type (
 		EntId             int64   `header:"entId,optional"`
 		AccountId         int64   `header:"accountId,optional"`
 		EntDeptId         int64   `header:"entDeptId,optional"`
-		ChanceName        string  `json:"chanceName"`                 //机会名称
-		Summary           string  `json:"summary"`                    //概要信息
-		ChanceClassify    int64   `json:"chanceClassify"`             //机会分类
+		ChanceName        string  `json:"chanceName"` //机会名称
+		Summary           string  `json:"summary"` //概要信息
+		ChanceClassify    int64   `json:"chanceClassify"` //机会分类
 		ExpectedOrderTime int64   `json:"expectedOrderTime,optional"` //最初预计落单段时间 时间戳
-		ExpectedMoney     float64 `json:"expectedMoney,optional"`     //最初预计落单金额
-		CustomName        string  `json:"customName"`                 //客户全称
-		BusinessType      int64   `json:"businessType"`               //业务类型  1新客户需求 2老客户需求 3简易项目流程
-		Remarks           string  `json:"remarks,optional"`           //备注
-		NextfollowUpTime  int64   `json:"nextfollowUpTime,optional"`  //下次跟进时间戳
-		Types             int64   `json:"types"`                      //处理方式 1自办;2转办;3待处理
-		User              []int64 `json:"user,optional"`              //企业用户id
-		EmployInfoId      int64   `json:"employInfoId,optional"`      //资讯收录id
-		CustomId          int64   `json:"customId,optional"`          //客户id
-		CreateName        string  `json:"createName"`                 //创建人
-		ChanceSource      int64   `json:"chanceSource"`               //机会来源
-		OwnerId           string  `json:"ownerId,optional"`           //潜客收录id(人脉)
-		BusinessId        string  `json:"businessId,optional"`        //商机收录id(人脉)
+		ExpectedMoney     float64 `json:"expectedMoney,optional"` //最初预计落单金额
+		CustomName        string  `json:"customName"` //客户全称
+		BusinessType      int64   `json:"businessType"` //业务类型  1新客户需求 2老客户需求 3简易项目流程
+		Remarks           string  `json:"remarks,optional"` //备注
+		NextfollowUpTime  int64   `json:"nextfollowUpTime,optional"` //下次跟进时间戳
+		Types             int64   `json:"types"` //处理方式 1自办;2转办;3待处理
+		User              []int64 `json:"user,optional"` //企业用户id
+		EmployInfoId      int64   `json:"employInfoId,optional"` //资讯收录id
+		CustomId          int64   `json:"customId,optional"` //客户id
+		CreateName        string  `json:"createName"` //创建人
+		ChanceSource      int64   `json:"chanceSource"` //机会来源
+		OwnerId           string  `json:"ownerId,optional"` //潜客收录id(人脉)
+		BusinessId        string  `json:"businessId,optional"` //商机收录id(人脉)
 	}
 	EmployOperateReq {
 		AppId      string `header:"appId,default=10000"`
@@ -62,8 +62,8 @@ type (
 		PositionId int64  `header:"positionId,optional"`
 		EntUserId  int64  `header:"entUserId,optional"`
 		EntId      int64  `header:"entId,optional"`
-		IdArr      string `json:"idArr"`      //信息id多条信息
-		IsEmploy   bool   `json:"isEmploy"`   //是否收录true收录 false取消收录
+		IdArr      string `json:"idArr"` //信息id多条信息
+		IsEmploy   bool   `json:"isEmploy"` //是否收录true收录 false取消收录
 		EmployType int64  `json:"employType"` //来源方式来源;1招标采购、2企业、3采购单位、4拟在建项目
 		EntDeptId  int64  `header:"entDeptId,optional"`
 		From       string `json:"from,optional"` //来源
@@ -83,8 +83,8 @@ type (
 		PositionId int64  `header:"positionId,optional"`
 		EntUserId  int64  `header:"entUserId,optional"`
 		EntId      int64  `header:"entId,optional"`
-		IdArr      string `json:"idArr"`      //id集合
-		IsIgnore   bool   `json:"isIgnore"`   //是否忽略 true 忽略 false取消忽略
+		IdArr      string `json:"idArr"` //id集合
+		IsIgnore   bool   `json:"isIgnore"` //是否忽略 true 忽略 false取消忽略
 		EmployType int64  `json:"employType"` //来源方式来源;1招标采购、2企业、3采购单位、4拟在建项目
 	}
 	InfoEmployinfoReq {
@@ -94,13 +94,13 @@ type (
 		EntUserId    int64  `header:"entUserId,optional"`
 		EntId        int64  `header:"entId,optional"`
 		EmployType   int64  `json:"employType"` //1标采购、2企业、3采购单位、4拟在建项目
-		IdArr        string `json:"idArr"`      //id
+		IdArr        string `json:"idArr"` //id
 		EntNicheDis  int64  `header:"entNicheDis,optional"`
 		EntDeptId    int64  `header:"entDeptId,optional"`
 		PositionType int64  `header:"positionType,optional"` //职位类型 0个人 1企业
-		AccountId    int64  `header:"accountId,optional"`    //账户id
+		AccountId    int64  `header:"accountId,optional"` //账户id
 		EntAccountId int64  `header:"entAccountId,optional"` //企业账户id
-		From         string `json:"from,optional"`           //来源
+		From         string `json:"from,optional"` //来源
 	}
 	CustomAddReq {
 		AppId                string  `header:"appId,default=10000"`
@@ -110,28 +110,28 @@ type (
 		EntId                int64   `header:"entId,optional"`
 		AccountId            int64   `header:"accountId,optional"`
 		EntDeptId            int64   `header:"entDeptId,optional"`
-		CustomType           int64   `json:"customType"`                       //客户类型
-		Summary              string  `json:"summary"`                          //概要信息
-		CustomAllName        string  `json:"customAllName"`                    //客户全称
-		CustomAbbreviation   string  `json:"customAbbreviation"`               //客户简称
-		CustomLevel          int64   `json:"customLevel,optional"`             //客户级别
-		CustomIndustry       int64   `json:"customIndustry"`                   //客户行业
-		CustomDetailIndustry int64   `json:"customDetailIndustry"`             //客户细分行业
-		Province             string  `json:"province,optional"`                //省份
-		City                 string  `json:"city,optional"`                    //城市
-		District             string  `json:"district,optional"`                //地区
-		Address              string  `json:"address,optional"`                 //详细地址
-		CompanyPhone         string  `json:"companyPhone,optional"`            //公司电话
-		NextfollowUpTime     int64   `json:"nextfollowUpTime,optional"`        //下次跟进时间戳
-		Types                int64   `json:"types"`                            //处理方式 1自办;2转办
-		User                 []int64 `json:"user,optional"`                    //转办用户
+		CustomType           int64   `json:"customType"` //客户类型
+		Summary              string  `json:"summary"` //概要信息
+		CustomAllName        string  `json:"customAllName"` //客户全称
+		CustomAbbreviation   string  `json:"customAbbreviation"` //客户简称
+		CustomLevel          int64   `json:"customLevel,optional"` //客户级别
+		CustomIndustry       int64   `json:"customIndustry"` //客户行业
+		CustomDetailIndustry int64   `json:"customDetailIndustry"` //客户细分行业
+		Province             string  `json:"province,optional"` //省份
+		City                 string  `json:"city,optional"` //城市
+		District             string  `json:"district,optional"` //地区
+		Address              string  `json:"address,optional"` //详细地址
+		CompanyPhone         string  `json:"companyPhone,optional"` //公司电话
+		NextfollowUpTime     int64   `json:"nextfollowUpTime,optional"` //下次跟进时间戳
+		Types                int64   `json:"types"` //处理方式 1自办;2转办
+		User                 []int64 `json:"user,optional"` //转办用户
 		EmployCustomId       int64   `json:"employCustomId,optional,optional"` //客户收录id
-		EmployInfoId         int64   `json:"employInfoId,optional,optional"`   //资讯收录id
-		Remarks              string  `json:"remarks,optional"`                 //备注
-		CreateName           string  `json:"createName"`                       //创建人
-		Source               string  `json:"source,optional"`                  //来源
-		OwnerId              string  `json:"ownerId,optional"`                 //潜客收录id(人脉)
-		BusinessId           string  `json:"businessId,optional"`              //商机收录id(人脉)
+		EmployInfoId         int64   `json:"employInfoId,optional,optional"` //资讯收录id
+		Remarks              string  `json:"remarks,optional"` //备注
+		CreateName           string  `json:"createName"` //创建人
+		Source               string  `json:"source,optional"` //来源
+		OwnerId              string  `json:"ownerId,optional"` //潜客收录id(人脉)
+		BusinessId           string  `json:"businessId,optional"` //商机收录id(人脉)
 	}
 	FileUploadReq {
 		AppId      string `header:"appId,default=10000"`
@@ -140,8 +140,8 @@ type (
 		EntUserId  int64  `header:"entUserId,optional"`
 		EntId      int64  `header:"entId,optional"`
 		BusinessId int64  `form:"businessId"` //业务id
-		Types      int64  `form:"type"`       //类型;1:跟进记录-线下 2:跟进记录-线上 3:跟进记录-备忘 4:销售机会-项目文档 5:客户-客户档案
-		FileType   int64  `form:"fileType"`   //文件类型,产品介绍、项目方案、立项报告、报价文件、招标文件、投标文件、中标通知书、合同、发票、其他文件
+		Types      int64  `form:"type"` //类型;1:跟进记录-线下 2:跟进记录-线上 3:跟进记录-备忘 4:销售机会-项目文档 5:客户-客户档案
+		FileType   int64  `form:"fileType"` //文件类型,产品介绍、项目方案、立项报告、报价文件、招标文件、投标文件、中标通知书、合同、发票、其他文件
 	}
 	EmployDistributeReq {
 		AppId       string             `header:"appId,default=10000"`
@@ -168,12 +168,12 @@ type (
 		PositionId int64   `header:"positionId,optional"`
 		EntUserId  int64   `header:"entUserId,optional"`
 		EntId      int64   `header:"entId,optional"`
-		Title      string  `json:"title"`         //标题
-		Content    string  `json:"content"`       //内容
-		PcHref     string  `json:"pcHref"`        //pc跳转地址
-		MobileHref string  `json:"mobileHref"`    //移动端跳转地址
+		Title      string  `json:"title"` //标题
+		Content    string  `json:"content"` //内容
+		PcHref     string  `json:"pcHref"` //pc跳转地址
+		MobileHref string  `json:"mobileHref"` //移动端跳转地址
 		User       []int64 `json:"user,optional"` //企业用户id
-		MsgType    string  `json:"msgType"`       //消息类型 1-活动优惠 2-服务通知 3-订阅消息 4-项目动态 5-企业动态 6-分析报告 7-系统通知 11-待办
+		MsgType    string  `json:"msgType"` //消息类型 1-活动优惠 2-服务通知 3-订阅消息 4-项目动态 5-企业动态 6-分析报告 7-系统通知 11-待办
 	}
 	CanAddReq {
 		AppId          string `header:"appId,default=10000"`
@@ -183,20 +183,20 @@ type (
 		EntId          int64  `header:"entId,optional"`
 		AccountId      int64  `header:"accountId,optional"`
 		EntDeptId      int64  `header:"entDeptId,optional"`
-		EmployInfoId   int64  `json:"employInfoId"`            //资讯收录id
+		EmployInfoId   int64  `json:"employInfoId"` //资讯收录id
 		EmployCustomId int64  `json:"employCustomId,optional"` //客户收录id
-		Key            string `json:"key"`                     //创建线索:more_create_clue 创建机会:more_create_chance 创建客户:more_create_custom
+		Key            string `json:"key"` //创建线索:more_create_clue 创建机会:more_create_chance 创建客户:more_create_custom
 	}
 	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"`
@@ -208,12 +208,12 @@ type (
 		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"`  //同甲异业
+		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"`       //代理机构
+		Agency       string `json:"agency,optional"` //代理机构
 		PageNum      int    `json:"pageNum"`
 		PageSize     int    `json:"pageSize"`
 		BusinessType string `json:"businessType"`
@@ -299,7 +299,8 @@ type (
 		Action     string `json:"action,optional"`
 	}
 	InfoDetailReq {
-		InfoId string `json:"infoId"`
+		PositionId int64  `header:"positionId"`
+		InfoId     string `json:"infoId"`
 	}
 	PrjectHistoryReq {
 		Source   string `json:"source"`
@@ -307,11 +308,11 @@ type (
 		WinnerId string `json:"winnerId"`
 	}
 	ChannelListReq {
-		PartyA       string `json:"partyA,optional"`       //甲方
-		Supplier     string `json:"supplier,optional"`     //供应商
-		Heterotophy  string `json:"heterotophy,optional"`  //同甲异业
+		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"` //代理机构
 		PositionId   int64  `header:"positionId,optional"`
 		EntAccountId int64  `header:"entAccountId,optional"` //企业账户id
 		Type         string `json:"type,optional"`
@@ -339,104 +340,105 @@ 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)
-}
+}
+

+ 49 - 48
api/internal/handler/routes.go

@@ -14,28 +14,23 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 		[]rest.Route{
 			{
 				Method:  http.MethodPost,
-				Path:    "/crmApplication/clue/add",
-				Handler: clueAddHandler(serverCtx),
-			},
-			{
-				Method:  http.MethodPost,
-				Path:    "/crmApplication/saleChance/add",
-				Handler: saleChanceAddHandler(serverCtx),
+				Path:    "/crmApplication/candidate/channel/list",
+				Handler: candidateChannelListHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/crmApplication/employ/operate",
-				Handler: employOperateHandler(serverCtx),
+				Path:    "/crmApplication/clue/add",
+				Handler: clueAddHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/crmApplication/information/transfer",
-				Handler: transferHandler(serverCtx),
+				Path:    "/crmApplication/custom/add",
+				Handler: customAddHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/crmApplication/ignore/operate",
-				Handler: ignoreOperateHandler(serverCtx),
+				Path:    "/crmApplication/employ/distribute",
+				Handler: employDistributeHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
@@ -44,28 +39,28 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/crmApplication/custom/add",
-				Handler: customAddHandler(serverCtx),
+				Path:    "/crmApplication/employ/operate",
+				Handler: employOperateHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/crmApplication/file/upload",
-				Handler: fileUploadHandler(serverCtx),
+				Path:    "/crmApplication/ent/info",
+				Handler: entinfoHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/crmApplication/employ/distribute",
-				Handler: employDistributeHandler(serverCtx),
+				Path:    "/crmApplication/file/upload",
+				Handler: fileUploadHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/crmApplication/ent/info",
-				Handler: entinfoHandler(serverCtx),
+				Path:    "/crmApplication/ignore/action",
+				Handler: ignoreActionHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/crmApplication/info/push",
-				Handler: pushMsgHandler(serverCtx),
+				Path:    "/crmApplication/ignore/operate",
+				Handler: ignoreOperateHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
@@ -74,23 +69,18 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/crmApplication/owner/list",
-				Handler: ownerListHandler(serverCtx),
-			},
-			{
-				Method:  http.MethodPost,
-				Path:    "/crmApplication/network/project/list",
-				Handler: projectListHandler(serverCtx),
+				Path:    "/crmApplication/info/push",
+				Handler: pushMsgHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/crmApplication/pr/pname/ass",
-				Handler: PrPnameAssHandler(serverCtx),
+				Path:    "/crmApplication/infomation/detail",
+				Handler: infoDetailHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/crmApplication/pr/project/analyse",
-				Handler: CoopHistoryListHandler(serverCtx),
+				Path:    "/crmApplication/information/transfer",
+				Handler: transferHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
@@ -99,13 +89,13 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/crmApplication/network/associate",
-				Handler: associateHandler(serverCtx),
+				Path:    "/crmApplication/network/allProject",
+				Handler: allProjectHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/crmApplication/network/allProject",
-				Handler: allProjectHandler(serverCtx),
+				Path:    "/crmApplication/network/associate",
+				Handler: associateHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
@@ -114,18 +104,18 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/crmApplication/ignore/action",
-				Handler: ignoreActionHandler(serverCtx),
+				Path:    "/crmApplication/network/project/list",
+				Handler: projectListHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/crmApplication/infomation/detail",
-				Handler: infoDetailHandler(serverCtx),
+				Path:    "/crmApplication/owner/cooperate",
+				Handler: ownerCooperateHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/crmApplication/pr/project/history",
-				Handler: projectHistoryHandler(serverCtx),
+				Path:    "/crmApplication/owner/list",
+				Handler: ownerListHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
@@ -134,14 +124,25 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/crmApplication/owner/cooperate",
-				Handler: ownerCooperateHandler(serverCtx),
+				Path:    "/crmApplication/pr/pname/ass",
+				Handler: PrPnameAssHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/crmApplication/candidate/channel/list",
-				Handler: candidateChannelListHandler(serverCtx),
+				Path:    "/crmApplication/pr/project/analyse",
+				Handler: CoopHistoryListHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/crmApplication/pr/project/history",
+				Handler: projectHistoryHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/crmApplication/saleChance/add",
+				Handler: saleChanceAddHandler(serverCtx),
 			},
 		},
+		rest.WithMaxBytes(104857600),
 	)
 }

+ 10 - 0
api/internal/logic/infodetaillogic.go

@@ -37,6 +37,8 @@ type Infomation struct {
 	DataJsonId  string `ch:"datajson_id"`
 	ProjectName string `json:"project_name"`
 	Href        string `json:"href"`
+	IsIgnore    int    `json:"isIgnore"`
+	IsCreate    int    `json:"isCreate"`
 }
 
 func (l *InfoDetailLogic) InfoDetail(req *types.InfoDetailReq) (resp *types.Reply, err error) {
@@ -53,7 +55,15 @@ func (l *InfoDetailLogic) InfoDetail(req *types.InfoDetailReq) (resp *types.Repl
 			info.ProjectName = common.ObjToString((*binfo)["projectname"])
 			info.Href = fmt.Sprintf("/article/content/%s.html", encrypt.EncodeArticleId2ByCheck(info.DataJsonId))
 		}
+
+		q1 := `SELECT relate_id, is_ignore, is_create FROM crm.connection_status WHERE position_id = ? AND relate_id = ? AND itype = 2`
+		cinfo := T.CrmMysql.SelectBySql(q1, req.PositionId, req.InfoId)
+		if cinfo != nil && len(*cinfo) > 0 {
+			info.IsIgnore = common.IntAll((*cinfo)[0]["is_ignore"])
+			info.IsCreate = common.IntAll((*cinfo)[0]["is_create"])
+		}
 		resp.Data = info
+
 	} else {
 		resp.Error_code = -1
 		resp.Error_msg = "未查询到情报信息"

+ 5 - 1
api/internal/service/plistService.go

@@ -13,6 +13,7 @@ import (
 	"github.com/zeromicro/go-zero/core/logx"
 	"strconv"
 	"strings"
+	"time"
 )
 
 const (
@@ -191,6 +192,9 @@ func getQuerySql(req *types.ProjectListReq, isPage bool, buyerArr, plist []strin
 	} else if req.StartTime == 0 && req.EntTime > 0 {
 		et := req.EntTime + 90*24*60*60
 		querys = append(querys, fmt.Sprintf(" a.endtime<=%d", et))
+	} else {
+		// 没有时间筛选 过滤过期情报数据数据
+		querys = append(querys, fmt.Sprintf(" (a.endtime == null OR a.endtime == 0 OR a.endtime>=%d)", time.Now().Unix()))
 	}
 	var regionArr = []string{}
 	if req.Area != "" || req.City != "" || req.District != "" {
@@ -255,7 +259,7 @@ func getQuerySql(req *types.ProjectListReq, isPage bool, buyerArr, plist []strin
 		}
 		querys = append(querys, arr...)
 	}
-	//过滤掉已中标的招标项目数据
+	//过滤掉已中标
 	querys = append(querys, fmt.Sprintf(" a.project_bidstatus in (%s) ", "2,3,4"))
 	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 {

+ 220 - 219
api/internal/types/types.go

@@ -1,17 +1,62 @@
 // 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 AddOrUpdateReq struct {
+	PositionId              int64  `header:"positionId"`
+	EntUserId               int64  `header:"entUserId,optional"`
+	EntId                   int64  `header:"entId,optional"`
+	EntDeptId               int64  `header:"entDeptId,optional"`
+	Qyxy_id                 string `json:"qyxy_id,optional"`
+	Company_id              string `json:"company_id,optional"`
+	Company_name            string `json:"company_name,optional"`
+	Contact_person          string `json:"contact_person"`
+	Contact_phone           string `json:"contact_phone"`
+	Introduce_owner_id      string `json:"introduce_owner_id,optional"`
+	Introduce_owner_qyxy_id string `json:"introduce_owner_qyxy_id,optional"`
+	Introduce_owner_name    string `json:"introduce_owner_name,optional"`
+	Introduce_project_id    string `json:"introduce_project_id,optional"`
+	Introduce_project_name  string `json:"introduce_project_name,optional"`
+	Id                      int64  `json:"id,optional"`
+	Type                    string `json:"type"`
 }
 
-type InfoReply struct {
-	Error_code  int64       `json:"error_code"`
-	Error_msg   string      `json:"error_msg"`
-	Data        interface{} `json:"data"`
-	BatchEmploy int64       `json:"batchEmploy"`
+type AllprojectReq struct {
+	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 {
+	EntAccountId int64  `header:"entAccountId"`
+	EntName      string `header:"entName"`
+	Name         string `json:"name"`
+	Type         string `json:"type"`
+}
+
+type CanAddReq struct {
+	AppId          string `header:"appId,default=10000"`
+	BaseUserId     int64  `header:"newUserId"`
+	PositionId     int64  `header:"positionId,optional"`
+	EntUserId      int64  `header:"entUserId,optional"`
+	EntId          int64  `header:"entId,optional"`
+	AccountId      int64  `header:"accountId,optional"`
+	EntDeptId      int64  `header:"entDeptId,optional"`
+	EmployInfoId   int64  `json:"employInfoId"`            //资讯收录id
+	EmployCustomId int64  `json:"employCustomId,optional"` //客户收录id
+	Key            string `json:"key"`                     //创建线索:more_create_clue 创建机会:more_create_chance 创建客户:more_create_custom
+}
+
+type ChannelListReq 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"`       //代理机构
+	PositionId   int64  `header:"positionId,optional"`
+	EntAccountId int64  `header:"entAccountId,optional"` //企业账户id
+	Type         string `json:"type,optional"`
 }
 
 type ClueAddReq struct {
@@ -33,81 +78,23 @@ type ClueAddReq struct {
 	Channel      string  `json:"channel"`               //渠道来源:网页、手动创建
 }
 
-type SaleChanceReq struct {
-	AppId             string  `header:"appId,default=10000"`
-	BaseUserId        int64   `header:"newUserId"`
-	PositionId        int64   `header:"positionId,optional"`
-	EntUserId         int64   `header:"entUserId,optional"`
-	EntId             int64   `header:"entId,optional"`
-	AccountId         int64   `header:"accountId,optional"`
-	EntDeptId         int64   `header:"entDeptId,optional"`
-	ChanceName        string  `json:"chanceName"`                 //机会名称
-	Summary           string  `json:"summary"`                    //概要信息
-	ChanceClassify    int64   `json:"chanceClassify"`             //机会分类
-	ExpectedOrderTime int64   `json:"expectedOrderTime,optional"` //最初预计落单段时间 时间戳
-	ExpectedMoney     float64 `json:"expectedMoney,optional"`     //最初预计落单金额
-	CustomName        string  `json:"customName"`                 //客户全称
-	BusinessType      int64   `json:"businessType"`               //业务类型  1新客户需求 2老客户需求 3简易项目流程
-	Remarks           string  `json:"remarks,optional"`           //备注
-	NextfollowUpTime  int64   `json:"nextfollowUpTime,optional"`  //下次跟进时间戳
-	Types             int64   `json:"types"`                      //处理方式 1自办;2转办;3待处理
-	User              []int64 `json:"user,optional"`              //企业用户id
-	EmployInfoId      int64   `json:"employInfoId,optional"`      //资讯收录id
-	CustomId          int64   `json:"customId,optional"`          //客户id
-	CreateName        string  `json:"createName"`                 //创建人
-	ChanceSource      int64   `json:"chanceSource"`               //机会来源
-	OwnerId           string  `json:"ownerId,optional"`           //潜客收录id(人脉)
-	BusinessId        string  `json:"businessId,optional"`        //商机收录id(人脉)
-}
-
-type EmployOperateReq struct {
-	AppId      string `header:"appId,default=10000"`
-	BaseUserId int64  `header:"newUserId"`
-	PositionId int64  `header:"positionId,optional"`
-	EntUserId  int64  `header:"entUserId,optional"`
-	EntId      int64  `header:"entId,optional"`
-	IdArr      string `json:"idArr"`      //信息id多条信息
-	IsEmploy   bool   `json:"isEmploy"`   //是否收录true收录 false取消收录
-	EmployType int64  `json:"employType"` //来源方式来源;1招标采购、2企业、3采购单位、4拟在建项目
-	EntDeptId  int64  `header:"entDeptId,optional"`
-	From       string `json:"from,optional"` //来源
-}
-
-type TransferReq struct {
-	AppId         string   `header:"appId,default=10000"`
-	BaseUserId    int64    `header:"newUserId"`
-	PositionId    int64    `header:"positionId,optional"`
-	EntUserId     int64    `header:"entUserId,optional"`
-	EntId         int64    `header:"entId,optional"`
-	EmplouIdArr   []string `json:"emplouIdArr"`
-	PositionIdArr []string `json:"positionIdArr"`
-}
-
-type IgnoreOperateReq struct {
-	AppId      string `header:"appId,default=10000"`
-	BaseUserId int64  `header:"newUserId"`
-	PositionId int64  `header:"positionId,optional"`
-	EntUserId  int64  `header:"entUserId,optional"`
-	EntId      int64  `header:"entId,optional"`
-	IdArr      string `json:"idArr"`      //id集合
-	IsIgnore   bool   `json:"isIgnore"`   //是否忽略 true 忽略 false取消忽略
-	EmployType int64  `json:"employType"` //来源方式来源;1招标采购、2企业、3采购单位、4拟在建项目
+type CoopHistoryReq struct {
+	EntAccountId int64  `header:"entAccountId,optional"` //企业账户id
+	PositionId   int64  `header:"positionId,optional"`
+	EntId        string `header:"entId,optional"`
+	EntUserId    string `header:"entUserId,optional"`
+	DeptId       string `header:"deptId,optional"` //部门id
+	Pid          string `json:"projectId"`
+	ChannelType  string `json:"channelType"`
 }
 
-type InfoEmployinfoReq struct {
-	AppId        string `header:"appId,default=10000"`
-	BaseUserId   int64  `header:"newUserId"`
-	PositionId   int64  `header:"positionId,optional"`
-	EntUserId    int64  `header:"entUserId,optional"`
-	EntId        int64  `header:"entId,optional"`
-	EmployType   int64  `json:"employType"` //1标采购、2企业、3采购单位、4拟在建项目
-	IdArr        string `json:"idArr"`      //id
-	EntNicheDis  int64  `header:"entNicheDis,optional"`
-	EntDeptId    int64  `header:"entDeptId,optional"`
-	PositionType int64  `header:"positionType,optional"` //职位类型 0个人 1企业
-	AccountId    int64  `header:"accountId,optional"`    //账户id
-	EntAccountId int64  `header:"entAccountId,optional"` //企业账户id
-	From         string `json:"from,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 CustomAddReq struct {
@@ -142,15 +129,10 @@ type CustomAddReq struct {
 	BusinessId           string  `json:"businessId,optional"`              //商机收录id(人脉)
 }
 
-type FileUploadReq struct {
-	AppId      string `header:"appId,default=10000"`
-	BaseUserId int64  `header:"newUserId"`
-	PositionId int64  `header:"positionId,optional"`
-	EntUserId  int64  `header:"entUserId,optional"`
-	EntId      int64  `header:"entId,optional"`
-	BusinessId int64  `form:"businessId"` //业务id
-	Types      int64  `form:"type"`       //类型;1:跟进记录-线下 2:跟进记录-线上 3:跟进记录-备忘 4:销售机会-项目文档 5:客户-客户档案
-	FileType   int64  `form:"fileType"`   //文件类型,产品介绍、项目方案、立项报告、报价文件、招标文件、投标文件、中标通知书、合同、发票、其他文件
+type DistributePerson struct {
+	PositionId int64 `json:"positionId"`
+	EntUserId  int64 `json:"entUserId"`
+	EntDeptId  int64 `json:"entDeptId"`
 }
 
 type EmployDistributeReq struct {
@@ -165,41 +147,100 @@ type EmployDistributeReq struct {
 	EntDeptId   int64              `header:"entDeptId,optional"`
 }
 
-type DistributePerson struct {
-	PositionId int64 `json:"positionId"`
-	EntUserId  int64 `json:"entUserId"`
-	EntDeptId  int64 `json:"entDeptId"`
+type EmployOperateReq struct {
+	AppId      string `header:"appId,default=10000"`
+	BaseUserId int64  `header:"newUserId"`
+	PositionId int64  `header:"positionId,optional"`
+	EntUserId  int64  `header:"entUserId,optional"`
+	EntId      int64  `header:"entId,optional"`
+	IdArr      string `json:"idArr"`      //信息id多条信息
+	IsEmploy   bool   `json:"isEmploy"`   //是否收录true收录 false取消收录
+	EmployType int64  `json:"employType"` //来源方式来源;1招标采购、2企业、3采购单位、4拟在建项目
+	EntDeptId  int64  `header:"entDeptId,optional"`
+	From       string `json:"from,optional"` //来源
 }
 
 type EntInfoReq struct {
 	EntName string `json:"entName"`
 }
 
-type PushMsgReq struct {
-	AppId      string  `header:"appId,default=10000"`
-	BaseUserId int64   `header:"newUserId"`
-	PositionId int64   `header:"positionId,optional"`
-	EntUserId  int64   `header:"entUserId,optional"`
-	EntId      int64   `header:"entId,optional"`
-	Title      string  `json:"title"`         //标题
-	Content    string  `json:"content"`       //内容
-	PcHref     string  `json:"pcHref"`        //pc跳转地址
-	MobileHref string  `json:"mobileHref"`    //移动端跳转地址
-	User       []int64 `json:"user,optional"` //企业用户id
-	MsgType    string  `json:"msgType"`       //消息类型 1-活动优惠 2-服务通知 3-订阅消息 4-项目动态 5-企业动态 6-分析报告 7-系统通知 11-待办
+type FileUploadReq struct {
+	AppId      string `header:"appId,default=10000"`
+	BaseUserId int64  `header:"newUserId"`
+	PositionId int64  `header:"positionId,optional"`
+	EntUserId  int64  `header:"entUserId,optional"`
+	EntId      int64  `header:"entId,optional"`
+	BusinessId int64  `form:"businessId"` //业务id
+	Types      int64  `form:"type"`       //类型;1:跟进记录-线下 2:跟进记录-线上 3:跟进记录-备忘 4:销售机会-项目文档 5:客户-客户档案
+	FileType   int64  `form:"fileType"`   //文件类型,产品介绍、项目方案、立项报告、报价文件、招标文件、投标文件、中标通知书、合同、发票、其他文件
 }
 
-type CanAddReq struct {
-	AppId          string `header:"appId,default=10000"`
-	BaseUserId     int64  `header:"newUserId"`
-	PositionId     int64  `header:"positionId,optional"`
-	EntUserId      int64  `header:"entUserId,optional"`
-	EntId          int64  `header:"entId,optional"`
-	AccountId      int64  `header:"accountId,optional"`
-	EntDeptId      int64  `header:"entDeptId,optional"`
-	EmployInfoId   int64  `json:"employInfoId"`            //资讯收录id
-	EmployCustomId int64  `json:"employCustomId,optional"` //客户收录id
-	Key            string `json:"key"`                     //创建线索:more_create_clue 创建机会:more_create_chance 创建客户:more_create_custom
+type IgnoreOperateReq struct {
+	AppId      string `header:"appId,default=10000"`
+	BaseUserId int64  `header:"newUserId"`
+	PositionId int64  `header:"positionId,optional"`
+	EntUserId  int64  `header:"entUserId,optional"`
+	EntId      int64  `header:"entId,optional"`
+	IdArr      string `json:"idArr"`      //id集合
+	IsIgnore   bool   `json:"isIgnore"`   //是否忽略 true 忽略 false取消忽略
+	EmployType int64  `json:"employType"` //来源方式来源;1招标采购、2企业、3采购单位、4拟在建项目
+}
+
+type IgnoreReq struct {
+	PositionId int64  `header:"positionId"`
+	EntUserId  int64  `header:"entUserId,optional"`
+	EntId      int64  `header:"entId,optional"`
+	EntDeptId  int64  `header:"entDeptId,optional"`
+	RelateId   string `json:"relateId,optional"`
+	Source     string `json:"source,optional"`
+	Action     string `json:"action,optional"`
+}
+
+type InfoDetailReq struct {
+	PositionId int64  `header:"positionId"`
+	InfoId     string `json:"infoId"`
+}
+
+type InfoEmployinfoReq struct {
+	AppId        string `header:"appId,default=10000"`
+	BaseUserId   int64  `header:"newUserId"`
+	PositionId   int64  `header:"positionId,optional"`
+	EntUserId    int64  `header:"entUserId,optional"`
+	EntId        int64  `header:"entId,optional"`
+	EmployType   int64  `json:"employType"` //1标采购、2企业、3采购单位、4拟在建项目
+	IdArr        string `json:"idArr"`      //id
+	EntNicheDis  int64  `header:"entNicheDis,optional"`
+	EntDeptId    int64  `header:"entDeptId,optional"`
+	PositionType int64  `header:"positionType,optional"` //职位类型 0个人 1企业
+	AccountId    int64  `header:"accountId,optional"`    //账户id
+	EntAccountId int64  `header:"entAccountId,optional"` //企业账户id
+	From         string `json:"from,optional"`           //来源
+}
+
+type InfoReply struct {
+	Error_code  int64       `json:"error_code"`
+	Error_msg   string      `json:"error_msg"`
+	Data        interface{} `json:"data"`
+	BatchEmploy int64       `json:"batchEmploy"`
+}
+
+type NetWorkListReq struct {
+	UserId             string `header:"userId"`
+	EntAccountId       int64  `header:"entAccountId"`
+	PositionId         int64  `header:"positionId"`
+	Type               string `json:"type,optional"`
+	Name               string `json:"name,optional"`
+	Monitor            int64  `json:"monitor,optional"`
+	Starttime          string `json:"starttime,optional"`
+	Endtime            string `json:"endtime,optional"`
+	Order_amount       int64  `json:"order_amount,optional"`
+	Current_page       int64  `json:"current_page,optional"`
+	Page_size          int64  `json:"page_size,optional"`
+	Project_matchme    int64  `json:"project_matchme,optional"`
+	Buyercount_start   int64  `json:"buyercount_start,optional"`
+	Buyercount_end     int64  `json:"buyercount_end,optional"`
+	Monitorcount_start int64  `json:"monitorcount_start,optional"`
+	Monitorcount_end   int64  `json:"monitorcount_end,optional"`
 }
 
 type OwnerListReq struct {
@@ -219,6 +260,16 @@ type OwnerListReq struct {
 	EntAccountId     int64  `header:"entAccountId"`
 }
 
+type PnameAssReq struct {
+	ProjectName string `json:"projectName"`
+}
+
+type PrjectHistoryReq struct {
+	Source   string `json:"source"`
+	BuyerId  string `json:"buyerId"`
+	WinnerId string `json:"winnerId"`
+}
+
 type ProjectListReq struct {
 	UserId       string `header:"userId,optional"`
 	PositionId   int64  `header:"positionId,optional"`
@@ -245,102 +296,24 @@ type ProjectListReq struct {
 	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        string `header:"entId,optional"`
-	EntUserId    string `header:"entUserId,optional"`
-	DeptId       string `header:"deptId,optional"` //部门id
-	Pid          string `json:"projectId"`
-	ChannelType  string `json:"channelType"`
-}
-
-type AddOrUpdateReq struct {
-	PositionId              int64  `header:"positionId"`
-	EntUserId               int64  `header:"entUserId,optional"`
-	EntId                   int64  `header:"entId,optional"`
-	EntDeptId               int64  `header:"entDeptId,optional"`
-	Qyxy_id                 string `json:"qyxy_id,optional"`
-	Company_id              string `json:"company_id,optional"`
-	Company_name            string `json:"company_name,optional"`
-	Contact_person          string `json:"contact_person"`
-	Contact_phone           string `json:"contact_phone"`
-	Introduce_owner_id      string `json:"introduce_owner_id,optional"`
-	Introduce_owner_qyxy_id string `json:"introduce_owner_qyxy_id,optional"`
-	Introduce_owner_name    string `json:"introduce_owner_name,optional"`
-	Introduce_project_id    string `json:"introduce_project_id,optional"`
-	Introduce_project_name  string `json:"introduce_project_name,optional"`
-	Id                      int64  `json:"id,optional"`
-	Type                    string `json:"type"`
-}
-
-type AssociateReq struct {
-	EntAccountId int64  `header:"entAccountId"`
-	EntName      string `header:"entName"`
-	Name         string `json:"name"`
-	Type         string `json:"type"`
-}
-
-type AllprojectReq struct {
-	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 {
-	UserId             string `header:"userId"`
-	EntAccountId       int64  `header:"entAccountId"`
-	PositionId         int64  `header:"positionId"`
-	Type               string `json:"type,optional"`
-	Name               string `json:"name,optional"`
-	Monitor            int64  `json:"monitor,optional"`
-	Starttime          string `json:"starttime,optional"`
-	Endtime            string `json:"endtime,optional"`
-	Order_amount       int64  `json:"order_amount,optional"`
-	Current_page       int64  `json:"current_page,optional"`
-	Page_size          int64  `json:"page_size,optional"`
-	Project_matchme    int64  `json:"project_matchme,optional"`
-	Buyercount_start   int64  `json:"buyercount_start,optional"`
-	Buyercount_end     int64  `json:"buyercount_end,optional"`
-	Monitorcount_start int64  `json:"monitorcount_start,optional"`
-	Monitorcount_end   int64  `json:"monitorcount_end,optional"`
-}
-
-type IgnoreReq struct {
-	PositionId int64  `header:"positionId"`
-	EntUserId  int64  `header:"entUserId,optional"`
-	EntId      int64  `header:"entId,optional"`
-	EntDeptId  int64  `header:"entDeptId,optional"`
-	RelateId   string `json:"relateId,optional"`
-	Source     string `json:"source,optional"`
-	Action     string `json:"action,optional"`
-}
-
-type InfoDetailReq struct {
-	InfoId string `json:"infoId"`
-}
-
-type PrjectHistoryReq struct {
-	Source   string `json:"source"`
-	BuyerId  string `json:"buyerId"`
-	WinnerId string `json:"winnerId"`
+type PushMsgReq struct {
+	AppId      string  `header:"appId,default=10000"`
+	BaseUserId int64   `header:"newUserId"`
+	PositionId int64   `header:"positionId,optional"`
+	EntUserId  int64   `header:"entUserId,optional"`
+	EntId      int64   `header:"entId,optional"`
+	Title      string  `json:"title"`         //标题
+	Content    string  `json:"content"`       //内容
+	PcHref     string  `json:"pcHref"`        //pc跳转地址
+	MobileHref string  `json:"mobileHref"`    //移动端跳转地址
+	User       []int64 `json:"user,optional"` //企业用户id
+	MsgType    string  `json:"msgType"`       //消息类型 1-活动优惠 2-服务通知 3-订阅消息 4-项目动态 5-企业动态 6-分析报告 7-系统通知 11-待办
 }
 
-type ChannelListReq 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"`       //代理机构
-	PositionId   int64  `header:"positionId,optional"`
-	EntAccountId int64  `header:"entAccountId,optional"` //企业账户id
-	Type         string `json:"type,optional"`
+type Reply struct {
+	Error_code int64       `json:"error_code"`
+	Error_msg  string      `json:"error_msg"`
+	Data       interface{} `json:"data"`
 }
 
 type RouteOwnerListReq struct {
@@ -349,11 +322,39 @@ type RouteOwnerListReq struct {
 	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 SaleChanceReq struct {
+	AppId             string  `header:"appId,default=10000"`
+	BaseUserId        int64   `header:"newUserId"`
+	PositionId        int64   `header:"positionId,optional"`
+	EntUserId         int64   `header:"entUserId,optional"`
+	EntId             int64   `header:"entId,optional"`
+	AccountId         int64   `header:"accountId,optional"`
+	EntDeptId         int64   `header:"entDeptId,optional"`
+	ChanceName        string  `json:"chanceName"`                 //机会名称
+	Summary           string  `json:"summary"`                    //概要信息
+	ChanceClassify    int64   `json:"chanceClassify"`             //机会分类
+	ExpectedOrderTime int64   `json:"expectedOrderTime,optional"` //最初预计落单段时间 时间戳
+	ExpectedMoney     float64 `json:"expectedMoney,optional"`     //最初预计落单金额
+	CustomName        string  `json:"customName"`                 //客户全称
+	BusinessType      int64   `json:"businessType"`               //业务类型  1新客户需求 2老客户需求 3简易项目流程
+	Remarks           string  `json:"remarks,optional"`           //备注
+	NextfollowUpTime  int64   `json:"nextfollowUpTime,optional"`  //下次跟进时间戳
+	Types             int64   `json:"types"`                      //处理方式 1自办;2转办;3待处理
+	User              []int64 `json:"user,optional"`              //企业用户id
+	EmployInfoId      int64   `json:"employInfoId,optional"`      //资讯收录id
+	CustomId          int64   `json:"customId,optional"`          //客户id
+	CreateName        string  `json:"createName"`                 //创建人
+	ChanceSource      int64   `json:"chanceSource"`               //机会来源
+	OwnerId           string  `json:"ownerId,optional"`           //潜客收录id(人脉)
+	BusinessId        string  `json:"businessId,optional"`        //商机收录id(人脉)
+}
+
+type TransferReq struct {
+	AppId         string   `header:"appId,default=10000"`
+	BaseUserId    int64    `header:"newUserId"`
+	PositionId    int64    `header:"positionId,optional"`
+	EntUserId     int64    `header:"entUserId,optional"`
+	EntId         int64    `header:"entId,optional"`
+	EmplouIdArr   []string `json:"emplouIdArr"`
+	PositionIdArr []string `json:"positionIdArr"`
 }