allied-creation / allied-creation-cooperation · 提交

转到一个项目

作者 陈志颖
提交 f69d32d01964adc0ae1519285bb2390c1f7771a1 1 个父辈 20420178

feat:调整列表返回结构

内嵌 并排对比
正在显示 43 个修改的文件 包含 124 行增加 和 100 行删除
@@ -10,9 +10,9 @@ import ( @@ -10,9 +10,9 @@ import (
10 10
11 type ListContractUndertakerFeedbackQuery struct { 11 type ListContractUndertakerFeedbackQuery struct {
12 // 页面大小 12 // 页面大小
13 - PageNumber int32 `cname:"页面大小" json:"pageNumber,omitempty"` 13 + PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"`
14 // 页面大小 14 // 页面大小
15 - PageSize int32 `cname:"页面大小" json:"pageSize,omitempty"` 15 + PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
16 // 承接人uid 16 // 承接人uid
17 UnderTakerUid string `cname:"承接人uid" json:"underTakerUid" valid:"Required"` 17 UnderTakerUid string `cname:"承接人uid" json:"underTakerUid" valid:"Required"`
18 // 公司ID，通过集成REST上下文获取 18 // 公司ID，通过集成REST上下文获取
@@ -24,9 +24,9 @@ type SearchContractUndertakerFeedbackQuery struct { @@ -24,9 +24,9 @@ type SearchContractUndertakerFeedbackQuery struct {
24 // 查询关键词 24 // 查询关键词
25 MatchWord string `cname:"查询关键词" json:"matchWord,omitempty"` 25 MatchWord string `cname:"查询关键词" json:"matchWord,omitempty"`
26 // 页面大小 26 // 页面大小
27 - PageNumber int32 `cname:"页面大小" json:"pageNumber,omitempty"` 27 + PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"`
28 // 页面大小 28 // 页面大小
29 - PageSize int32 `cname:"页面大小" json:"pageSize,omitempty"` 29 + PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
30 } 30 }
31 31
32 func (searchContractUndertakerFeedbackQuery *SearchContractUndertakerFeedbackQuery) Valid(validation *validation.Validation) { 32 func (searchContractUndertakerFeedbackQuery *SearchContractUndertakerFeedbackQuery) Valid(validation *validation.Validation) {
@@ -177,8 +177,10 @@ func (contractUndertakerFeedbackService *ContractUndertakerFeedbackService) List @@ -177,8 +177,10 @@ func (contractUndertakerFeedbackService *ContractUndertakerFeedbackService) List
177 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 177 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
178 } 178 }
179 return map[string]interface{}{ 179 return map[string]interface{}{
180 - "count": count,  
181 - "contractUndertakerFeedbacks": contractUndertakerFeedbacks, 180 + "grid": map[string]interface{}{
  181 + "total": count,
  182 + "list": contractUndertakerFeedbacks,
  183 + },
182 }, nil 184 }, nil
183 } 185 }
184 } 186 }
@@ -10,9 +10,9 @@ import ( @@ -10,9 +10,9 @@ import (
10 10
11 type ListCooperationApplicationQuery struct { 11 type ListCooperationApplicationQuery struct {
12 // 页面大小 12 // 页面大小
13 - PageNumber int32 `cname:"页面大小" json:"pageNumber,omitempty"` 13 + PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"`
14 // 页面大小 14 // 页面大小
15 - PageSize int32 `cname:"页面大小" json:"pageSize,omitempty"` 15 + PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
16 // 查询偏离量 16 // 查询偏离量
17 Offset int `cname:"查询偏离量" json:"offset" valid:"Required"` 17 Offset int `cname:"查询偏离量" json:"offset" valid:"Required"`
18 // 查询限制 18 // 查询限制
@@ -16,9 +16,9 @@ type SearchCooperationApplicationQuery struct { @@ -16,9 +16,9 @@ type SearchCooperationApplicationQuery struct {
16 // 共创申请审核状态，1待审核，2已同意，3已拒绝 16 // 共创申请审核状态，1待审核，2已同意，3已拒绝
17 CooperationApplicationStatus int32 `cname:"共创申请审核状态，1待审核，2已同意，3已拒绝" json:"cooperationApplicationStatus,omitempty"` 17 CooperationApplicationStatus int32 `cname:"共创申请审核状态，1待审核，2已同意，3已拒绝" json:"cooperationApplicationStatus,omitempty"`
18 // 页面大小 18 // 页面大小
19 - PageSize int32 `cname:"页面大小" json:"pageSize,omitempty"` 19 + PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
20 // 页面大小 20 // 页面大小
21 - PageNumber int32 `cname:"页面大小" json:"pageNumber,omitempty"` 21 + PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"`
22 // 公司ID，通过集成REST上下文获取 22 // 公司ID，通过集成REST上下文获取
23 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"` 23 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"`
24 // 组织机构ID 24 // 组织机构ID
@@ -187,8 +187,10 @@ func (cooperationApplicationService *CooperationApplicationService) ListCooperat @@ -187,8 +187,10 @@ func (cooperationApplicationService *CooperationApplicationService) ListCooperat
187 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 187 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
188 } 188 }
189 return map[string]interface{}{ 189 return map[string]interface{}{
190 - "count": count,  
191 - "cooperationApplications": cooperationApplications, 190 + "grid": map[string]interface{}{
  191 + "total": count,
  192 + "list": cooperationApplications,
  193 + },
192 }, nil 194 }, nil
193 } 195 }
194 } 196 }
@@ -10,9 +10,9 @@ import ( @@ -10,9 +10,9 @@ import (
10 10
11 type ListCooperationContractQuery struct { 11 type ListCooperationContractQuery struct {
12 // 页面大小 12 // 页面大小
13 - PageNumber int32 `cname:"页面大小" json:"pageNumber,omitempty"` 13 + PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"`
14 // 页面大小 14 // 页面大小
15 - PageSize int32 `cname:"页面大小" json:"pageSize,omitempty"` 15 + PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
16 // 公司ID，通过集成REST上下文获取 16 // 公司ID，通过集成REST上下文获取
17 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"` 17 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"`
18 // 组织机构ID 18 // 组织机构ID
@@ -10,9 +10,9 @@ import ( @@ -10,9 +10,9 @@ import (
10 10
11 type SearchCooperationContractQuery struct { 11 type SearchCooperationContractQuery struct {
12 // 页面大小 12 // 页面大小
13 - PageSize int32 `cname:"页面大小" json:"pageSize" valid:"Required"` 13 + PageSize int64 `cname:"页面大小" json:"pageSize" valid:"Required"`
14 // 页面大小 14 // 页面大小
15 - PageNumber int32 `cname:"页面大小" json:"pageNumber" valid:"Required"` 15 + PageNumber int64 `cname:"页面大小" json:"pageNumber" valid:"Required"`
16 // 共创合约编号 16 // 共创合约编号
17 CooperationContractNumber string `cname:"共创合约编号" json:"cooperationContractNumber" valid:"Required"` 17 CooperationContractNumber string `cname:"共创合约编号" json:"cooperationContractNumber" valid:"Required"`
18 // 发起人姓名 18 // 发起人姓名
@@ -10,9 +10,9 @@ import ( @@ -10,9 +10,9 @@ import (
10 10
11 type SearchCooperationContractByUndertakerQuery struct { 11 type SearchCooperationContractByUndertakerQuery struct {
12 // 页面大小 12 // 页面大小
13 - PageNumber int32 `cname:"页面大小" json:"pageNumber,omitempty"` 13 + PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"`
14 // 页面大小 14 // 页面大小
15 - PageSize int32 `cname:"页面大小" json:"pageSize,omitempty"` 15 + PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
16 // 共创合约名称 16 // 共创合约名称
17 CooperationContractName string `cname:"共创合约名称" json:"cooperationContractName,omitempty"` 17 CooperationContractName string `cname:"共创合约名称" json:"cooperationContractName,omitempty"`
18 // 项目发起人姓名 18 // 项目发起人姓名
@@ -184,8 +184,10 @@ func (cooperationContractService *CooperationContractService) ListCooperationCon @@ -184,8 +184,10 @@ func (cooperationContractService *CooperationContractService) ListCooperationCon
184 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 184 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
185 } 185 }
186 return map[string]interface{}{ 186 return map[string]interface{}{
187 - "count": count,  
188 - "cooperationContracts": cooperationContracts, 187 + "grid": map[string]interface{}{
  188 + "total": count,
  189 + "list": cooperationContracts,
  190 + },
189 }, nil 191 }, nil
190 } 192 }
191 } 193 }
@@ -10,9 +10,9 @@ import ( @@ -10,9 +10,9 @@ import (
10 10
11 type ListCooperationContractChangeLogQuery struct { 11 type ListCooperationContractChangeLogQuery struct {
12 // 页面大小 12 // 页面大小
13 - PageNumber int32 `cname:"页面大小" json:"pageNumber,omitempty"` 13 + PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"`
14 // 页面大小 14 // 页面大小
15 - PageSize int32 `cname:"页面大小" json:"pageSize,omitempty"` 15 + PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
16 // 公司ID，通过集成REST上下文获取 16 // 公司ID，通过集成REST上下文获取
17 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"` 17 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"`
18 // 组织机构ID 18 // 组织机构ID
@@ -14,9 +14,9 @@ type SearchCooperationContractChangeLogQuery struct { @@ -14,9 +14,9 @@ type SearchCooperationContractChangeLogQuery struct {
14 // 共创合约编号 14 // 共创合约编号
15 CooperationContractNumber string `cname:"共创合约编号" json:"cooperationContractNumber,omitempty"` 15 CooperationContractNumber string `cname:"共创合约编号" json:"cooperationContractNumber,omitempty"`
16 // 页面大小 16 // 页面大小
17 - PageSize int32 `cname:"页面大小" json:"pageSize,omitempty"` 17 + PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
18 // 页面大小 18 // 页面大小
19 - PageNumber int32 `cname:"页面大小" json:"pageNumber,omitempty"` 19 + PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"`
20 // 公司ID，通过集成REST上下文获取 20 // 公司ID，通过集成REST上下文获取
21 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"` 21 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"`
22 // 组织机构ID 22 // 组织机构ID
@@ -162,8 +162,10 @@ func (cooperationContractChangeLogService *CooperationContractChangeLogService) @@ -162,8 +162,10 @@ func (cooperationContractChangeLogService *CooperationContractChangeLogService)
162 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 162 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
163 } 163 }
164 return map[string]interface{}{ 164 return map[string]interface{}{
165 - "count": count,  
166 - "cooperationContractChangeLogs": cooperationContractChangeLogs, 165 + "grid": map[string]interface{}{
  166 + "total": count,
  167 + "list": cooperationContractChangeLogs,
  168 + },
167 }, nil 169 }, nil
168 } 170 }
169 } 171 }
@@ -10,9 +10,9 @@ import ( @@ -10,9 +10,9 @@ import (
10 10
11 type SearchCooperationModeQuery struct { 11 type SearchCooperationModeQuery struct {
12 // 页面大小 12 // 页面大小
13 - PageNumber int32 `cname:"页面大小" json:"pageNumber" valid:"Required"` 13 + PageNumber int64 `cname:"页面大小" json:"pageNumber" valid:"Required"`
14 // 页面大小 14 // 页面大小
15 - PageSize int32 `cname:"页面大小" json:"pageSize" valid:"Required"` 15 + PageSize int64 `cname:"页面大小" json:"pageSize" valid:"Required"`
16 // 共创模式名称 16 // 共创模式名称
17 CooperationModeName string `cname:"共创模式名称" json:"cooperationModeName" valid:"Required"` 17 CooperationModeName string `cname:"共创模式名称" json:"cooperationModeName" valid:"Required"`
18 // 组织机构名称 18 // 组织机构名称
@@ -178,8 +178,10 @@ func (cooperationModeService *CooperationModeService) ListCooperationMode(listCo @@ -178,8 +178,10 @@ func (cooperationModeService *CooperationModeService) ListCooperationMode(listCo
178 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 178 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
179 } 179 }
180 return map[string]interface{}{ 180 return map[string]interface{}{
181 - "count": count,  
182 - "cooperationModes": cooperationModes, 181 + "grid": map[string]interface{}{
  182 + "list": cooperationModes,
  183 + "total": count,
  184 + },
183 }, nil 185 }, nil
184 } 186 }
185 } 187 }
@@ -10,9 +10,9 @@ import ( @@ -10,9 +10,9 @@ import (
10 10
11 type ListCooperationProjectQuery struct { 11 type ListCooperationProjectQuery struct {
12 // 页面大小 12 // 页面大小
13 - PageNumber int32 `cname:"页面大小" json:"pageNumber,omitempty"` 13 + PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"`
14 // 页面大小 14 // 页面大小
15 - PageSize int32 `cname:"页面大小" json:"pageSize,omitempty"` 15 + PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
16 // 公司ID，通过集成REST上下文获取 16 // 公司ID，通过集成REST上下文获取
17 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"` 17 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"`
18 // 组织机构ID 18 // 组织机构ID
@@ -10,9 +10,9 @@ import ( @@ -10,9 +10,9 @@ import (
10 10
11 type SearchCooperationProjectQuery struct { 11 type SearchCooperationProjectQuery struct {
12 // 页面大小 12 // 页面大小
13 - PageNumber int32 `cname:"页面大小" json:"pageNumber,omitempty"` 13 + PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"`
14 // 页面大小 14 // 页面大小
15 - PageSize int32 `cname:"页面大小" json:"pageSize,omitempty"` 15 + PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
16 // 共创项目名称 16 // 共创项目名称
17 CooperationProjectName string `cname:"共创项目名称" json:"cooperationProjectName,omitempty"` 17 CooperationProjectName string `cname:"共创项目名称" json:"cooperationProjectName,omitempty"`
18 // 部门名称 18 // 部门名称
@@ -219,8 +219,10 @@ func (cooperationProjectService *CooperationProjectService) ListCooperationProje @@ -219,8 +219,10 @@ func (cooperationProjectService *CooperationProjectService) ListCooperationProje
219 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 219 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
220 } 220 }
221 return map[string]interface{}{ 221 return map[string]interface{}{
222 - "count": count,  
223 - "cooperationProjects": cooperationProjects, 222 + "grid": map[string]interface{}{
  223 + "total": count,
  224 + "list": cooperationProjects,
  225 + },
224 }, nil 226 }, nil
225 } 227 }
226 } 228 }
@@ -10,9 +10,9 @@ import ( @@ -10,9 +10,9 @@ import (
10 10
11 type ListCreditAccountQuery struct { 11 type ListCreditAccountQuery struct {
12 // 页面大小 12 // 页面大小
13 - PageNumber int32 `cname:"页面大小" json:"pageNumber,omitempty"` 13 + PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"`
14 // 页面大小 14 // 页面大小
15 - PageSize int32 `cname:"页面大小" json:"pageSize,omitempty"` 15 + PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
16 // 公司ID，通过集成REST上下文获取 16 // 公司ID，通过集成REST上下文获取
17 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"` 17 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"`
18 // 组织机构ID 18 // 组织机构ID
@@ -11,9 +11,9 @@ import ( @@ -11,9 +11,9 @@ import (
11 11
12 type SearchCreditAccountQuery struct { 12 type SearchCreditAccountQuery struct {
13 // 页面大小 13 // 页面大小
14 - PageNumber int32 `cname:"页面大小" json:"pageNumber,omitempty"` 14 + PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"`
15 // 页面大小 15 // 页面大小
16 - PageSize int32 `cname:"页面大小" json:"pageSize,omitempty"` 16 + PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
17 // 账期结算单号 17 // 账期结算单号
18 CreditAccountOrderNum string `cname:"账期结算单号" json:"creditAccountOrderNum" valid:"Required"` 18 CreditAccountOrderNum string `cname:"账期结算单号" json:"creditAccountOrderNum" valid:"Required"`
19 // 参与人姓名 19 // 参与人姓名
@@ -206,8 +206,10 @@ func (creditAccountService *CreditAccountService) ListCreditAccount(listCreditAc @@ -206,8 +206,10 @@ func (creditAccountService *CreditAccountService) ListCreditAccount(listCreditAc
206 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 206 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
207 } 207 }
208 return map[string]interface{}{ 208 return map[string]interface{}{
209 - "count": count,  
210 - "creditAccounts": creditAccounts, 209 + "grid": map[string]interface{}{
  210 + "total": count,
  211 + "list": creditAccounts,
  212 + },
211 }, nil 213 }, nil
212 } 214 }
213 } 215 }
@@ -10,13 +10,9 @@ import ( @@ -10,13 +10,9 @@ import (
10 10
11 type ListDividendsEstimateQuery struct { 11 type ListDividendsEstimateQuery struct {
12 // 页面大小 12 // 页面大小
13 - PageNumber int32 `cname:"页面大小" json:"pageNumber,omitempty"` 13 + PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"`
14 // 页面大小 14 // 页面大小
15 - PageSize int32 `cname:"页面大小" json:"pageSize,omitempty"`  
16 - // 查询偏离量  
17 - Offset int `cname:"查询偏离量" json:"offset" valid:"Required"`  
18 - // 查询限制  
19 - Limit int `cname:"查询限制" json:"limit" valid:"Required"` 15 + PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
20 // 公司ID，通过集成REST上下文获取 16 // 公司ID，通过集成REST上下文获取
21 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"` 17 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"`
22 // 组织机构ID 18 // 组织机构ID
@@ -9,10 +9,10 @@ import ( @@ -9,10 +9,10 @@ import (
9 ) 9 )
10 10
11 type ListDividendsIncentivesQuery struct { 11 type ListDividendsIncentivesQuery struct {
12 - // 查询偏离量  
13 - Offset int `cname:"查询偏离量" json:"offset" valid:"Required"`  
14 - // 查询限制  
15 - Limit int `cname:"查询限制" json:"limit" valid:"Required"` 12 + // 页面大小
  13 + PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"`
  14 + // 页面大小
  15 + PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
16 // 公司ID，通过集成REST上下文获取 16 // 公司ID，通过集成REST上下文获取
17 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"` 17 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"`
18 // 组织机构ID 18 // 组织机构ID
@@ -9,10 +9,10 @@ import ( @@ -9,10 +9,10 @@ import (
9 ) 9 )
10 10
11 type ListMoneyIncentivesQuery struct { 11 type ListMoneyIncentivesQuery struct {
12 - // 查询偏离量  
13 - Offset int `cname:"查询偏离量" json:"offset" valid:"Required"`  
14 - // 查询限制  
15 - Limit int `cname:"查询限制" json:"limit" valid:"Required"` 12 + // 页面大小
  13 + PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"`
  14 + // 页面大小
  15 + PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
16 // 公司ID，通过集成REST上下文获取 16 // 公司ID，通过集成REST上下文获取
17 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"` 17 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"`
18 // 组织机构ID 18 // 组织机构ID
@@ -21,6 +21,10 @@ type SearchDividendsEstimateQuery struct { @@ -21,6 +21,10 @@ type SearchDividendsEstimateQuery struct {
21 UserId int64 `cname:"用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"` 21 UserId int64 `cname:"用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"`
22 // 用户基础数据id 22 // 用户基础数据id
23 UserBaseId int64 `cname:"用户基础数据is" json:"userBaseId,string" valid:"Required"` 23 UserBaseId int64 `cname:"用户基础数据is" json:"userBaseId,string" valid:"Required"`
  24 + // 页面大小
  25 + PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"`
  26 + // 页面大小
  27 + PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
24 } 28 }
25 29
26 func (searchDividendsEstimateQuery *SearchDividendsEstimateQuery) Valid(validation *validation.Validation) { 30 func (searchDividendsEstimateQuery *SearchDividendsEstimateQuery) Valid(validation *validation.Validation) {
@@ -21,6 +21,10 @@ type SearchDividendsIncentivesQuery struct { @@ -21,6 +21,10 @@ type SearchDividendsIncentivesQuery struct {
21 UserId int64 `cname:"用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"` 21 UserId int64 `cname:"用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"`
22 // 用户基础数据id 22 // 用户基础数据id
23 UserBaseId int64 `cname:"用户基础数据is" json:"userBaseId,string" valid:"Required"` 23 UserBaseId int64 `cname:"用户基础数据is" json:"userBaseId,string" valid:"Required"`
  24 + // 页面大小
  25 + PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"`
  26 + // 页面大小
  27 + PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
24 } 28 }
25 29
26 func (searchDividendsIncentivesQuery *SearchDividendsIncentivesQuery) Valid(validation *validation.Validation) { 30 func (searchDividendsIncentivesQuery *SearchDividendsIncentivesQuery) Valid(validation *validation.Validation) {
@@ -21,6 +21,10 @@ type SearchMoneyIncentivesQuery struct { @@ -21,6 +21,10 @@ type SearchMoneyIncentivesQuery struct {
21 UserId int64 `cname:"用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"` 21 UserId int64 `cname:"用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"`
22 // 用户基础数据id 22 // 用户基础数据id
23 UserBaseId int64 `cname:"用户基础数据is" json:"userBaseId,string" valid:"Required"` 23 UserBaseId int64 `cname:"用户基础数据is" json:"userBaseId,string" valid:"Required"`
  24 + // 页面大小
  25 + PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"`
  26 + // 页面大小
  27 + PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
24 } 28 }
25 29
26 func (searchMoneyIncentivesQuery *SearchMoneyIncentivesQuery) Valid(validation *validation.Validation) { 30 func (searchMoneyIncentivesQuery *SearchMoneyIncentivesQuery) Valid(validation *validation.Validation) {
@@ -249,8 +249,10 @@ func (dividendsEstimateService *DividendsEstimateService) ListDividendsEstimate( @@ -249,8 +249,10 @@ func (dividendsEstimateService *DividendsEstimateService) ListDividendsEstimate(
249 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 249 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
250 } 250 }
251 return map[string]interface{}{ 251 return map[string]interface{}{
252 - "count": count,  
253 - "dividendsEstimates": dividendsEstimates, 252 + "grid": map[string]interface{}{
  253 + "total": count,
  254 + "list": dividendsEstimates,
  255 + },
254 }, nil 256 }, nil
255 } 257 }
256 } 258 }
@@ -39,6 +39,8 @@ type CreateDividendsOrderCommand struct { @@ -39,6 +39,8 @@ type CreateDividendsOrderCommand struct {
39 OrderTime time.Time `cname:"订单产生时间" json:"orderTime" valid:"Required"` 39 OrderTime time.Time `cname:"订单产生时间" json:"orderTime" valid:"Required"`
40 // 备注 40 // 备注
41 Remarks string `cname:"备注" json:"remarks" valid:"Required"` 41 Remarks string `cname:"备注" json:"remarks" valid:"Required"`
  42 + // 订单区域名称
  43 + RegionName string `cname:"订单区域名称" json:"regionName,omitempty"`
42 // 订单业务员uid 44 // 订单业务员uid
43 SalesmanUid string `cname:"订单业务员uid" json:"salesmanUid,omitempty"` 45 SalesmanUid string `cname:"订单业务员uid" json:"salesmanUid,omitempty"`
44 // 订单操作人uid 46 // 订单操作人uid
@@ -10,13 +10,9 @@ import ( @@ -10,13 +10,9 @@ import (
10 10
11 type ListDividendsOrdersQuery struct { 11 type ListDividendsOrdersQuery struct {
12 // 页面大小 12 // 页面大小
13 - PageNumber int32 `cname:"页面大小" json:"pageNumber,omitempty"` 13 + PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"`
14 // 页面大小 14 // 页面大小
15 - PageSize int32 `cname:"页面大小" json:"pageSize,omitempty"`  
16 - // 查询偏离量  
17 - Offset int `cname:"查询偏离量" json:"offset" valid:"Required"`  
18 - // 查询限制  
19 - Limit int `cname:"查询限制" json:"limit" valid:"Required"` 15 + PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
20 // 公司ID，通过集成REST上下文获取 16 // 公司ID，通过集成REST上下文获取
21 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"` 17 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"`
22 // 组织机构ID 18 // 组织机构ID
@@ -14,9 +14,9 @@ type SearchDividendsOrderQuery struct { @@ -14,9 +14,9 @@ type SearchDividendsOrderQuery struct {
14 // 客户名称 14 // 客户名称
15 CustomerName string `cname:"客户名称" json:"customerName,omitempty"` 15 CustomerName string `cname:"客户名称" json:"customerName,omitempty"`
16 // 页面大小 16 // 页面大小
17 - PageSize int32 `cname:"页面大小" json:"pageSize,omitempty"` 17 + PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
18 // 页面大小 18 // 页面大小
19 - PageNumber int32 `cname:"页面大小" json:"pageNumber,omitempty"` 19 + PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"`
20 // 公司ID，通过集成REST上下文获取 20 // 公司ID，通过集成REST上下文获取
21 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"` 21 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"`
22 // 组织机构ID 22 // 组织机构ID
@@ -19,6 +19,10 @@ type SearchDividendsOrderNumberQuery struct { @@ -19,6 +19,10 @@ type SearchDividendsOrderNumberQuery struct {
19 UserId int64 `cname:"用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"` 19 UserId int64 `cname:"用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"`
20 // 用户基础数据id 20 // 用户基础数据id
21 UserBaseId int64 `cname:"用户基础数据id" json:"userBaseId,string" valid:"Required"` 21 UserBaseId int64 `cname:"用户基础数据id" json:"userBaseId,string" valid:"Required"`
  22 + // 页面大小
  23 + PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"`
  24 + // 页面大小
  25 + PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
22 } 26 }
23 27
24 func (searchDividendsOrderNumberQuery *SearchDividendsOrderNumberQuery) Valid(validation *validation.Validation) { 28 func (searchDividendsOrderNumberQuery *SearchDividendsOrderNumberQuery) Valid(validation *validation.Validation) {
@@ -10,13 +10,9 @@ import ( @@ -10,13 +10,9 @@ import (
10 10
11 type ListDividendsReturnedOrderQuery struct { 11 type ListDividendsReturnedOrderQuery struct {
12 // 页面大小 12 // 页面大小
13 - PageNumber int32 `cname:"页面大小" json:"pageNumber,omitempty"` 13 + PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"`
14 // 页面大小 14 // 页面大小
15 - PageSize int32 `cname:"页面大小" json:"pageSize,omitempty"`  
16 - // 查询偏离量  
17 - Offset int `cname:"查询偏离量" json:"offset" valid:"Required"`  
18 - // 查询限制  
19 - Limit int `cname:"查询限制" json:"limit" valid:"Required"` 15 + PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
20 // 公司ID，通过集成REST上下文获取 16 // 公司ID，通过集成REST上下文获取
21 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"` 17 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"`
22 // 组织机构ID 18 // 组织机构ID
@@ -14,9 +14,9 @@ type SearchDividendsReturnedOrderQuery struct { @@ -14,9 +14,9 @@ type SearchDividendsReturnedOrderQuery struct {
14 // 分红退货单号 14 // 分红退货单号
15 DividendsReturnedOrderNumber string `cname:"分红退货单号" json:"dividendsReturnedOrderNumber,omitempty"` 15 DividendsReturnedOrderNumber string `cname:"分红退货单号" json:"dividendsReturnedOrderNumber,omitempty"`
16 // 页面大小 16 // 页面大小
17 - PageSize int32 `cname:"页面大小" json:"pageSize,omitempty"` 17 + PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
18 // 页面大小 18 // 页面大小
19 - PageNumber int32 `cname:"页面大小" json:"pageNumber,omitempty"` 19 + PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"`
20 // 公司ID，通过集成REST上下文获取 20 // 公司ID，通过集成REST上下文获取
21 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"` 21 CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"`
22 // 组织机构ID 22 // 组织机构ID
@@ -207,8 +207,10 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) ListDividend @@ -207,8 +207,10 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) ListDividend
207 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 207 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
208 } 208 }
209 return map[string]interface{}{ 209 return map[string]interface{}{
210 - "count": count,  
211 - "dividendsReturnedOrders": dividendsReturnedOrders, 210 + "grid": map[string]interface{}{
  211 + "total": count,
  212 + "list": dividendsReturnedOrders,
  213 + },
212 }, nil 214 }, nil
213 } 215 }
214 } 216 }
@@ -84,9 +84,9 @@ func (controller *ContractUndertakerFeedbackController) SearchContractUndertaker @@ -84,9 +84,9 @@ func (controller *ContractUndertakerFeedbackController) SearchContractUndertaker
84 searchContractUndertakerFeedbackQuery.UserId = header.UserId 84 searchContractUndertakerFeedbackQuery.UserId = header.UserId
85 searchContractUndertakerFeedbackQuery.UserBaseId = header.UserBaseId 85 searchContractUndertakerFeedbackQuery.UserBaseId = header.UserBaseId
86 // 获取路径参数 86 // 获取路径参数
87 - pageSize, _ := controller.GetInt32("pageSize") 87 + pageSize, _ := controller.GetInt64("pageSize")
88 searchContractUndertakerFeedbackQuery.PageSize = pageSize 88 searchContractUndertakerFeedbackQuery.PageSize = pageSize
89 - pageNumber, _ := controller.GetInt32("pageNumber") 89 + pageNumber, _ := controller.GetInt64("pageNumber")
90 searchContractUndertakerFeedbackQuery.PageNumber = pageNumber 90 searchContractUndertakerFeedbackQuery.PageNumber = pageNumber
91 data, err := contractUndertakerFeedbackService.SearchContractUndertakerFeedback(searchContractUndertakerFeedbackQuery) 91 data, err := contractUndertakerFeedbackService.SearchContractUndertakerFeedback(searchContractUndertakerFeedbackQuery)
92 controller.Response(data, err) 92 controller.Response(data, err)
@@ -102,9 +102,9 @@ func (controller *ContractUndertakerFeedbackController) ListContractUndertakerFe @@ -102,9 +102,9 @@ func (controller *ContractUndertakerFeedbackController) ListContractUndertakerFe
102 listContractUndertakerFeedbackQuery.UserId = header.UserId 102 listContractUndertakerFeedbackQuery.UserId = header.UserId
103 listContractUndertakerFeedbackQuery.UserBaseId = header.UserBaseId 103 listContractUndertakerFeedbackQuery.UserBaseId = header.UserBaseId
104 // 获取路径参数 104 // 获取路径参数
105 - pageSize, _ := controller.GetInt32("pageSize") 105 + pageSize, _ := controller.GetInt64("pageSize")
106 listContractUndertakerFeedbackQuery.PageSize = pageSize 106 listContractUndertakerFeedbackQuery.PageSize = pageSize
107 - pageNumber, _ := controller.GetInt32("pageNumber") 107 + pageNumber, _ := controller.GetInt64("pageNumber")
108 listContractUndertakerFeedbackQuery.PageNumber = pageNumber 108 listContractUndertakerFeedbackQuery.PageNumber = pageNumber
109 data, err := contractUndertakerFeedbackService.ListContractUndertakerFeedback(listContractUndertakerFeedbackQuery) 109 data, err := contractUndertakerFeedbackService.ListContractUndertakerFeedback(listContractUndertakerFeedbackQuery)
110 controller.Response(data, err) 110 controller.Response(data, err)
@@ -140,9 +140,9 @@ func (controller *CooperationApplicationController) SearchCooperationApplication @@ -140,9 +140,9 @@ func (controller *CooperationApplicationController) SearchCooperationApplication
140 searchCooperationApplicationQuery.UserId = header.UserId 140 searchCooperationApplicationQuery.UserId = header.UserId
141 searchCooperationApplicationQuery.UserBaseId = header.UserBaseId 141 searchCooperationApplicationQuery.UserBaseId = header.UserBaseId
142 // 解析其他参数 142 // 解析其他参数
143 - pageSize, _ := controller.GetInt32("pageSize") 143 + pageSize, _ := controller.GetInt64("pageSize")
144 searchCooperationApplicationQuery.PageSize = pageSize 144 searchCooperationApplicationQuery.PageSize = pageSize
145 - pageNumber, _ := controller.GetInt32("pageNumber") 145 + pageNumber, _ := controller.GetInt64("pageNumber")
146 searchCooperationApplicationQuery.PageNumber = pageNumber 146 searchCooperationApplicationQuery.PageNumber = pageNumber
147 data, err := cooperationApplicationService.SearchCooperationApplication(searchCooperationApplicationQuery) 147 data, err := cooperationApplicationService.SearchCooperationApplication(searchCooperationApplicationQuery)
148 controller.Response(data, err) 148 controller.Response(data, err)
@@ -158,9 +158,9 @@ func (controller *CooperationApplicationController) ListCooperationApplication() @@ -158,9 +158,9 @@ func (controller *CooperationApplicationController) ListCooperationApplication()
158 listCooperationApplicationQuery.UserId = header.UserId 158 listCooperationApplicationQuery.UserId = header.UserId
159 listCooperationApplicationQuery.UserBaseId = header.UserBaseId 159 listCooperationApplicationQuery.UserBaseId = header.UserBaseId
160 // 解析其他参数 160 // 解析其他参数
161 - pageSize, _ := controller.GetInt32("pageSize") 161 + pageSize, _ := controller.GetInt64("pageSize")
162 listCooperationApplicationQuery.PageSize = pageSize 162 listCooperationApplicationQuery.PageSize = pageSize
163 - pageNumber, _ := controller.GetInt32("pageNumber") 163 + pageNumber, _ := controller.GetInt64("pageNumber")
164 listCooperationApplicationQuery.PageNumber = pageNumber 164 listCooperationApplicationQuery.PageNumber = pageNumber
165 data, err := cooperationApplicationService.ListCooperationApplication(listCooperationApplicationQuery) 165 data, err := cooperationApplicationService.ListCooperationApplication(listCooperationApplicationQuery)
166 controller.Response(data, err) 166 controller.Response(data, err)
@@ -80,9 +80,9 @@ func (controller *CooperationContractController) SearchCooperationContract() { @@ -80,9 +80,9 @@ func (controller *CooperationContractController) SearchCooperationContract() {
80 searchCooperationContractQuery.OrgId = header.OrgId 80 searchCooperationContractQuery.OrgId = header.OrgId
81 searchCooperationContractQuery.UserId = header.UserId 81 searchCooperationContractQuery.UserId = header.UserId
82 searchCooperationContractQuery.UserBaseId = header.UserBaseId 82 searchCooperationContractQuery.UserBaseId = header.UserBaseId
83 - pageSize, _ := controller.GetInt32("pageSize") 83 + pageSize, _ := controller.GetInt64("pageSize")
84 searchCooperationContractQuery.PageSize = pageSize 84 searchCooperationContractQuery.PageSize = pageSize
85 - pageNumber, _ := controller.GetInt32("pageNumber") 85 + pageNumber, _ := controller.GetInt64("pageNumber")
86 searchCooperationContractQuery.PageNumber = pageNumber 86 searchCooperationContractQuery.PageNumber = pageNumber
87 data, err := cooperationContractService.SearchCooperationContract(searchCooperationContractQuery) 87 data, err := cooperationContractService.SearchCooperationContract(searchCooperationContractQuery)
88 controller.Response(data, err) 88 controller.Response(data, err)
@@ -97,9 +97,9 @@ func (controller *CooperationContractController) SearchCooperationContractByUnde @@ -97,9 +97,9 @@ func (controller *CooperationContractController) SearchCooperationContractByUnde
97 searchCooperationContractByUndertakerQuery.OrgId = header.OrgId 97 searchCooperationContractByUndertakerQuery.OrgId = header.OrgId
98 searchCooperationContractByUndertakerQuery.UserId = header.UserId 98 searchCooperationContractByUndertakerQuery.UserId = header.UserId
99 searchCooperationContractByUndertakerQuery.UserBaseId = header.UserBaseId 99 searchCooperationContractByUndertakerQuery.UserBaseId = header.UserBaseId
100 - pageSize, _ := controller.GetInt32("pageSize") 100 + pageSize, _ := controller.GetInt64("pageSize")
101 searchCooperationContractByUndertakerQuery.PageSize = pageSize 101 searchCooperationContractByUndertakerQuery.PageSize = pageSize
102 - pageNumber, _ := controller.GetInt32("pageNumber") 102 + pageNumber, _ := controller.GetInt64("pageNumber")
103 searchCooperationContractByUndertakerQuery.PageNumber = pageNumber 103 searchCooperationContractByUndertakerQuery.PageNumber = pageNumber
104 data, err := cooperationContractService.SearchCooperationContractByUndertaker(searchCooperationContractByUndertakerQuery) 104 data, err := cooperationContractService.SearchCooperationContractByUndertaker(searchCooperationContractByUndertakerQuery)
105 controller.Response(data, err) 105 controller.Response(data, err)
@@ -114,9 +114,9 @@ func (controller *CooperationContractController) ListCooperationContract() { @@ -114,9 +114,9 @@ func (controller *CooperationContractController) ListCooperationContract() {
114 listCooperationContractQuery.OrgId = header.OrgId 114 listCooperationContractQuery.OrgId = header.OrgId
115 listCooperationContractQuery.UserId = header.UserId 115 listCooperationContractQuery.UserId = header.UserId
116 listCooperationContractQuery.UserBaseId = header.UserBaseId 116 listCooperationContractQuery.UserBaseId = header.UserBaseId
117 - pageSize, _ := controller.GetInt32("pageSize") 117 + pageSize, _ := controller.GetInt64("pageSize")
118 listCooperationContractQuery.PageSize = pageSize 118 listCooperationContractQuery.PageSize = pageSize
119 - pageNumber, _ := controller.GetInt32("pageNumber") 119 + pageNumber, _ := controller.GetInt64("pageNumber")
120 listCooperationContractQuery.PageNumber = pageNumber 120 listCooperationContractQuery.PageNumber = pageNumber
121 data, err := cooperationContractService.ListCooperationContract(listCooperationContractQuery) 121 data, err := cooperationContractService.ListCooperationContract(listCooperationContractQuery)
122 controller.Response(data, err) 122 controller.Response(data, err)
@@ -120,9 +120,9 @@ func (controller *CooperationProjectController) ListCooperationProject() { @@ -120,9 +120,9 @@ func (controller *CooperationProjectController) ListCooperationProject() {
120 listCooperationProjectQuery.OrgId = header.OrgId 120 listCooperationProjectQuery.OrgId = header.OrgId
121 listCooperationProjectQuery.UserId = header.UserId 121 listCooperationProjectQuery.UserId = header.UserId
122 listCooperationProjectQuery.UserBaseId = header.UserBaseId 122 listCooperationProjectQuery.UserBaseId = header.UserBaseId
123 - pageSize, _ := controller.GetInt32("pageSize") 123 + pageSize, _ := controller.GetInt64("pageSize")
124 listCooperationProjectQuery.PageSize = pageSize 124 listCooperationProjectQuery.PageSize = pageSize
125 - pageNumber, _ := controller.GetInt32("pageNumber") 125 + pageNumber, _ := controller.GetInt64("pageNumber")
126 listCooperationProjectQuery.PageNumber = pageNumber 126 listCooperationProjectQuery.PageNumber = pageNumber
127 data, err := cooperationProjectService.ListCooperationProject(listCooperationProjectQuery) 127 data, err := cooperationProjectService.ListCooperationProject(listCooperationProjectQuery)
128 controller.Response(data, err) 128 controller.Response(data, err)
@@ -107,9 +107,9 @@ func (controller *CreditAccountController) ListCreditAccount() { @@ -107,9 +107,9 @@ func (controller *CreditAccountController) ListCreditAccount() {
107 listCreditAccountQuery.OrgId = header.OrgId 107 listCreditAccountQuery.OrgId = header.OrgId
108 listCreditAccountQuery.UserId = header.UserId 108 listCreditAccountQuery.UserId = header.UserId
109 listCreditAccountQuery.UserBaseId = header.UserBaseId 109 listCreditAccountQuery.UserBaseId = header.UserBaseId
110 - pageSize, _ := controller.GetInt32("pageSize") 110 + pageSize, _ := controller.GetInt64("pageSize")
111 listCreditAccountQuery.PageSize = pageSize 111 listCreditAccountQuery.PageSize = pageSize
112 - pageNumber, _ := controller.GetInt32("pageNumber") 112 + pageNumber, _ := controller.GetInt64("pageNumber")
113 listCreditAccountQuery.PageNumber = pageNumber 113 listCreditAccountQuery.PageNumber = pageNumber
114 data, err := creditAccountService.ListCreditAccount(listCreditAccountQuery) 114 data, err := creditAccountService.ListCreditAccount(listCreditAccountQuery)
115 controller.Response(data, err) 115 controller.Response(data, err)
@@ -189,9 +189,9 @@ func (controller *DividendsEstimateController) ListDividendsEstimate() { @@ -189,9 +189,9 @@ func (controller *DividendsEstimateController) ListDividendsEstimate() {
189 listDividendsEstimateQuery.OrgId = header.OrgId 189 listDividendsEstimateQuery.OrgId = header.OrgId
190 listDividendsEstimateQuery.UserId = header.UserId 190 listDividendsEstimateQuery.UserId = header.UserId
191 listDividendsEstimateQuery.UserBaseId = header.UserBaseId 191 listDividendsEstimateQuery.UserBaseId = header.UserBaseId
192 - pageSize, _ := controller.GetInt32("pageSize") 192 + pageSize, _ := controller.GetInt64("pageSize")
193 listDividendsEstimateQuery.PageSize = pageSize 193 listDividendsEstimateQuery.PageSize = pageSize
194 - pageNumber, _ := controller.GetInt32("pageNumber") 194 + pageNumber, _ := controller.GetInt64("pageNumber")
195 listDividendsEstimateQuery.PageNumber = pageNumber 195 listDividendsEstimateQuery.PageNumber = pageNumber
196 data, err := dividendsEstimateService.ListDividendsEstimate(listDividendsEstimateQuery) 196 data, err := dividendsEstimateService.ListDividendsEstimate(listDividendsEstimateQuery)
197 controller.Response(data, err) 197 controller.Response(data, err)
@@ -106,9 +106,9 @@ func (controller *DividendsOrderController) ListDividendsOrders() { @@ -106,9 +106,9 @@ func (controller *DividendsOrderController) ListDividendsOrders() {
106 listDividendsOrdersQuery.OrgId = header.OrgId 106 listDividendsOrdersQuery.OrgId = header.OrgId
107 listDividendsOrdersQuery.UserId = header.UserId 107 listDividendsOrdersQuery.UserId = header.UserId
108 listDividendsOrdersQuery.UserBaseId = header.UserBaseId 108 listDividendsOrdersQuery.UserBaseId = header.UserBaseId
109 - pageSize, _ := controller.GetInt32("pageSize") 109 + pageSize, _ := controller.GetInt64("pageSize")
110 listDividendsOrdersQuery.PageSize = pageSize 110 listDividendsOrdersQuery.PageSize = pageSize
111 - pageNumber, _ := controller.GetInt32("pageNumber") 111 + pageNumber, _ := controller.GetInt64("pageNumber")
112 listDividendsOrdersQuery.PageNumber = pageNumber 112 listDividendsOrdersQuery.PageNumber = pageNumber
113 data, err := dividendsOrderService.ListDividendsOrders(listDividendsOrdersQuery) 113 data, err := dividendsOrderService.ListDividendsOrders(listDividendsOrdersQuery)
114 controller.Response(data, err) 114 controller.Response(data, err)
@@ -107,9 +107,9 @@ func (controller *DividendsReturnedOrderController) ListDividendsReturnedOrder() @@ -107,9 +107,9 @@ func (controller *DividendsReturnedOrderController) ListDividendsReturnedOrder()
107 listDividendsReturnedOrderQuery.OrgId = header.OrgId 107 listDividendsReturnedOrderQuery.OrgId = header.OrgId
108 listDividendsReturnedOrderQuery.UserId = header.UserId 108 listDividendsReturnedOrderQuery.UserId = header.UserId
109 listDividendsReturnedOrderQuery.UserBaseId = header.UserBaseId 109 listDividendsReturnedOrderQuery.UserBaseId = header.UserBaseId
110 - pageSize, _ := controller.GetInt32("pageSize") 110 + pageSize, _ := controller.GetInt64("pageSize")
111 listDividendsReturnedOrderQuery.PageSize = pageSize 111 listDividendsReturnedOrderQuery.PageSize = pageSize
112 - pageNumber, _ := controller.GetInt32("pageNumber") 112 + pageNumber, _ := controller.GetInt64("pageNumber")
113 listDividendsReturnedOrderQuery.PageNumber = pageNumber 113 listDividendsReturnedOrderQuery.PageNumber = pageNumber
114 data, err := dividendsReturnedOrderService.ListDividendsReturnedOrder(listDividendsReturnedOrderQuery) 114 data, err := dividendsReturnedOrderService.ListDividendsReturnedOrder(listDividendsReturnedOrderQuery)
115 controller.Response(data, err) 115 controller.Response(data, err)