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

转到一个项目

作者 tangxuhui
提交 d22d87901755f63eac8c10ded92806ea2c0d5194 1 个父辈 478ef255

数据结构调整

内嵌 并排对比
正在显示 4 个修改的文件 包含 20 行增加 和 7 行删除
@@ -20,10 +20,14 @@ type CooperationContractItem struct { @@ -20,10 +20,14 @@ type CooperationContractItem struct {
20 } `json:"cooperationContractSponsor"` //共创发起人 20 } `json:"cooperationContractSponsor"` //共创发起人
21 CooperationMode domain.CooperationMode `json:"cooperationMode"` //共创模式 21 CooperationMode domain.CooperationMode `json:"cooperationMode"` //共创模式
22 Org domain.Org `json:"org"` //组织结构 22 Org domain.Org `json:"org"` //组织结构
  23 + CooperationContractUndertakerType []int `json:"cooperationContractUndertakerType"` //共创合约承接对象，1员工，2共创用户，3公开
  24 + CooperationContractDescription string `json:"cooperationContractDescription"` //合约描述
23 } 25 }
24 26
25 func ToCooperationContractItem(param *allied_creation_cooperation.CooperationContract) *CooperationContractItem { 27 func ToCooperationContractItem(param *allied_creation_cooperation.CooperationContract) *CooperationContractItem {
26 data := CooperationContractItem{ 28 data := CooperationContractItem{
  29 + CooperationContractUndertakerType: param.CooperationContractUndertakerTypes,
  30 + CooperationContractDescription: param.CooperationContractDescription,
27 CooperationContractId: param.CooperationContractId, 31 CooperationContractId: param.CooperationContractId,
28 CooperationProjectNumber: param.CooperationContractNumber, 32 CooperationProjectNumber: param.CooperationContractNumber,
29 CooperationContractName: param.CooperationContractName, 33 CooperationContractName: param.CooperationContractName,
@@ -91,6 +95,7 @@ type CooperationContractInfo struct { @@ -91,6 +95,7 @@ type CooperationContractInfo struct {
91 DividendsIncentivesRules []DividendsIncentivesRule `json:"dividendsIncentivesRules"` 95 DividendsIncentivesRules []DividendsIncentivesRule `json:"dividendsIncentivesRules"`
92 MoneyIncentivesRules []MoneyIncentivesRule `json:"moneyIncentivesRules"` 96 MoneyIncentivesRules []MoneyIncentivesRule `json:"moneyIncentivesRules"`
93 ContractUndertaker []ContractUndertaker `json:"contractUndertaker"` 97 ContractUndertaker []ContractUndertaker `json:"contractUndertaker"`
  98 + UndertakerTypesUncheckedAvailable []int `json:"undertakerTypesUncheckedAvailable"` // 可以去除勾选的共创项目承接对象列表
94 } 99 }
95 100
96 func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationContract) *CooperationContractInfo { 101 func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationContract) *CooperationContractInfo {
@@ -172,12 +177,17 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon @@ -172,12 +177,17 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon
172 } 177 }
173 contractUndertaker = append(contractUndertaker, u) 178 contractUndertaker = append(contractUndertaker, u)
174 } 179 }
  180 +
