正在显示
7 个修改的文件
包含
138 行增加
和
226 行删除
@@ -15,7 +15,7 @@ type UpdateCooperationProjectCommand struct { | @@ -15,7 +15,7 @@ type UpdateCooperationProjectCommand struct { | ||
15 | // 模式编码,唯一确定 | 15 | // 模式编码,唯一确定 |
16 | CooperationModeNumber string `json:"cooperationModeNumber" valid:"Required"` | 16 | CooperationModeNumber string `json:"cooperationModeNumber" valid:"Required"` |
17 | // 组织ID | 17 | // 组织ID |
18 | - OrgId int64 `json:"departmentId,string" valid:"Required"` | 18 | + OrgId int64 `json:"departmentId" valid:"Required"` |
19 | // 共创项目名称 | 19 | // 共创项目名称 |
20 | CooperationProjectName string `json:"cooperationProjectName" valid:"Required"` | 20 | CooperationProjectName string `json:"cooperationProjectName" valid:"Required"` |
21 | // 共创发起人id | 21 | // 共创发起人id |
@@ -101,25 +101,26 @@ type CooperationApplication struct { | @@ -101,25 +101,26 @@ type CooperationApplication struct { | ||
101 | } | 101 | } |
102 | 102 | ||
103 | func ToCooperationApplication(applicationParam *allied_creation_cooperation.CooperationApplication) *CooperationApplication { | 103 | func ToCooperationApplication(applicationParam *allied_creation_cooperation.CooperationApplication) *CooperationApplication { |
104 | - data := CooperationApplication{ | ||
105 | - CooperationApplicationAttachment: applicationParam.CooperationApplicationAttachment, //附件信息 | ||
106 | - CooperationApplicationDescription: applicationParam.CooperationApplicationDescription, | ||
107 | - CooperationApplicationId: applicationParam.CooperationApplicationID, | ||
108 | - CooperationApplicationStatus: applicationParam.CooperationApplicationStatus, //共创申请审核状态,1待审核,2已同意,3已拒绝 | ||
109 | - CooperationApplicationVerifyTime: int(applicationParam.CooperationApplicationVerifyTime.Unix()), //审核的时间 | ||
110 | - CooperationProjectId: applicationParam.CooperationProject.CooperationProjectID, | ||
111 | - CooperationProjectName: applicationParam.CooperationProject.CooperationProjectName, | ||
112 | - CooperationProjectNumber: applicationParam.CooperationProject.CooperationProjectNumber, | ||
113 | - CooperationApplicationVerifyDescription: applicationParam.CooperationApplicationVerifyDescription, | ||
114 | - } | ||
115 | - data.CooperationApplicationApplicant.UserId = applicationParam.CooperationApplicationApplicant.UserID | ||
116 | - data.CooperationApplicationApplicant.UserInfo.Phone = applicationParam.CooperationApplicationApplicant.UserInfo.UserPhone | ||
117 | - data.CooperationApplicationApplicant.UserInfo.UsersName = applicationParam.CooperationApplicationApplicant.UserInfo.UserName | ||
118 | - data.CooperationApplicationApplicant.UserInfo.UsersId = applicationParam.CooperationApplicationApplicant.UserID | ||
119 | - data.CooperationApplicationApplicant.Department.DepartmentId = applicationParam.CooperationApplicationApplicant.Department.DepartmentID | ||
120 | - data.CooperationApplicationApplicant.Department.DepartmentName = applicationParam.CooperationApplicationApplicant.Department.DepartmentName | ||
121 | - data.CooperationApplicationApplicant.Department.DepartmentNumber = applicationParam.CooperationApplicationApplicant.Department.DepartmentNumber | ||
122 | - data.Company.CompanyID = applicationParam.Company.CompanyID | ||
123 | - data.Company.CompanyName = applicationParam.Company.CompanyName | ||
124 | - return &data | 104 | + //data := CooperationApplication{ |
105 | + // CooperationApplicationAttachment: applicationParam.CooperationApplicationAttachment, //附件信息 | ||
106 | + // CooperationApplicationDescription: applicationParam.CooperationApplicationDescription, | ||
107 | + // CooperationApplicationId: applicationParam.CooperationApplicationID, | ||
108 | + // CooperationApplicationStatus: applicationParam.CooperationApplicationStatus, //共创申请审核状态,1待审核,2已同意,3已拒绝 | ||
109 | + // CooperationApplicationVerifyTime: int(applicationParam.CooperationApplicationVerifyTime.Unix()), //审核的时间 | ||
110 | + // CooperationProjectId: applicationParam.CooperationProject.CooperationProjectID, | ||
111 | + // CooperationProjectName: applicationParam.CooperationProject.CooperationProjectName, | ||
112 | + // CooperationProjectNumber: applicationParam.CooperationProject.CooperationProjectNumber, | ||
113 | + // CooperationApplicationVerifyDescription: applicationParam.CooperationApplicationVerifyDescription, | ||
114 | + //} | ||
115 | + //data.CooperationApplicationApplicant.UserId = applicationParam.CooperationApplicationApplicant.UserID | ||
116 | + //data.CooperationApplicationApplicant.UserInfo.Phone = applicationParam.CooperationApplicationApplicant.UserInfo.UserPhone | ||
117 | + //data.CooperationApplicationApplicant.UserInfo.UsersName = applicationParam.CooperationApplicationApplicant.UserInfo.UserName | ||
118 | + //data.CooperationApplicationApplicant.UserInfo.UsersId = applicationParam.CooperationApplicationApplicant.UserID | ||
119 | + //data.CooperationApplicationApplicant.Department.DepartmentId = applicationParam.CooperationApplicationApplicant.Department.DepartmentID | ||
120 | + //data.CooperationApplicationApplicant.Department.DepartmentName = applicationParam.CooperationApplicationApplicant.Department.DepartmentName | ||
121 | + //data.CooperationApplicationApplicant.Department.DepartmentNumber = applicationParam.CooperationApplicationApplicant.Department.DepartmentNumber | ||
122 | + //data.Company.CompanyID = applicationParam.Company.CompanyID | ||
123 | + //data.Company.CompanyName = applicationParam.Company.CompanyName | ||
124 | + //return &data | ||
125 | + return nil | ||
125 | } | 126 | } |
@@ -5,7 +5,6 @@ import ( | @@ -5,7 +5,6 @@ import ( | ||
5 | 5 | ||
6 | "github.com/linmadan/egglib-go/core/application" | 6 | "github.com/linmadan/egglib-go/core/application" |
7 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/mobile/cooperation/command" | 7 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/mobile/cooperation/command" |
8 | - "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/mobile/cooperation/dto" | ||
9 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_cooperation" | 8 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_cooperation" |
10 | ) | 9 | ) |
11 | 10 | ||
@@ -25,17 +24,17 @@ func (srv CooperationApplicationsService) GetCooperationApplications(application | @@ -25,17 +24,17 @@ func (srv CooperationApplicationsService) GetCooperationApplications(application | ||
25 | if err != nil { | 24 | if err != nil { |
26 | return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) | 25 | return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) |
27 | } | 26 | } |
28 | - resultProject, err := creationCooperationGateway.CooperationProjectGet(allied_creation_cooperation.ReqCooperationProjectGet{ | ||
29 | - CooperationProjectId: resultApplication.CooperationProject.CooperationProjectID, | ||
30 | - }) | ||
31 | - if err != nil { | ||
32 | - return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) | ||
33 | - } | ||
34 | - data := map[string]interface{}{ | ||
35 | - "cooperationApplication": dto.ToCooperationApplication(&resultApplication.CooperationApplication), | ||
36 | - "cooperationProject": dto.ToCooperationProjectInfo(&resultProject.CooperationProject), | ||
37 | - } | ||
38 | - return data, nil | 27 | + //resultProject, err := creationCooperationGateway.CooperationProjectGet(allied_creation_cooperation.ReqCooperationProjectGet{ |
28 | + // CooperationProjectId: resultApplication.CooperationProject.CooperationProjectID, | ||
29 | + //}) | ||
30 | + //if err != nil { | ||
31 | + // return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) | ||
32 | + //} | ||
33 | + //data := map[string]interface{}{ | ||
34 | + // "cooperationApplication": dto.ToCooperationApplication(&resultApplication.CooperationApplication), | ||
35 | + // "cooperationProject": dto.ToCooperationProjectInfo(&resultProject.CooperationProject), | ||
36 | + //} | ||
37 | + return resultApplication, nil | ||
39 | } | 38 | } |
40 | 39 | ||
41 | // AuditCooperationApplications 企业审核共创申请 | 40 | // AuditCooperationApplications 企业审核共创申请 |
@@ -109,17 +108,17 @@ func (srv CooperationApplicationsService) PersonGetCooperationApplications(appli | @@ -109,17 +108,17 @@ func (srv CooperationApplicationsService) PersonGetCooperationApplications(appli | ||
109 | if err != nil { | 108 | if err != nil { |
110 | return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) | 109 | return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) |
111 | } | 110 | } |
112 | - resultProject, err := creationCooperationGateway.CooperationProjectGet(allied_creation_cooperation.ReqCooperationProjectGet{ | ||
113 | - CooperationProjectId: resultApplication.CooperationProject.CooperationProjectID, | ||
114 | - }) | ||
115 | - if err != nil { | ||
116 | - return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) | ||
117 | - } | ||
118 | - data := map[string]interface{}{ | ||
119 | - "cooperationApplication": dto.ToCooperationApplication(&resultApplication.CooperationApplication), | ||
120 | - "cooperationProject": dto.ToCooperationProjectInfo(&resultProject.CooperationProject), | ||
121 | - } | ||
122 | - return data, nil | 111 | + //resultProject, err := creationCooperationGateway.CooperationProjectGet(allied_creation_cooperation.ReqCooperationProjectGet{ |
112 | + // CooperationProjectId: resultApplication.CooperationProject.CooperationProjectID, | ||
113 | + //}) | ||
114 | + //if err != nil { | ||
115 | + // return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) | ||
116 | + //} | ||
117 | + //data := map[string]interface{}{ | ||
118 | + // "cooperationApplication": dto.ToCooperationApplication(&resultApplication.CooperationApplication), | ||
119 | + // "cooperationProject": dto.ToCooperationProjectInfo(&resultProject.CooperationProject), | ||
120 | + //} | ||
121 | + return resultApplication, nil | ||
123 | } | 122 | } |
124 | 123 | ||
125 | // PersonCancelCooperationApplications 共创用户取消共创申请 | 124 | // PersonCancelCooperationApplications 共创用户取消共创申请 |
@@ -34,23 +34,24 @@ type CooperationApplicationItem struct { | @@ -34,23 +34,24 @@ type CooperationApplicationItem struct { | ||
34 | } | 34 | } |
35 | 35 | ||
36 | func ToCooperationApplicationItem(param *allied_creation_cooperation.CooperationApplication) *CooperationApplicationItem { | 36 | func ToCooperationApplicationItem(param *allied_creation_cooperation.CooperationApplication) *CooperationApplicationItem { |
37 | - data := CooperationApplicationItem{ | ||
38 | - CooperationApplicationAttachment: param.CooperationApplicationAttachment, | ||
39 | - CooperationApplicationDescription: param.CooperationApplicationDescription, | ||
40 | - CooperationApplicationID: param.CooperationApplicationID, | ||
41 | - IsCanceled: param.IsCanceled, | ||
42 | - CooperationApplicationVerifyDescription: param.CooperationApplicationVerifyDescription, | ||
43 | - CooperationApplicationStatus: param.CooperationApplicationStatus, | ||
44 | - Org: param.Org, | ||
45 | - } | ||
46 | - data.CooperationApplicationApplicant.UserName = param.CooperationApplicationApplicant.UserInfo.UserName | ||
47 | - data.CooperationApplicationApplicant.Phone = param.CooperationApplicationApplicant.UserInfo.UserPhone | ||
48 | - data.CooperationApplicationApplicant.UserCode = param.CooperationApplicationApplicant.UserInfo.UserPhone | ||
49 | - data.CooperationApplicationApplicant.DepartmentName = param.CooperationApplicationApplicant.Department.DepartmentName | ||
50 | - data.CooperationProject.CooperationProjectID = param.CooperationProject.CooperationProjectID | ||
51 | - data.CooperationProject.CooperationProjectName = param.CooperationProject.CooperationProjectName | ||
52 | - data.CooperationProject.CooperationProjectNumber = param.CooperationProject.CooperationProjectNumber | ||
53 | - return &data | 37 | + //data := CooperationApplicationItem{ |
38 | + // CooperationApplicationAttachment: param.CooperationApplicationAttachment, | ||
39 | + // CooperationApplicationDescription: param.CooperationApplicationDescription, | ||
40 | + // CooperationApplicationID: param.CooperationApplicationID, | ||
41 | + // IsCanceled: param.IsCanceled, | ||
42 | + // CooperationApplicationVerifyDescription: param.CooperationApplicationVerifyDescription, | ||
43 | + // CooperationApplicationStatus: param.CooperationApplicationStatus, | ||
44 | + // Org: param.Org, | ||
45 | + //} | ||
46 | + //data.CooperationApplicationApplicant.UserName = param.CooperationApplicationApplicant.UserInfo.UserName | ||
47 | + //data.CooperationApplicationApplicant.Phone = param.CooperationApplicationApplicant.UserInfo.UserPhone | ||
48 | + //data.CooperationApplicationApplicant.UserCode = param.CooperationApplicationApplicant.UserInfo.UserPhone | ||
49 | + //data.CooperationApplicationApplicant.DepartmentName = param.CooperationApplicationApplicant.Department.DepartmentName | ||
50 | + //data.CooperationProject.CooperationProjectID = param.CooperationProject.CooperationProjectID | ||
51 | + //data.CooperationProject.CooperationProjectName = param.CooperationProject.CooperationProjectName | ||
52 | + //data.CooperationProject.CooperationProjectNumber = param.CooperationProject.CooperationProjectNumber | ||
53 | + //return &data | ||
54 | + return nil | ||
54 | } | 55 | } |
55 | 56 | ||
56 | type CooperationApplicationInfo struct { | 57 | type CooperationApplicationInfo struct { |
@@ -85,24 +86,25 @@ type CooperationApplicationInfo struct { | @@ -85,24 +86,25 @@ type CooperationApplicationInfo struct { | ||
85 | 86 | ||
86 | func ToCooperationApplicationInfo(applicationParam *allied_creation_cooperation.CooperationApplication, | 87 | func ToCooperationApplicationInfo(applicationParam *allied_creation_cooperation.CooperationApplication, |
87 | objectParam *allied_creation_cooperation.CooperationProject) *CooperationApplicationInfo { | 88 | objectParam *allied_creation_cooperation.CooperationProject) *CooperationApplicationInfo { |
88 | - data := CooperationApplicationInfo{ | ||
89 | - CooperationApplicationAttachment: applicationParam.CooperationApplicationAttachment, | ||
90 | - CooperationApplicationDescription: applicationParam.CooperationApplicationDescription, | ||
91 | - CooperationApplicationID: applicationParam.CooperationApplicationID, | ||
92 | - IsCanceled: applicationParam.IsCanceled, | ||
93 | - CooperationApplicationVerifyDescription: applicationParam.CooperationApplicationVerifyDescription, | ||
94 | - CooperationApplicationStatus: applicationParam.CooperationApplicationStatus, | ||
95 | - Org: applicationParam.Org, | ||
96 | - } | ||
97 | - data.CooperationProject.CooperationProjectID = objectParam.CooperationProjectId | ||
98 | - data.CooperationProject.CooperationProjectName = objectParam.CooperationProjectName | ||
99 | - data.CooperationProject.CooperationProjectNumber = objectParam.CooperationProjectNumber | ||
100 | - data.CooperationProject.CooperationMode.CooperationModeId = objectParam.CooperationMode.CooperationModeId | ||
101 | - data.CooperationProject.CooperationMode.CooperationModeName = objectParam.CooperationMode.CooperationModeName | ||
102 | - data.CooperationProject.CooperationMode.CooperationModeNumber = objectParam.CooperationMode.CooperationModeNumber | ||
103 | - data.CooperationApplicationApplicant.UserName = applicationParam.CooperationApplicationApplicant.UserInfo.UserName | ||
104 | - data.CooperationApplicationApplicant.Phone = applicationParam.CooperationApplicationApplicant.UserInfo.UserPhone | ||
105 | - data.CooperationApplicationApplicant.UserCode = applicationParam.CooperationApplicationApplicant.UserInfo.UserPhone | ||
106 | - data.CooperationApplicationApplicant.DepartmentName = applicationParam.CooperationApplicationApplicant.Department.DepartmentName | ||
107 | - return &data | 89 | + //data := CooperationApplicationInfo{ |
90 | + // CooperationApplicationAttachment: applicationParam.CooperationApplicationAttachment, | ||
91 | + // CooperationApplicationDescription: applicationParam.CooperationApplicationDescription, | ||
92 | + // CooperationApplicationID: applicationParam.CooperationApplicationID, | ||
93 | + // IsCanceled: applicationParam.IsCanceled, | ||
94 | + // CooperationApplicationVerifyDescription: applicationParam.CooperationApplicationVerifyDescription, | ||
95 | + // CooperationApplicationStatus: applicationParam.CooperationApplicationStatus, | ||
96 | + // Org: applicationParam.Org, | ||
97 | + //} | ||
98 | + //data.CooperationProject.CooperationProjectID = objectParam.CooperationProjectId | ||
99 | + //data.CooperationProject.CooperationProjectName = objectParam.CooperationProjectName | ||
100 | + //data.CooperationProject.CooperationProjectNumber = objectParam.CooperationProjectNumber | ||
101 | + //data.CooperationProject.CooperationMode.CooperationModeId = objectParam.CooperationMode.CooperationModeId | ||
102 | + //data.CooperationProject.CooperationMode.CooperationModeName = objectParam.CooperationMode.CooperationModeName | ||
103 | + //data.CooperationProject.CooperationMode.CooperationModeNumber = objectParam.CooperationMode.CooperationModeNumber | ||
104 | + //data.CooperationApplicationApplicant.UserName = applicationParam.CooperationApplicationApplicant.UserInfo.UserName | ||
105 | + //data.CooperationApplicationApplicant.Phone = applicationParam.CooperationApplicationApplicant.UserInfo.UserPhone | ||
106 | + //data.CooperationApplicationApplicant.UserCode = applicationParam.CooperationApplicationApplicant.UserInfo.UserPhone | ||
107 | + //data.CooperationApplicationApplicant.DepartmentName = applicationParam.CooperationApplicationApplicant.Department.DepartmentName | ||
108 | + //return &data | ||
109 | + return nil | ||
108 | } | 110 | } |
@@ -71,12 +71,12 @@ func (cooperationApplicationService *CooperationApplicationService) ListCooperat | @@ -71,12 +71,12 @@ func (cooperationApplicationService *CooperationApplicationService) ListCooperat | ||
71 | if err != nil { | 71 | if err != nil { |
72 | return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | 72 | return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) |
73 | } | 73 | } |
74 | - var dataList []dto.CooperationApplicationItem | ||
75 | - for i := range result.Grid.List { | ||
76 | - item := dto.ToCooperationApplicationItem(&result.Grid.List[i]) | ||
77 | - dataList = append(dataList, *item) | ||
78 | - } | ||
79 | - return int64(result.Grid.Total), dataList, nil | 74 | + //var dataList []dto.CooperationApplicationItem |
75 | + //for i := range result.Grid.List { | ||
76 | + // item := dto.ToCooperationApplicationItem(&result.Grid.List[i]) | ||
77 | + // dataList = append(dataList, *item) | ||
78 | + //} | ||
79 | + return int64(result.Grid.Total), result.Grid, nil | ||
80 | } | 80 | } |
81 | 81 | ||
82 | func NewCooperationApplicationService(options map[string]interface{}) *CooperationApplicationService { | 82 | func NewCooperationApplicationService(options map[string]interface{}) *CooperationApplicationService { |
@@ -91,24 +91,25 @@ type CooperationApplicationItem struct { | @@ -91,24 +91,25 @@ type CooperationApplicationItem struct { | ||
91 | } | 91 | } |
92 | 92 | ||
93 | func ToCooperationApplicationItem(param *allied_creation_cooperation.CooperationApplication) *CooperationApplicationItem { | 93 | func ToCooperationApplicationItem(param *allied_creation_cooperation.CooperationApplication) *CooperationApplicationItem { |
94 | - data := CooperationApplicationItem{ | ||
95 | - CooperationApplicationDescription: param.CooperationApplicationDescription, | ||
96 | - CooperationApplicationID: param.CooperationApplicationID, | ||
97 | - CooperationApplicationStatus: param.CooperationApplicationStatus, | ||
98 | - CooperationApplyTime: int(param.CooperationApplyTime.Unix()), | ||
99 | - CooperationApplicationAttachment: param.CooperationApplicationAttachment, | ||
100 | - } | ||
101 | - data.CooperationApplicationApplicant.Company.CompanyID = param.CooperationApplicationApplicant.Company.CompanyID | ||
102 | - data.CooperationApplicationApplicant.Company.CompanyName = param.CooperationApplicationApplicant.Company.CompanyName | ||
103 | - data.CooperationApplicationApplicant.Department.DepartmentId = param.CooperationApplicationApplicant.Department.DepartmentID | ||
104 | - data.CooperationApplicationApplicant.Department.DepartmentName = param.CooperationApplicationApplicant.Department.DepartmentName | ||
105 | - data.CooperationApplicationApplicant.Department.DepartmentNumber = param.CooperationApplicationApplicant.Department.DepartmentNumber | ||
106 | - data.CooperationApplicationApplicant.Org.OrgID = param.CooperationApplicationApplicant.Org.OrgID | ||
107 | - data.CooperationApplicationApplicant.Org.OrgName = param.CooperationApplicationApplicant.Org.OrgName | ||
108 | - data.CooperationApplicationApplicant.UserID = param.CooperationApplicationApplicant.UserID | ||
109 | - data.CooperationApplicationApplicant.UserType = param.CooperationApplicationApplicant.UserType | ||
110 | - data.CooperationApplicationApplicant.UserInfo.Phone = param.CooperationApplicationApplicant.UserInfo.UserPhone | ||
111 | - data.CooperationApplicationApplicant.UserInfo.UsersName = param.CooperationApplicationApplicant.UserInfo.UserName | ||
112 | - data.CooperationApplicationApplicant.UserInfo.UsersId = param.CooperationApplicationApplicant.UserID | ||
113 | - return &data | 94 | + //data := CooperationApplicationItem{ |
95 | + // CooperationApplicationDescription: param.CooperationApplicationDescription, | ||
96 | + // CooperationApplicationID: param.CooperationApplicationID, | ||
97 | + // CooperationApplicationStatus: param.CooperationApplicationStatus, | ||
98 | + // CooperationApplyTime: int(param.CooperationApplyTime.Unix()), | ||
99 | + // CooperationApplicationAttachment: param.CooperationApplicationAttachment, | ||
100 | + //} | ||
101 | + //data.CooperationApplicationApplicant.Company.CompanyID = param.CooperationApplicationApplicant.Company.CompanyID | ||
102 | + //data.CooperationApplicationApplicant.Company.CompanyName = param.CooperationApplicationApplicant.Company.CompanyName | ||
103 | + //data.CooperationApplicationApplicant.Department.DepartmentId = param.CooperationApplicationApplicant.Department.DepartmentID | ||
104 | + //data.CooperationApplicationApplicant.Department.DepartmentName = param.CooperationApplicationApplicant.Department.DepartmentName | ||
105 | + //data.CooperationApplicationApplicant.Department.DepartmentNumber = param.CooperationApplicationApplicant.Department.DepartmentNumber | ||
106 | + //data.CooperationApplicationApplicant.Org.OrgID = param.CooperationApplicationApplicant.Org.OrgID | ||
107 | + //data.CooperationApplicationApplicant.Org.OrgName = param.CooperationApplicationApplicant.Org.OrgName | ||
108 | + //data.CooperationApplicationApplicant.UserID = param.CooperationApplicationApplicant.UserID | ||
109 | + //data.CooperationApplicationApplicant.UserType = param.CooperationApplicationApplicant.UserType | ||
110 | + //data.CooperationApplicationApplicant.UserInfo.Phone = param.CooperationApplicationApplicant.UserInfo.UserPhone | ||
111 | + //data.CooperationApplicationApplicant.UserInfo.UsersName = param.CooperationApplicationApplicant.UserInfo.UserName | ||
112 | + //data.CooperationApplicationApplicant.UserInfo.UsersId = param.CooperationApplicationApplicant.UserID | ||
113 | + //return &data | ||
114 | + return nil | ||
114 | } | 115 | } |
1 | package allied_creation_cooperation | 1 | package allied_creation_cooperation |
2 | 2 | ||
3 | import ( | 3 | import ( |
4 | - "time" | ||
5 | - | ||
6 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain" | 4 | "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain" |
7 | ) | 5 | ) |
8 | 6 | ||
9 | //共创申请实体 | 7 | //共创申请实体 |
10 | type CooperationApplication struct { | 8 | type CooperationApplication struct { |
11 | - Company struct { | ||
12 | - CompanyID int `json:"companyId"` | ||
13 | - CompanyLogo string `json:"companyLogo"` | ||
14 | - CompanyName string `json:"companyName"` | ||
15 | - } `json:"company"` | 9 | + CooperationApplicationID string `json:"cooperationApplicationId"` |
16 | CooperationApplicationApplicant struct { | 10 | CooperationApplicationApplicant struct { |
17 | - Company struct { | ||
18 | - CompanyID int `json:"companyId"` | ||
19 | - CompanyLogo string `json:"companyLogo"` | ||
20 | - CompanyName string `json:"companyName"` | ||
21 | - } `json:"company"` | ||
22 | - Department struct { | ||
23 | - DepartmentID int `json:"departmentId"` | ||
24 | - DepartmentName string `json:"departmentName"` | ||
25 | - DepartmentNumber string `json:"departmentNumber"` | ||
26 | - } `json:"department"` | ||
27 | - Org struct { | ||
28 | - OrgID int `json:"orgId"` | ||
29 | - OrgName string `json:"orgName"` | ||
30 | - } `json:"org"` | ||
31 | - UserBaseID int `json:"userBaseId"` | ||
32 | - UserID int `json:"userId"` | ||
33 | - UserInfo struct { | ||
34 | - UserAccount string `json:"userAccount"` | 11 | + UserID int `json:"userId"` |
12 | + UserInfo struct { | ||
35 | UserAvatar string `json:"userAvatar"` | 13 | UserAvatar string `json:"userAvatar"` |
36 | UserEmail string `json:"userEmail"` | 14 | UserEmail string `json:"userEmail"` |
37 | UserName string `json:"userName"` | 15 | UserName string `json:"userName"` |
38 | UserPhone string `json:"userPhone"` | 16 | UserPhone string `json:"userPhone"` |
17 | + UserAccount string `json:"userAccount"` | ||
39 | } `json:"userInfo"` | 18 | } `json:"userInfo"` |
40 | - UserType int `json:"userType"` | 19 | + Department interface{} `json:"department"` |
41 | } `json:"cooperationApplicationApplicant"` | 20 | } `json:"cooperationApplicationApplicant"` |
42 | - CooperationApplicationAttachment []domain.Attachment `json:"cooperationApplicationAttachment"` | ||
43 | - CooperationApplicationDescription string `json:"cooperationApplicationDescription"` | ||
44 | - CooperationApplicationID int `json:"cooperationApplicationId"` | ||
45 | - CooperationApplicationStatus int `json:"cooperationApplicationStatus"` //共创申请审核状态,1待审核,2已同意,3已拒绝 | 21 | + CooperationApplicationAttachment []struct { |
22 | + FileType string `json:"fileType"` | ||
23 | + Name string `json:"name"` | ||
24 | + URL string `json:"url"` | ||
25 | + FileSize string `json:"fileSize"` | ||
26 | + } `json:"cooperationApplicationAttachment"` | ||
27 | + CooperationApplicationDescription string `json:"cooperationApplicationDescription"` | ||
28 | + CooperationApplicationStatus int `json:"cooperationApplicationStatus"` | ||
46 | CooperationApplicationVerifier struct { | 29 | CooperationApplicationVerifier struct { |
47 | - Company struct { | ||
48 | - CompanyID int `json:"companyId"` | ||
49 | - CompanyLogo string `json:"companyLogo"` | ||
50 | - CompanyName string `json:"companyName"` | ||
51 | - } `json:"company"` | ||
52 | - Department struct { | ||
53 | - DepartmentID int `json:"departmentId"` | ||
54 | - DepartmentName string `json:"departmentName"` | ||
55 | - DepartmentNumber string `json:"departmentNumber"` | ||
56 | - IsOrganization bool `json:"isOrganization"` | ||
57 | - } `json:"department"` | ||
58 | - Org struct { | ||
59 | - Company struct { | ||
60 | - CompanyID int `json:"companyId"` | ||
61 | - CompanyLogo string `json:"companyLogo"` | ||
62 | - CompanyName string `json:"companyName"` | ||
63 | - } `json:"company"` | ||
64 | - OrgID int `json:"orgId"` | ||
65 | - OrgName string `json:"orgName"` | ||
66 | - } `json:"org"` | ||
67 | - UserBaseID int `json:"userBaseId"` | ||
68 | - UserID int `json:"userId"` | ||
69 | - UserInfo struct { | ||
70 | - UserAccount string `json:"userAccount"` | ||
71 | - UserAvatar string `json:"userAvatar"` | ||
72 | - UserEmail string `json:"userEmail"` | ||
73 | - UserName string `json:"userName"` | ||
74 | - UserPhone string `json:"userPhone"` | ||
75 | - } `json:"userInfo"` | ||
76 | - UserType int `json:"userType"` | 30 | + UserID int `json:"userId"` |
31 | + Department interface{} `json:"department"` | ||
77 | } `json:"cooperationApplicationVerifier"` | 32 | } `json:"cooperationApplicationVerifier"` |
78 | - CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription"` | ||
79 | - CooperationApplicationVerifyTime time.Time `json:"cooperationApplicationVerifyTime"` | ||
80 | - CooperationApplyTime time.Time `json:"cooperationApplyTime"` | 33 | + CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription"` |
34 | + CooperationApplicationVerifyTime int64 `json:"cooperationApplicationVerifyTime"` | ||
35 | + CooperationApplyTime int64 `json:"cooperationApplyTime"` | ||
81 | CooperationProject struct { | 36 | CooperationProject struct { |
82 | - Company struct { | ||
83 | - CompanyID int `json:"companyId"` | ||
84 | - CompanyLogo string `json:"companyLogo"` | ||
85 | - CompanyName string `json:"companyName"` | ||
86 | - } `json:"company"` | ||
87 | - CooperationProjectDescription string `json:"cooperationProjectDescription"` | ||
88 | CooperationProjectID int `json:"cooperationProjectId"` | 37 | CooperationProjectID int `json:"cooperationProjectId"` |
89 | - CooperationProjectName string `json:"cooperationProjectName"` | ||
90 | CooperationProjectNumber string `json:"cooperationProjectNumber"` | 38 | CooperationProjectNumber string `json:"cooperationProjectNumber"` |
91 | - CooperationProjectPublishTime string `json:"cooperationProjectPublishTime"` | ||
92 | - CooperationProjectSponsor struct { | ||
93 | - Company struct { | ||
94 | - CompanyID int `json:"companyId"` | ||
95 | - CompanyLogo string `json:"companyLogo"` | ||
96 | - CompanyName string `json:"companyName"` | ||
97 | - } `json:"company"` | ||
98 | - Department struct { | ||
99 | - DepartmentID int `json:"departmentId"` | ||
100 | - DepartmentName string `json:"departmentName"` | ||
101 | - DepartmentNumber string `json:"departmentNumber"` | ||
102 | - IsOrganization bool `json:"isOrganization"` | ||
103 | - } `json:"department"` | ||
104 | - Org struct { | ||
105 | - Company struct { | ||
106 | - CompanyID int `json:"companyId"` | ||
107 | - CompanyLogo string `json:"companyLogo"` | ||
108 | - CompanyName string `json:"companyName"` | ||
109 | - } `json:"company"` | ||
110 | - OrgID int `json:"orgId"` | ||
111 | - OrgName string `json:"orgName"` | ||
112 | - } `json:"org"` | ||
113 | - Status int `json:"status"` | ||
114 | - UserBaseID int `json:"userBaseId"` | ||
115 | - UserID int `json:"userId"` | ||
116 | - UserInfo struct { | ||
117 | - UserAccount string `json:"userAccount"` | ||
118 | - UserAvatar string `json:"userAvatar"` | ||
119 | - UserEmail string `json:"userEmail"` | ||
120 | - UserName string `json:"userName"` | ||
121 | - UserPhone string `json:"userPhone"` | ||
122 | - } `json:"userInfo"` | ||
123 | - UserType int `json:"userType"` | ||
124 | - } `json:"cooperationProjectSponsor"` | ||
125 | - CooperationProjectUndertakerType []int `json:"cooperationProjectUndertakerType"` | ||
126 | - CreatedAt string `json:"createdAt"` | ||
127 | - DeletedAt string `json:"deletedAt"` | ||
128 | - OperateTime string `json:"operateTime"` | ||
129 | - Org struct { | ||
130 | - OrgID int `json:"orgId"` | ||
131 | - OrgName string `json:"orgName"` | ||
132 | - } `json:"org"` | ||
133 | - Status int `json:"status"` | ||
134 | - UpdatedAt string `json:"updatedAt"` | 39 | + CooperationProjectDescription string `json:"cooperationProjectDescription"` |
40 | + CooperationProjectName string `json:"cooperationProjectName"` | ||
135 | } `json:"cooperationProject"` | 41 | } `json:"cooperationProject"` |
136 | - CreatedAt string `json:"createdAt"` | ||
137 | - Org struct { | 42 | + Org struct { |
138 | OrgID int `json:"orgId"` | 43 | OrgID int `json:"orgId"` |
139 | OrgName string `json:"orgName"` | 44 | OrgName string `json:"orgName"` |
140 | } `json:"org"` | 45 | } `json:"org"` |
141 | - IsCanceled bool `json:"isCanceled"` | ||
142 | - UpdatedAt string `json:"updatedAt"` | 46 | + IsCanceled bool `json:"isCanceled"` |
47 | + Company struct { | ||
48 | + CompanyID string `json:"companyId"` | ||
49 | + CompanyLogo string `json:"companyLogo"` | ||
50 | + CompanyName string `json:"companyName"` | ||
51 | + } `json:"company"` | ||
143 | } | 52 | } |
144 | 53 | ||
145 | //更新共创申请 | 54 | //更新共创申请 |
-
请 注册 或 登录 后发表评论