Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway into dev

@@ -51,6 +51,16 @@ type DividendsEstimateMoneyItem struct {
 		DepartmentName string `json:"departmentName"`
 		DepartmentName string `json:"departmentName"`
 	} `json:"department"` //发起部门
 	} `json:"department"` //发起部门
 	CooperationContractSponsorName string `json:"cooperationContractSponsorName"`
 	CooperationContractSponsorName string `json:"cooperationContractSponsorName"`
+	StageAndUndertaker             struct {
+		Stage       int `json:"stage"` // 分红阶段
+		Undertakers []struct {
+			UndertakerId int `json:"undertakerId,string"` // 承接人id
+			UserInfo     struct {
+				UserName  string `json:"userName"`  // 共创人员姓名
+				UserPhone string `json:"userPhone"` // 用户手机号
+			} `json:"userInfo"`
+		} `json:"undertakers"` // 共创承接人
+	}
 }
 }
 
 
 func ToDividendsEstimateMoneyItem(param *allied_creation_cooperation.DataDividendsEstimateSearchMoney) []DividendsEstimateMoneyItem {
 func ToDividendsEstimateMoneyItem(param *allied_creation_cooperation.DataDividendsEstimateSearchMoney) []DividendsEstimateMoneyItem {
@@ -62,6 +72,7 @@ func ToDividendsEstimateMoneyItem(param *allied_creation_cooperation.DataDividen
 			CooperationContractNumber: v.CooperationContractNumber,
 			CooperationContractNumber: v.CooperationContractNumber,
 			CreatedAt:                 v.CreatedAt.UnixNano() / 1e6,
 			CreatedAt:                 v.CreatedAt.UnixNano() / 1e6,
 			CooperationModeName:       v.CooperationModeName,
 			CooperationModeName:       v.CooperationModeName,
+			StageAndUndertaker:        v.StageAndUndertaker,
 		}
 		}
 		item.Department.DepartmentId = v.Department.DepartmentId
 		item.Department.DepartmentId = v.Department.DepartmentId
 		item.Department.DepartmentName = v.Department.DepartmentName
 		item.Department.DepartmentName = v.Department.DepartmentName

@@ -186,6 +186,8 @@ func (dividendsEmmateService *DividendsEstimateService) MoneyIncentivesSelector(
 	contractData := resultContract.Grid.List[0]
 	contractData := resultContract.Grid.List[0]
 	resultDividendsEstimate, err := creationCooperationGateway.DividendsEstimatesSearch(allied_creation_cooperation.ReqDividendsEstimateSearch{
 	resultDividendsEstimate, err := creationCooperationGateway.DividendsEstimatesSearch(allied_creation_cooperation.ReqDividendsEstimateSearch{
 		CooperationContractNumber: queryParam.CooperationContractNumber,
 		CooperationContractNumber: queryParam.CooperationContractNumber,
+		DividendsType:             3,
+		CompanyId:                 queryParam.Operator.CompanyId,
 	})
 	})
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -209,7 +211,7 @@ func (dividendsEmmateService *DividendsEstimateService) MoneyIncentivesSelector(
 		}
 		}
 		temp := dto.ContractUndertaker{
 		temp := dto.ContractUndertaker{
 			UserId:                  v.UserId,
 			UserId:                  v.UserId,
-			UsersName:               v.UserName,
+			UsersName:               v.UserInfo.UserName,
 			ContractIncentivesRules: ruleStage,
 			ContractIncentivesRules: ruleStage,
 		}
 		}
 		contractUndertaker = append(contractUndertaker, temp)
 		contractUndertaker = append(contractUndertaker, temp)

@@ -265,17 +265,19 @@ type (
 		Grid struct {
 		Grid struct {
 			Total int
 			Total int
 			List  []struct {
 			List  []struct {
-				UndertakerId              int64               `json:"undertakerId,string"`       // 承接人ID
-				UndertakerCode            string              `json:"undertakerCode"`            // 承接人编号
-				UndertakerName            string              `json:"undertakerName"`            // 承接人姓名
-				UndertakerPhone           string              `json:"undertakerPhone"`           // 承接人电话
-				CooperationContractNumber string              `json:"cooperationContractNumber"` // 项目合约编号
-				CooperationContractName   string              `json:"cooperationContractName"`   // 项目合约名称
-				Attachment                []domain.Attachment `json:"attachment"`                // 合同附件
-				SponsorName               string              `json:"sponsorName"`               // 发起人姓名
-				DepartmentName            string              `json:"departmentName"`            // 发起部门名称
-				CooperationModeName       string              `json:"cooperationModeName"`       // 共创模式名称
-				OrgName                   string              `json:"orgName"`                   // 组织机构名称
+				UndertakerId                   int64               `json:"undertakerId,string"`            // 承接人ID
+				UndertakerCode                 string              `json:"undertakerCode"`                 // 承接人编号
+				UndertakerName                 string              `json:"undertakerName"`                 // 承接人姓名
+				UndertakerPhone                string              `json:"undertakerPhone"`                // 承接人电话
+				CooperationContractNumber      string              `json:"cooperationContractNumber"`      // 项目合约编号
+				CooperationContractName        string              `json:"cooperationContractName"`        // 项目合约名称
+				Attachment                     []domain.Attachment `json:"attachment"`                     // 合同附件
+				SponsorName                    string              `json:"sponsorName"`                    // 发起人姓名
+				DepartmentName                 string              `json:"departmentName"`                 // 发起部门名称
+				CooperationModeName            string              `json:"cooperationModeName"`            // 共创模式名称
+				OrgName                        string              `json:"orgName"`                        // 组织机构名称
+				CooperationContractStatus      int32               `json:"cooperationContractStatus"`      // 项目合约状态
+				CooperationContractDescription string              `json:"cooperationContractDescription"` // 共创描述
 			}
 			}
 		}
 		}
 	}
 	}

@@ -121,6 +121,16 @@ type (
 				} `json:"department"` //发起部门
 				} `json:"department"` //发起部门
 				// 共创合约发起人
 				// 共创合约发起人
 				CooperationContractSponsorName string `json:"cooperationContractSponsor"`
 				CooperationContractSponsorName string `json:"cooperationContractSponsor"`
+				StageAndUndertaker             struct {
+					Stage       int `json:"stage"` // 分红阶段
+					Undertakers []struct {
+						UndertakerId int `json:"undertakerId,string"` // 承接人id
+						UserInfo     struct {
+							UserName  string `json:"userName"`  // 共创人员姓名
+							UserPhone string `json:"userPhone"` // 用户手机号
+						} `json:"userInfo"`
+					} `json:"undertakers"` // 共创承接人
+				}
 			} `json:"list"`
 			} `json:"list"`
 		} `json:"grid"`
 		} `json:"grid"`
 	}
 	}