浏览代码

wip:数据导出修改

wangkaiyue 2 年之前
父节点
当前提交
f6aef30f2b

+ 3 - 0
jyBXSubscribe/api/internal/logic/byPushHistoryLogic.go

@@ -38,6 +38,9 @@ func (l *ByPushHistoryLogic) ByPushHistory(req *types.SubscribeReq) (resp *types
 		UserType:   req.UserType,
 		Price:      req.Price,
 		FileExists: req.FileExists,
+		IsRead:     req.IsRead,
+		Source:     req.Source,
+		Staffs:     req.Staffs,
 		UserId:     req.UserId,
 		EntId:      req.EntId,
 		EntUserId:  req.EntUserId,

+ 10 - 0
jyBXSubscribe/rpc/internal/logic/bypushhistorylogic.go

@@ -31,6 +31,13 @@ func NewByPushHistoryLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ByP
 func (l *ByPushHistoryLogic) ByPushHistory(in *bxsubscribe.SubscribeInfosReq) (*bxsubscribe.ByPushHistoryResp, error) {
 	// todo: add your logic here and delete this line
 	vipType := in.UserType
+	//分发员工
+	var staffIds []string
+	for _, staffId := range strings.Split(in.Staffs, ",") {
+		if staffId != "" {
+			staffIds = append(staffIds, staffId)
+		}
+	}
 	spqp := &model.SubPushQueryParam{
 		Mgo_bidding:      IC.MgoBidding,                      //mongo
 		Bidding:          IC.DB.Mongo.Bidding.Collection,     //招标信息 表
@@ -51,6 +58,9 @@ func (l *ByPushHistoryLogic) ByPushHistory(in *bxsubscribe.SubscribeInfosReq) (*
 		EntId:            in.EntId,      //商机管理企业id
 		EntUserId:        in.EntUserId,  //商机管理用户id
 		DeptId:           in.DeptId,     //商机管理部门id
+		IsRead:           in.IsRead,
+		Source:           in.Source,
+		Staffs:           staffIds,
 		NewUserId:        in.NewUserId,
 		BaseServiceMysql: IC.BaseServiceMysql,
 		IsEnt:            in.IsEnt,