allied-creation / allied-creation-cooperation · 提交

转到一个项目

作者 陈志颖
提交 d979f8eeba462752c951e1d8e4c23658f69109b3 1 个父辈 a25817f1

fix:共创申请返回共创模式

内嵌 并排对比
正在显示 3 个修改的文件 包含 42 行增加 和 12 行删除
@@ -88,6 +88,8 @@ type CooperationProject struct { @@ -88,6 +88,8 @@ type CooperationProject struct {
88 CooperationProjectName string `json:"cooperationProjectName"` 88 CooperationProjectName string `json:"cooperationProjectName"`
89 // 图片附件 89 // 图片附件
90 Attachment []*domain.Attachment `json:"attachment"` 90 Attachment []*domain.Attachment `json:"attachment"`
  91 + // 共创模式
  92 + CooperationMode *domain.CooperationMode `json:"cooperationMode"`
91 } 93 }
92 94
93 func (data *CooperationApplicationDto) LoadDto(a *domain.CooperationApplication) { 95 func (data *CooperationApplicationDto) LoadDto(a *domain.CooperationApplication) {
@@ -152,5 +154,6 @@ func (data *CooperationApplicationDto) LoadCooperationProject(v *domain.Cooperat @@ -152,5 +154,6 @@ func (data *CooperationApplicationDto) LoadCooperationProject(v *domain.Cooperat
152 CooperationProjectDescription: v.CooperationProjectDescription, 154 CooperationProjectDescription: v.CooperationProjectDescription,
153 CooperationProjectName: v.CooperationProjectName, 155 CooperationProjectName: v.CooperationProjectName,
154 Attachment: v.Attachment, 156 Attachment: v.Attachment,
  157 + CooperationMode: v.CooperationMode,
155 } 158 }
156 } 159 }
@@ -7,7 +7,8 @@ import ( @@ -7,7 +7,8 @@ import (
7 7
8 func TransformToCooperationApplicationDomainModelFromPgModels( 8 func TransformToCooperationApplicationDomainModelFromPgModels(
9 cooperationApplicationModel *models.CooperationApplication, 9 cooperationApplicationModel *models.CooperationApplication,
10 - cooperationProject *models.CooperationProject) (*domain.CooperationApplication, error) { 10 + cooperationProject *models.CooperationProject,
  11 + cooperationMode *models.CooperationMode) (*domain.CooperationApplication, error) {
11 return &domain.CooperationApplication{ 12 return &domain.CooperationApplication{
12 CooperationApplicationId: cooperationApplicationModel.CooperationApplicationId, 13 CooperationApplicationId: cooperationApplicationModel.CooperationApplicationId,
13 CooperationApplicationApplicant: cooperationApplicationModel.CooperationApplicationApplicant, 14 CooperationApplicationApplicant: cooperationApplicationModel.CooperationApplicationApplicant,
@@ -28,15 +29,29 @@ func TransformToCooperationApplicationDomainModelFromPgModels( @@ -28,15 +29,29 @@ func TransformToCooperationApplicationDomainModelFromPgModels(
28 CooperationProjectSponsor: cooperationProject.CooperationProjectSponsor, 29 CooperationProjectSponsor: cooperationProject.CooperationProjectSponsor,
29 Department: cooperationProject.Department, 30 Department: cooperationProject.Department,
30 CooperationProjectUndertakerTypes: cooperationProject.CooperationProjectUndertakerTypes, 31 CooperationProjectUndertakerTypes: cooperationProject.CooperationProjectUndertakerTypes,
31 - Org: cooperationProject.Org,  
32 - Attachment: cooperationProject.Attachment,  
33 - Company: cooperationProject.Company,  
34 - Operator: cooperationProject.Operator,  
35 - OperateTime: cooperationProject.OperateTime,  
36 - Status: cooperationProject.Status,  
37 - UpdatedAt: cooperationProject.UpdatedAt,  
38 - DeletedAt: cooperationProject.DeletedAt,  
39 - CreatedAt: cooperationProject.CreatedAt, 32 + CooperationMode: &domain.CooperationMode{
  33 + CooperationModeId: cooperationMode.CooperationModeId,
  34 + CooperationModeNumber: cooperationMode.CooperationModeNumber,
  35 + CooperationModeName: cooperationMode.CooperationModeName,
  36 + Status: cooperationMode.Status,
  37 + Org: cooperationMode.Org,
  38 + Company: cooperationMode.Company,
  39 + Remarks: cooperationMode.Remarks,
  40 + Operator: cooperationMode.Operator,
  41 + OperateTime: cooperationMode.OperateTime,
  42 + UpdatedAt: cooperationMode.UpdatedAt,
  43 + DeletedAt: cooperationMode.DeletedAt,
  44 + CreatedAt: cooperationMode.CreatedAt,
  45 + },
  46 + Org: cooperationProject.Org,
  47 + Attachment: cooperationProject.Attachment,
  48 + Company: cooperationProject.Company,
  49 + Operator: cooperationProject.Operator,
  50 + OperateTime: cooperationProject.OperateTime,
  51 + Status: cooperationProject.Status,
  52 + UpdatedAt: cooperationProject.UpdatedAt,
  53 + DeletedAt: cooperationProject.DeletedAt,
  54 + CreatedAt: cooperationProject.CreatedAt,
40 }, 55 },
41 Org: cooperationApplicationModel.Org, 56 Org: cooperationApplicationModel.Org,
42 IsCanceled: cooperationApplicationModel.IsCanceled, 57 IsCanceled: cooperationApplicationModel.IsCanceled,
@@ -202,7 +202,13 @@ func (repository *CooperationApplicationRepository) FindOne(queryOptions map[str @@ -202,7 +202,13 @@ func (repository *CooperationApplicationRepository) FindOne(queryOptions map[str
202 if err := cooperationProjectQuery.Where("cooperation_project_number = ?", cooperationApplicationModel.CooperationProjectNumber).First(); err != nil { 202 if err := cooperationProjectQuery.Where("cooperation_project_number = ?", cooperationApplicationModel.CooperationProjectNumber).First(); err != nil {
203 return nil, err 203 return nil, err
204 } 204 }
205 - return transform.TransformToCooperationApplicationDomainModelFromPgModels(cooperationApplicationModel, cooperationProjectModel) 205 + // 获取共创模式
  206 + cooperationModeModel := new(models.CooperationMode)
  207 + cooperationModeQuery := tx.Model(cooperationModeModel)
  208 + if err := cooperationModeQuery.Where("cooperation_mode_number = ?", cooperationProjectModel.CooperationModeNumber).First(); err != nil {
  209 + return nil, err
  210 + }
  211 + return transform.TransformToCooperationApplicationDomainModelFromPgModels(cooperationApplicationModel, cooperationProjectModel, cooperationModeModel)
206 } 212 }
207 } 213 }
208 214
@@ -255,7 +261,13 @@ func (repository *CooperationApplicationRepository) Find(queryOptions map[string @@ -255,7 +261,13 @@ func (repository *CooperationApplicationRepository) Find(queryOptions map[string
255 if err := cooperationProjectQuery.Where("cooperation_project_number = ?", cooperationApplicationModel.CooperationProjectNumber).First(); err != nil { 261 if err := cooperationProjectQuery.Where("cooperation_project_number = ?", cooperationApplicationModel.CooperationProjectNumber).First(); err != nil {
256 return 0, nil, err 262 return 0, nil, err
257 } 263 }
258 - if cooperationApplication, err := transform.TransformToCooperationApplicationDomainModelFromPgModels(cooperationApplicationModel, cooperationProjectModel); err != nil { 264 + // 获取共创模式
  265 + cooperationModeModel := new(models.CooperationMode)
  266 + cooperationModeQuery := tx.Model(cooperationModeModel)
  267 + if err := cooperationModeQuery.Where("cooperation_mode_number = ?", cooperationProjectModel.CooperationModeNumber).First(); err != nil {
  268 + return 0, nil, err
  269 + }
  270 + if cooperationApplication, err := transform.TransformToCooperationApplicationDomainModelFromPgModels(cooperationApplicationModel, cooperationProjectModel, cooperationModeModel); err != nil {
259 return 0, cooperationApplications, err 271 return 0, cooperationApplications, err
260 } else { 272 } else {
261 cooperationApplications = append(cooperationApplications, cooperationApplication) 273 cooperationApplications = append(cooperationApplications, cooperationApplication)