作者 tangxuhui

数据结构调整

@@ -25,8 +25,12 @@ type CooperationContractItem struct { @@ -25,8 +25,12 @@ type CooperationContractItem struct {
25 } 25 }
26 26
27 func ToCooperationContractItem(param *allied_creation_cooperation.CooperationContract) *CooperationContractItem { 27 func ToCooperationContractItem(param *allied_creation_cooperation.CooperationContract) *CooperationContractItem {
  28 + cooperationContractUndertakerType := param.CooperationContractUndertakerTypes
  29 + if len(cooperationContractUndertakerType) == 0 {
  30 + cooperationContractUndertakerType = []int{}
  31 + }
28 data := CooperationContractItem{ 32 data := CooperationContractItem{
29 - CooperationContractUndertakerType: param.CooperationContractUndertakerTypes, 33 + CooperationContractUndertakerType: cooperationContractUndertakerType,
30 CooperationContractDescription: param.CooperationContractDescription, 34 CooperationContractDescription: param.CooperationContractDescription,
31 CooperationContractId: param.CooperationContractId, 35 CooperationContractId: param.CooperationContractId,
32 CooperationProjectNumber: param.CooperationContractNumber, 36 CooperationProjectNumber: param.CooperationContractNumber,
@@ -177,17 +181,17 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon @@ -177,17 +181,17 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon
177 } 181 }
178 contractUndertaker = append(contractUndertaker, u) 182 contractUndertaker = append(contractUndertaker, u)
179 } 183 }
180 - 184 + undertakerTypesUncheckedAvailable := param.UndertakerTypesUncheckedAvailable
  185 + if len(undertakerTypesUncheckedAvailable) == 0 {
  186 + undertakerTypesUncheckedAvailable = []int{}
  187 + }
181 data := CooperationContractInfo{ 188 data := CooperationContractInfo{
182 CooperationContract: *ToCooperationContractItem(param), 189 CooperationContract: *ToCooperationContractItem(param),
183 Relevant: relevants, 190 Relevant: relevants,
184 DividendsIncentivesRules: dividendsIncentivesRules, 191 DividendsIncentivesRules: dividendsIncentivesRules,
185 MoneyIncentivesRules: moneyIncentivesRules, 192 MoneyIncentivesRules: moneyIncentivesRules,
186 ContractUndertaker: contractUndertaker, 193 ContractUndertaker: contractUndertaker,
187 - UndertakerTypesUncheckedAvailable: param.UndertakerTypesUncheckedAvailable,  
188 - }  
189 - if len(param.UndertakerTypesUncheckedAvailable) == 0 {  
190 - data.UndertakerTypesUncheckedAvailable = []int{} 194 + UndertakerTypesUncheckedAvailable: undertakerTypesUncheckedAvailable,
191 } 195 }
192 return &data 196 return &data
193 197
@@ -37,6 +37,7 @@ func ToDividendsEstimateDividendItem(param *allied_creation_cooperation.DataDivi @@ -37,6 +37,7 @@ func ToDividendsEstimateDividendItem(param *allied_creation_cooperation.DataDivi
37 return listdata 37 return listdata
38 } 38 }
39 39
  40 +//金额激励列表
40 type DividendsEstimateMoneyItem struct { 41 type DividendsEstimateMoneyItem struct {
41 CooperationContractName string `json:"cooperationContractName"` //合约名称 42 CooperationContractName string `json:"cooperationContractName"` //合约名称
42 CooperationContractNumber string `json:"cooperationContractNumber"` //合约编码 43 CooperationContractNumber string `json:"cooperationContractNumber"` //合约编码