Merge branch 'dev-chenzhiying' into dev

@@ -28,10 +28,11 @@ type MoneyIncentivesEstimateDto struct {
 	// 创建合约时间
 	// 创建合约时间
 	CreatedAt time.Time `json:"createdAt"`
 	CreatedAt time.Time `json:"createdAt"`
 	// 阶段和承接人
 	// 阶段和承接人
-	StageAndUndertaker *StageAndUndertaker `json:"stageAndUndertaker"`
+	StageAndUndertaker []*StageAndUndertaker `json:"stageAndUndertaker"`
 }
 }
 
 
 func (dto *MoneyIncentivesEstimateDto) LoadDto(contract *domain.CooperationContract) error {
 func (dto *MoneyIncentivesEstimateDto) LoadDto(contract *domain.CooperationContract) error {
+	// TODO 阶段承接人数据聚合
 	dto.CooperationContractId = contract.CooperationContractId
 	dto.CooperationContractId = contract.CooperationContractId
 	dto.CooperationContractNumber = contract.CooperationContractNumber
 	dto.CooperationContractNumber = contract.CooperationContractNumber
 	dto.CooperationContractName = contract.CooperationContractName
 	dto.CooperationContractName = contract.CooperationContractName
@@ -39,9 +40,9 @@ func (dto *MoneyIncentivesEstimateDto) LoadDto(contract *domain.CooperationContr
 	dto.Department = contract.Department
 	dto.Department = contract.Department
 	dto.CooperationContractSponsorName = contract.CooperationContractSponsor.UserName
 	dto.CooperationContractSponsorName = contract.CooperationContractSponsor.UserName
 	dto.CreatedAt = contract.CreatedAt
 	dto.CreatedAt = contract.CreatedAt
-	dto.StageAndUndertaker = &StageAndUndertaker{
+	dto.StageAndUndertaker = append(dto.StageAndUndertaker, &StageAndUndertaker{
 		Stage:       0,
 		Stage:       0,
-		Undertakers: []*domain.Undertaker{},
-	}
+		Undertakers: nil,
+	})
 	return nil
 	return nil
 }
 }