175 data := CooperationContractInfo{ 181 data := CooperationContractInfo{
176 CooperationContract: *ToCooperationContractItem(param), 182 CooperationContract: *ToCooperationContractItem(param),
177 Relevant: relevants, 183 Relevant: relevants,
178 DividendsIncentivesRules: dividendsIncentivesRules, 184 DividendsIncentivesRules: dividendsIncentivesRules,
179 MoneyIncentivesRules: moneyIncentivesRules, 185 MoneyIncentivesRules: moneyIncentivesRules,
180 ContractUndertaker: contractUndertaker, 186 ContractUndertaker: contractUndertaker,
  187 + UndertakerTypesUncheckedAvailable: param.UndertakerTypesUncheckedAvailable,
  188 + }
  189 + if len(param.UndertakerTypesUncheckedAvailable) == 0 {
  190 + data.UndertakerTypesUncheckedAvailable = []int{}
181 } 191 }
182 return &data 192 return &data
183 193
@@ -41,7 +41,7 @@ type CooperationProjectInfo struct { @@ -41,7 +41,7 @@ type CooperationProjectInfo struct {
41 UsersId int `json:"userId,string"` 41 UsersId int `json:"userId,string"`
42 } `json:"userInfo"` 42 } `json:"userInfo"`
43 } `json:"cooperationProjectSponsor"` //项目发起人 43 } `json:"cooperationProjectSponsor"` //项目发起人
44 - CooperationProjectUndertakerType []int `json:"cooperationProjectUndertakerTypes"` //共创合约承接对象，1员工，2共创用户，3公开 44 + CooperationProjectUndertakerType []int `json:"cooperationProjectUndertakerType"` //共创合约承接对象，1员工，2共创用户，3公开
45 Department struct { 45 Department struct {
46 DepartmentNumber string `json:"departmentNumber"` 46 DepartmentNumber string `json:"departmentNumber"`
47 DepartmentId int `json:"departmentId,string,"` 47 DepartmentId int `json:"departmentId,string,"`
@@ -79,16 +79,17 @@ type CooperationApplicationItem struct { @@ -79,16 +79,17 @@ type CooperationApplicationItem struct {
79 Company domain.CompanyData `json:"company"` 79 Company domain.CompanyData `json:"company"`
80 Department domain.Department `json:"department"` 80 Department domain.Department `json:"department"`
81 Org domain.Org `json:"org"` 81 Org domain.Org `json:"org"`
82 - UserBaseID int `json:"userBaseId"`  
83 - UserID int `json:"userId"` 82 + UserBaseID int `json:"userBaseId,string"`
  83 + UserID int `json:"userId,string"`
84 UserInfo domain.UserInfo `json:"userInfo"` 84 UserInfo domain.UserInfo `json:"userInfo"`
85 UserType int `json:"userType"` 85 UserType int `json:"userType"`
86 } `json:"cooperationApplicationApplicant"` //申请人 86 } `json:"cooperationApplicationApplicant"` //申请人
87 CooperationApplicationDescription string `json:"cooperationApplicationDescription"` //描述 87 CooperationApplicationDescription string `json:"cooperationApplicationDescription"` //描述
88 - CooperationApplicationID int `json:"cooperationApplicationId"` //申请id 88 + CooperationApplicationID int `json:"cooperationApplicationId,string"` //申请id
89 CooperationApplicationStatus int `json:"cooperationApplicationStatus"` //状态 89 CooperationApplicationStatus int `json:"cooperationApplicationStatus"` //状态
90 CooperationApplyTime int `json:"cooperationApplyTime"` //申请时间 90 CooperationApplyTime int `json:"cooperationApplyTime"` //申请时间
91 CooperationApplicationAttachment []domain.Attachment `json:"cooperationApplicationAttachment"` //附件 91 CooperationApplicationAttachment []domain.Attachment `json:"cooperationApplicationAttachment"` //附件
  92 + CooperationApplicationVerifyTime int `json:"cooperationApplicationVerifyTime"`
92 } 93 }
93 94
94 func ToCooperationApplicationItem(param *allied_creation_cooperation.CooperationApplication) *CooperationApplicationItem { 95 func ToCooperationApplicationItem(param *allied_creation_cooperation.CooperationApplication) *CooperationApplicationItem {
@@ -97,8 +98,9 @@ func ToCooperationApplicationItem(param *allied_creation_cooperation.Cooperation @@ -97,8 +98,9 @@ func ToCooperationApplicationItem(param *allied_creation_cooperation.Cooperation
97 CooperationApplicationDescription: param.CooperationApplicationDescription, 98 CooperationApplicationDescription: param.CooperationApplicationDescription,
98 CooperationApplicationID: applicationID, 99 CooperationApplicationID: applicationID,
99 CooperationApplicationStatus: param.CooperationApplicationStatus, 100 CooperationApplicationStatus: param.CooperationApplicationStatus,
100 - CooperationApplyTime: int(param.CooperationApplyTime), 101 + CooperationApplyTime: param.CooperationApplyTime,
101 CooperationApplicationAttachment: param.CooperationApplicationAttachment, 102 CooperationApplicationAttachment: param.CooperationApplicationAttachment,
  103 + CooperationApplicationVerifyTime: param.CooperationApplicationVerifyTime,
102 } 104 }
103 data.CooperationApplicationApplicant.Company.CompanyID = param.Company.CompanyID 105 data.CooperationApplicationApplicant.Company.CompanyID = param.Company.CompanyID
104 data.CooperationApplicationApplicant.Company.CompanyName = param.Company.CompanyName 106 data.CooperationApplicationApplicant.Company.CompanyName = param.Company.CompanyName
@@ -31,8 +31,8 @@ type CooperationApplication struct { @@ -31,8 +31,8 @@ type CooperationApplication struct {
31 Department interface{} `json:"department"` 31 Department interface{} `json:"department"`
32 } `json:"cooperationApplicationVerifier"` 32 } `json:"cooperationApplicationVerifier"`
33 CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription"` 33 CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription"`
34 - CooperationApplicationVerifyTime int64 `json:"cooperationApplicationVerifyTime"`  
35 - CooperationApplyTime int64 `json:"cooperationApplyTime"` 34 + CooperationApplicationVerifyTime int `json:"cooperationApplicationVerifyTime"`
  35 + CooperationApplyTime int `json:"cooperationApplyTime"`
36 CooperationProject struct { 36 CooperationProject struct {
37 CooperationProjectID int `json:"cooperationProjectId"` 37 CooperationProjectID int `json:"cooperationProjectId"`
38 CooperationProjectNumber string `json:"cooperationProjectNumber"` 38 CooperationProjectNumber string `json:"cooperationProjectNumber"`
@@ -115,6 +115,7 @@ type CooperationContract struct { @@ -115,6 +115,7 @@ type CooperationContract struct {
115 OperateTime time.Time `json:"operateTime"` // 操作时间 115 OperateTime time.Time `json:"operateTime"` // 操作时间
116 CreatedAt time.Time `json:"createdAt"` // 创建时间 116 CreatedAt time.Time `json:"createdAt"` // 创建时间
117 UpdatedAt time.Time `json:"updatedAt"` // 更新时间 117 UpdatedAt time.Time `json:"updatedAt"` // 更新时间
  118 + UndertakerTypesUncheckedAvailable []int `json:"undertakerTypesUncheckedAvailable"`
118 } 119 }
119 120
120 //创建共创合约 121 //创建共创合约