正在显示
1 个修改的文件
包含
5 行增加
和
4 行删除
@@ -28,10 +28,11 @@ type MoneyIncentivesEstimateDto struct { | @@ -28,10 +28,11 @@ type MoneyIncentivesEstimateDto struct { | ||
28 | // 创建合约时间 | 28 | // 创建合约时间 |
29 | CreatedAt time.Time `json:"createdAt"` | 29 | CreatedAt time.Time `json:"createdAt"` |
30 | // 阶段和承接人 | 30 | // 阶段和承接人 |
31 | - StageAndUndertaker *StageAndUndertaker `json:"stageAndUndertaker"` | 31 | + StageAndUndertaker []*StageAndUndertaker `json:"stageAndUndertaker"` |
32 | } | 32 | } |
33 | 33 | ||
34 | func (dto *MoneyIncentivesEstimateDto) LoadDto(contract *domain.CooperationContract) error { | 34 | func (dto *MoneyIncentivesEstimateDto) LoadDto(contract *domain.CooperationContract) error { |
35 | + // TODO 阶段承接人数据聚合 | ||
35 | dto.CooperationContractId = contract.CooperationContractId | 36 | dto.CooperationContractId = contract.CooperationContractId |
36 | dto.CooperationContractNumber = contract.CooperationContractNumber | 37 | dto.CooperationContractNumber = contract.CooperationContractNumber |
37 | dto.CooperationContractName = contract.CooperationContractName | 38 | dto.CooperationContractName = contract.CooperationContractName |
@@ -39,9 +40,9 @@ func (dto *MoneyIncentivesEstimateDto) LoadDto(contract *domain.CooperationContr | @@ -39,9 +40,9 @@ func (dto *MoneyIncentivesEstimateDto) LoadDto(contract *domain.CooperationContr | ||
39 | dto.Department = contract.Department | 40 | dto.Department = contract.Department |
40 | dto.CooperationContractSponsorName = contract.CooperationContractSponsor.UserName | 41 | dto.CooperationContractSponsorName = contract.CooperationContractSponsor.UserName |
41 | dto.CreatedAt = contract.CreatedAt | 42 | dto.CreatedAt = contract.CreatedAt |
42 | - dto.StageAndUndertaker = &StageAndUndertaker{ | 43 | + dto.StageAndUndertaker = append(dto.StageAndUndertaker, &StageAndUndertaker{ |
43 | Stage: 0, | 44 | Stage: 0, |
44 | - Undertakers: []*domain.Undertaker{}, | ||
45 | - } | 45 | + Undertakers: nil, |
46 | + }) | ||
46 | return nil | 47 | return nil |
47 | } | 48 | } |
-
请 注册 或 登录 后发表评论