Merge branch 'dev_v1.0.4_wh' of CRM/application into feature/v1.0.4

api/application.api

@@ -312,8 +312,9 @@ type (
 		PositionId   int64  `header:"positionId,optional"`
 	}
 	RouteOwnerListReq {
-		BuyerId   string `json:"buyerId,optional"`
-		BuyerName string `json:"buyerName,optional"`
+		BuyerId    string `json:"buyerId,optional"`
+		BuyerName  string `json:"buyerName,optional"`
+		PositionId int64  `header:"positionId,optional"`
 	}
 	CooperateOwnerListReq {
 		BuyerId       string `json:"buyerId,optional"`
@@ -321,6 +322,7 @@ type (
 		WinnerId      string `json:"winnerId,optional"`
 		WinnerName    string `json:"winnerName,optional"`
 		CooperateType string `json:"cooperateType,optional"`
+		PositionId    int64  `header:"positionId,optional"`
 	}
 )
 

api/internal/logic/ownercooperatelogic.go

@@ -34,6 +34,7 @@ func (l *OwnerCooperateLogic) OwnerCooperate(req *types.CooperateOwnerListReq) (
 		WinnerName:    req.WinnerName,
 		WinnerId:      req.WinnerId,
 		CooperateType: req.CooperateType,
+		PositionId:    req.PositionId,
 	}
 	data := ownerService.OwnerCooperate()
 	resp.Data = data

api/internal/logic/ownerroutelogic.go

@@ -28,8 +28,9 @@ func (l *OwnerRouteLogic) OwnerRoute(req *types.RouteOwnerListReq) (resp *types.
 	// todo: add your logic here and delete this line
 	resp = &types.Reply{}
 	ownerService := &service.OwnerService{
-		BuyerId:   req.BuyerId,
-		BuyerName: req.BuyerName,
+		BuyerId:    req.BuyerId,
+		BuyerName:  req.BuyerName,
+		PositionId: req.PositionId,
 	}
 	data := ownerService.OwnerRoute()
 	resp.Data = data

api/internal/service/owner.go

@@ -93,7 +93,7 @@ func (t *OwnerService) OwnerlList() map[string]interface{} {
 			ProcessingStatusInit(t.PositionId, dataMap, t.ProcessingStatus)
 		}
 		//监控状态处理
-		MonitorStatusInit(t.PositionId, dataMap, t.SourceType)
+		//MonitorStatusInit(t.PositionId, dataMap, t.SourceType)
 		//项目数量查询
 		buyerArr := []string{}
 		for _, value := range *dataMap {
@@ -113,7 +113,7 @@ func (t *OwnerService) OwnerlList() map[string]interface{} {
 		a8 := time.Now().Unix()
 		fmt.Println("状态用时", a8-a7)
 		//监控状态处理
-		MonitorStatusInit(t.PositionId, dataMap, t.SourceType)
+		//MonitorStatusInit(t.PositionId, dataMap, t.SourceType)
 		a9 := time.Now().Unix()
 		fmt.Println("监控用时", a9-a8)
 	}
@@ -746,7 +746,7 @@ func ProjectHandle(buyerArr []string, positionId int64, entName, area, sourceTyp
 			(*projectMap)[buyerName] = map[string]interface{}{
 				"area":    area,
 				"zbtime":  v.Zbtime_count.Value,
-				"money":   v.Money_count.Value,
+				"money":   gconv.Int64((common.Float64All(v.Money_count.Value) * 10000)),
 				"count":   v.Doc_count,
 				"buyerId": buyerId,
 			}

api/internal/types/types.go

@@ -258,22 +258,20 @@ type CoopHistoryReq struct {
 }
 
 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:"company_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"`
+	PositionId             int64  `header:"positionId"`
+	EntUserId              int64  `header:"entUserId,optional"`
+	EntId                  int64  `header:"entId,optional"`
+	EntDeptId              int64  `header:"entDeptId,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_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 {
@@ -287,7 +285,7 @@ type AllprojectReq struct {
 	EntAccountId int64  `header:"entAccountId"`
 	PositionId   int64  `header:"positionId"`
 	Name         string `json:"name,optional"`
-	Type         string `json:"type,optional"`
+	Type         int64  `json:"type,optional"`
 	Id           string `json:"id,optional"`
 }
 
@@ -339,8 +337,9 @@ type ChannelListReq struct {
 }
 
 type RouteOwnerListReq struct {
-	BuyerId   string `json:"buyerId,optional"`
-	BuyerName string `json:"buyerName,optional"`
+	BuyerId    string `json:"buyerId,optional"`
+	BuyerName  string `json:"buyerName,optional"`
+	PositionId int64  `header:"positionId,optional"`
 }
 
 type CooperateOwnerListReq struct {
@@ -349,4 +348,5 @@ type CooperateOwnerListReq struct {
 	WinnerId      string `json:"winnerId,optional"`
 	WinnerName    string `json:"winnerName,optional"`
 	CooperateType string `json:"cooperateType,optional"`
+	PositionId    int64  `header:"positionId,optional"`
 }