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

@@ -88,6 +88,8 @@ type CooperationProject struct {
 	CooperationProjectName string `json:"cooperationProjectName"`
 	CooperationProjectName string `json:"cooperationProjectName"`
 	// 图片附件
 	// 图片附件
 	Attachment []*domain.Attachment `json:"attachment"`
 	Attachment []*domain.Attachment `json:"attachment"`
+	//	共创模式
+	CooperationMode *domain.CooperationMode `json:"cooperationMode"`
 }
 }
 
 
 func (data *CooperationApplicationDto) LoadDto(a *domain.CooperationApplication) {
 func (data *CooperationApplicationDto) LoadDto(a *domain.CooperationApplication) {
@@ -152,5 +154,6 @@ func (data *CooperationApplicationDto) LoadCooperationProject(v *domain.Cooperat
 		CooperationProjectDescription: v.CooperationProjectDescription,
 		CooperationProjectDescription: v.CooperationProjectDescription,
 		CooperationProjectName:        v.CooperationProjectName,
 		CooperationProjectName:        v.CooperationProjectName,
 		Attachment:                    v.Attachment,
 		Attachment:                    v.Attachment,
+		CooperationMode:               v.CooperationMode,
 	}
 	}
 }
 }

@@ -7,7 +7,8 @@ import (
 
 
 func TransformToCooperationApplicationDomainModelFromPgModels(
 func TransformToCooperationApplicationDomainModelFromPgModels(
 	cooperationApplicationModel *models.CooperationApplication,
 	cooperationApplicationModel *models.CooperationApplication,
-	cooperationProject *models.CooperationProject) (*domain.CooperationApplication, error) {
+	cooperationProject *models.CooperationProject,
+	cooperationMode *models.CooperationMode) (*domain.CooperationApplication, error) {
 	return &domain.CooperationApplication{
 	return &domain.CooperationApplication{
 		CooperationApplicationId:                cooperationApplicationModel.CooperationApplicationId,
 		CooperationApplicationId:                cooperationApplicationModel.CooperationApplicationId,
 		CooperationApplicationApplicant:         cooperationApplicationModel.CooperationApplicationApplicant,
 		CooperationApplicationApplicant:         cooperationApplicationModel.CooperationApplicationApplicant,
@@ -28,6 +29,20 @@ func TransformToCooperationApplicationDomainModelFromPgModels(
 			CooperationProjectSponsor:         cooperationProject.CooperationProjectSponsor,
 			CooperationProjectSponsor:         cooperationProject.CooperationProjectSponsor,
 			Department:                        cooperationProject.Department,
 			Department:                        cooperationProject.Department,
 			CooperationProjectUndertakerTypes: cooperationProject.CooperationProjectUndertakerTypes,
 			CooperationProjectUndertakerTypes: cooperationProject.CooperationProjectUndertakerTypes,
+			CooperationMode: &domain.CooperationMode{
+				CooperationModeId:     cooperationMode.CooperationModeId,
+				CooperationModeNumber: cooperationMode.CooperationModeNumber,
+				CooperationModeName:   cooperationMode.CooperationModeName,
+				Status:                cooperationMode.Status,
+				Org:                   cooperationMode.Org,
+				Company:               cooperationMode.Company,
+				Remarks:               cooperationMode.Remarks,
+				Operator:              cooperationMode.Operator,
+				OperateTime:           cooperationMode.OperateTime,
+				UpdatedAt:             cooperationMode.UpdatedAt,
+				DeletedAt:             cooperationMode.DeletedAt,
+				CreatedAt:             cooperationMode.CreatedAt,
+			},
 			Org:         cooperationProject.Org,
 			Org:         cooperationProject.Org,
 			Attachment:  cooperationProject.Attachment,
 			Attachment:  cooperationProject.Attachment,
 			Company:     cooperationProject.Company,
 			Company:     cooperationProject.Company,

@@ -202,7 +202,13 @@ func (repository *CooperationApplicationRepository) FindOne(queryOptions map[str
 		if err := cooperationProjectQuery.Where("cooperation_project_number = ?", cooperationApplicationModel.CooperationProjectNumber).First(); err != nil {
 		if err := cooperationProjectQuery.Where("cooperation_project_number = ?", cooperationApplicationModel.CooperationProjectNumber).First(); err != nil {
 			return nil, err
 			return nil, err
 		}
 		}
-		return transform.TransformToCooperationApplicationDomainModelFromPgModels(cooperationApplicationModel, cooperationProjectModel)
+		// 获取共创模式
+		cooperationModeModel := new(models.CooperationMode)
+		cooperationModeQuery := tx.Model(cooperationModeModel)
+		if err := cooperationModeQuery.Where("cooperation_mode_number = ?", cooperationProjectModel.CooperationModeNumber).First(); err != nil {
+			return nil, err
+		}
+		return transform.TransformToCooperationApplicationDomainModelFromPgModels(cooperationApplicationModel, cooperationProjectModel, cooperationModeModel)
 	}
 	}
 }
 }
 
 
@@ -255,7 +261,13 @@ func (repository *CooperationApplicationRepository) Find(queryOptions map[string
 			if err := cooperationProjectQuery.Where("cooperation_project_number = ?", cooperationApplicationModel.CooperationProjectNumber).First(); err != nil {
 			if err := cooperationProjectQuery.Where("cooperation_project_number = ?", cooperationApplicationModel.CooperationProjectNumber).First(); err != nil {
 				return 0, nil, err
 				return 0, nil, err
 			}
 			}
-			if cooperationApplication, err := transform.TransformToCooperationApplicationDomainModelFromPgModels(cooperationApplicationModel, cooperationProjectModel); err != nil {
+			// 获取共创模式
+			cooperationModeModel := new(models.CooperationMode)
+			cooperationModeQuery := tx.Model(cooperationModeModel)
+			if err := cooperationModeQuery.Where("cooperation_mode_number = ?", cooperationProjectModel.CooperationModeNumber).First(); err != nil {
+				return 0, nil, err
+			}
+			if cooperationApplication, err := transform.TransformToCooperationApplicationDomainModelFromPgModels(cooperationApplicationModel, cooperationProjectModel, cooperationModeModel); err != nil {
 				return 0, cooperationApplications, err
 				return 0, cooperationApplications, err
 			} else {
 			} else {
 				cooperationApplications = append(cooperationApplications, cooperationApplication)
 				cooperationApplications = append(cooperationApplications, cooperationApplication)