feat:合并

api/application.api

@@ -205,7 +205,12 @@ type (
 		PositionId   int64  `header:"positionId,optional"`
 		EntId        string `header:"entId,optional"`
 		EntUserId    string `header:"entUserId,optional"`
-		DeptId       string `header:"deptId,optional"` //部门id
+		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      int64  `json:"pageNum"`
 		PageSize     int64  `json:"pageSize"`
 		BusinessType string `json:"businessType"`
@@ -276,6 +281,15 @@ type (
 		Monitorcount_start int64  `json:"monitorcount_start,optional"`
 		Monitorcount_end   int64  `json:"monitorcount_end,optional"`
 	}
+	IgnoreReq {
+		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     int    `json:"source,optional"`
+		Action     int    `json:"action,optional"`
+	}
 )
 
 @server (
@@ -362,4 +376,8 @@ service crmApplication {
 	@doc "人脉库-列表"
 	@handler networkList
 	post /crmApplication/network/networkList (NetWorkListReq) returns (Reply)
+	
+	@doc "忽略操作"
+	@handler ignoreAction
+	post /crmApplication/ignore/action (IgnoreReq) returns (Reply)
 }

api/internal/handler/ignoreactionhandler.go

@@ -0,0 +1,28 @@
+package handler
+
+import (
+	"net/http"
+
+	"bp.jydev.jianyu360.cn/CRM/application/api/internal/logic"
+	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"github.com/zeromicro/go-zero/rest/httpx"
+)
+
+func ignoreActionHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.IgnoreReq
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := logic.NewIgnoreActionLogic(r.Context(), svcCtx)
+		resp, err := l.IgnoreAction(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

api/internal/handler/routes.go

@@ -112,6 +112,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/crmApplication/network/networkList",
 				Handler: networkListHandler(serverCtx),
 			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/crmApplication/ignore/action",
+				Handler: ignoreActionHandler(serverCtx),
+			},
 		},
 	)
 }

api/internal/logic/ignoreactionlogic.go

@@ -0,0 +1,75 @@
+package logic
+
+import (
+	"app.yhyue.com/moapp/jybase/date"
+	T "bp.jydev.jianyu360.cn/CRM/application/api/common"
+	"context"
+	"time"
+
+	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type IgnoreActionLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewIgnoreActionLogic(ctx context.Context, svcCtx *svc.ServiceContext) *IgnoreActionLogic {
+	return &IgnoreActionLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *IgnoreActionLogic) IgnoreAction(req *types.IgnoreReq) (resp *types.Reply, err error) {
+	resp = &types.Reply{}
+	query := map[string]interface{}{
+		"position_id": req.PositionId,
+		"itype":       req.Source,
+		"relate_id":   req.RelateId,
+	}
+	info := T.CrmMysql.FindOne("connection_status", query, "id", "")
+	if info != nil && len(*info) > 0 {
+		update := map[string]interface{}{
+			"is_ignore": req.Action,
+		}
+		if req.Action == 1 {
+			update["is_handle"] = 1
+		}
+		b := T.CrmMysql.Update("connection_status", query, update)
+		if !b {
+			resp.Error_code = -1
+			resp.Error_msg = "更新失败"
+		}
+
+	} else {
+		if req.Action == 1 {
+			save := map[string]interface{}{
+				"position_id": req.PositionId,
+				"ent_id":      req.EntId,
+				"ent_dept_id": req.EntDeptId,
+				"ent_user id": req.EntUserId,
+				"relate_id":   req.RelateId,
+				"itype":       req.Source,
+				"is_handle":   1,
+				"is_ignore":   req.Action,
+				"create_time": time.Now().Format(date.Date_Full_Layout),
+				"update_time": time.Now().Format(date.Date_Full_Layout),
+			}
+			i := T.CrmMysql.Insert("connection_status", save)
+			if i <= 0 {
+				resp.Error_code = -1
+				resp.Error_msg = "更新失败"
+			}
+		} else {
+			resp.Error_code = -1
+			resp.Error_msg = "更新失败"
+		}
+	}
+	return
+}

api/internal/service/plistService.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"strings"
 
+	"bp.jydev.jianyu360.cn/CRM/application/service"
+
 	"app.yhyue.com/moapp/jybase/common"
 	P "app.yhyue.com/moapp/jybase/mapping"
 	T "bp.jydev.jianyu360.cn/CRM/application/api/common"
@@ -41,6 +43,10 @@ type ProjectEntry struct {
 }
 
 func GetProjectList(req *types.ProjectListReq) (resultList []map[string]interface{}, hasNextPage bool, total int) {
+
+	buyerM := service.BuyerList(req.PartyA, req.Supplier, req.Heterotophy, req.Intermediary, req.Agency)
+	service.MonitorStatusInit(req.PositionId, buyerM, "0")
+
 	preSales := preSalesStatus(req.PositionId)
 	isSqlPage := false
 	if req.SaleStatus == 0 {

api/internal/types/types.go

@@ -221,7 +221,12 @@ type ProjectListReq struct {
 	PositionId   int64  `header:"positionId,optional"`
 	EntId        string `header:"entId,optional"`
 	EntUserId    string `header:"entUserId,optional"`
-	DeptId       string `header:"deptId,optional"` //部门id
+	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      int64  `json:"pageNum"`
 	PageSize     int64  `json:"pageSize"`
 	BusinessType string `json:"businessType"`
@@ -298,3 +303,13 @@ type NetWorkListReq struct {
 	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     int    `json:"source,optional"`
+	Action     int    `json:"action,optional"`
+}