allied-creation / allied-creation-gateway · 提交

转到一个项目

作者 tangxuhui
提交 70eb240a12bfb4dc949ea1e49a60c1b8793622a0 1 个父辈 6c5fbebe

更数据结构适配

内嵌 并排对比
正在显示 2 个修改的文件 包含 11 行增加 和 10 行删除
@@ -9,9 +9,9 @@ import ( @@ -9,9 +9,9 @@ import (
9 9
10 type CooperationApplicationItem struct { 10 type CooperationApplicationItem struct {
11 CooperationProject struct { 11 CooperationProject struct {
12 - CooperationProjectID int `json:"cooperationProjectId"` //共创项目  
13 - CooperationProjectName string `json:"cooperationProjectName"` //共创名称  
14 - CooperationProjectNumber string `json:"cooperationProjectNumber"` //共创编号 12 + CooperationProjectID int `json:"cooperationProjectId,string"` //共创项目
  13 + CooperationProjectName string `json:"cooperationProjectName"` //共创名称
  14 + CooperationProjectNumber string `json:"cooperationProjectNumber"` //共创编号
15 } `json:"cooperationProject"` 15 } `json:"cooperationProject"`
16 CooperationApplicationApplicant struct { 16 CooperationApplicationApplicant struct {
17 UserName string `json:"userName"` //申请人名字 17 UserName string `json:"userName"` //申请人名字
@@ -21,7 +21,7 @@ type CooperationApplicationItem struct { @@ -21,7 +21,7 @@ type CooperationApplicationItem struct {
21 } `json:"cooperationApplicationApplicant"` 21 } `json:"cooperationApplicationApplicant"`
22 CooperationApplicationAttachment []domain.Attachment `json:"cooperationApplicationAttachment"` //附件 22 CooperationApplicationAttachment []domain.Attachment `json:"cooperationApplicationAttachment"` //附件
23 CooperationApplicationDescription string `json:"cooperationApplicationDescription"` //描述 23 CooperationApplicationDescription string `json:"cooperationApplicationDescription"` //描述
24 - CooperationApplicationID int `json:"cooperationApplicationId"` //id 24 + CooperationApplicationID int `json:"cooperationApplicationId,string"` //id
25 IsCanceled bool `json:"isCanceled"` //是否取消 25 IsCanceled bool `json:"isCanceled"` //是否取消
26 CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription"` //审核描述 26 CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription"` //审核描述
27 CooperationApplicationVerifyTime time.Time `json:"cooperationApplicationVerifyTime"` //审核时间 27 CooperationApplicationVerifyTime time.Time `json:"cooperationApplicationVerifyTime"` //审核时间
@@ -54,9 +54,9 @@ func ToCooperationApplicationItem(param *allied_creation_cooperation.Cooperation @@ -54,9 +54,9 @@ func ToCooperationApplicationItem(param *allied_creation_cooperation.Cooperation
54 54
55 type CooperationApplicationInfo struct { 55 type CooperationApplicationInfo struct {
56 CooperationProject struct { 56 CooperationProject struct {
57 - CooperationProjectID int `json:"cooperationProjectId"` //共创项目  
58 - CooperationProjectName string `json:"cooperationProjectName"` //共创名称  
59 - CooperationProjectNumber string `json:"cooperationProjectNumber"` //共创编号 57 + CooperationProjectID int `json:"cooperationProjectId,string"` //共创项目
  58 + CooperationProjectName string `json:"cooperationProjectName"` //共创名称
  59 + CooperationProjectNumber string `json:"cooperationProjectNumber"` //共创编号
60 CooperationMode struct { 60 CooperationMode struct {
61 CooperationModeId int `json:"cooperationModeId,string"` 61 CooperationModeId int `json:"cooperationModeId,string"`
62 CooperationModeName string `json:"cooperationModeName"` 62 CooperationModeName string `json:"cooperationModeName"`
@@ -71,10 +71,10 @@ type CooperationApplicationInfo struct { @@ -71,10 +71,10 @@ type CooperationApplicationInfo struct {
71 } `json:"cooperationApplicationApplicant"` 71 } `json:"cooperationApplicationApplicant"`
72 CooperationApplicationAttachment []domain.Attachment `json:"cooperationApplicationAttachment"` //附件 72 CooperationApplicationAttachment []domain.Attachment `json:"cooperationApplicationAttachment"` //附件
73 CooperationApplicationDescription string `json:"cooperationApplicationDescription"` //描述 73 CooperationApplicationDescription string `json:"cooperationApplicationDescription"` //描述
74 - CooperationApplicationID int `json:"cooperationApplicationId"` //id 74 + CooperationApplicationID int `json:"cooperationApplicationId,string"` //id
75 IsCanceled bool `json:"isCanceled"` //是否取消 75 IsCanceled bool `json:"isCanceled"` //是否取消
76 CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription"` //审核描述 76 CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription"` //审核描述
77 - CooperationApplicationVerifyTime time.Time `json:"cooperationApplicationVerifyTime"` //审核时间 77 + CooperationApplicationVerifyTime int64 `json:"cooperationApplicationVerifyTime"` //审核时间
78 CooperationApplicationStatus int `json:"cooperationApplicationStatus"` //申请状态 78 CooperationApplicationStatus int `json:"cooperationApplicationStatus"` //申请状态
79 Org struct { 79 Org struct {
80 OrgID int `json:"orgId"` 80 OrgID int `json:"orgId"`
@@ -91,6 +91,7 @@ func ToCooperationApplicationInfo(applicationParam *allied_creation_cooperation. @@ -91,6 +91,7 @@ func ToCooperationApplicationInfo(applicationParam *allied_creation_cooperation.
91 IsCanceled: applicationParam.IsCanceled, 91 IsCanceled: applicationParam.IsCanceled,
92 CooperationApplicationVerifyDescription: applicationParam.CooperationApplicationVerifyDescription, 92 CooperationApplicationVerifyDescription: applicationParam.CooperationApplicationVerifyDescription,
93 CooperationApplicationStatus: applicationParam.CooperationApplicationStatus, 93 CooperationApplicationStatus: applicationParam.CooperationApplicationStatus,
  94 + CooperationApplicationVerifyTime: applicationParam.CooperationApplicationVerifyTime.Unix(),
94 Org: applicationParam.Org, 95 Org: applicationParam.Org,
95 } 96 }
96 data.CooperationProject.CooperationProjectID = objectParam.CooperationProjectId 97 data.CooperationProject.CooperationProjectID = objectParam.CooperationProjectId
@@ -11,7 +11,7 @@ type ListCooperationApplicationQuery struct { @@ -11,7 +11,7 @@ type ListCooperationApplicationQuery struct {
11 //操作人 11 //操作人
12 Operator domain.Operator `json:"-"` 12 Operator domain.Operator `json:"-"`
13 // 查询偏离量 13 // 查询偏离量
14 - PageNumber int `json:"pageNumber" valid:"Required"` 14 + PageNumber int `json:"pageNumber" `
15 // 查询限制 15 // 查询限制
16 PageSize int `json:"pageSize" valid:"Required"` 16 PageSize int `json:"pageSize" valid:"Required"`
17 //共创项目名称 17 //共创项目名称