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

转到一个项目

作者 陈志颖
提交 f5e92fa5e97dea866a9b311d01b54cbbe36354d4 2 个父辈 a18e8972 aa4456e5

合并分支 'dev' 到 'test' 

fix:去除批量操作查询限制



查看合并请求 !56
内嵌 并排对比
正在显示 6 个修改的文件 包含 13 行增加 和 0 行删除
@@ -24,6 +24,8 @@ type OneClickApprovalCooperationApplicationCommand struct { @@ -24,6 +24,8 @@ type OneClickApprovalCooperationApplicationCommand struct {
24 Action int32 `cname:"审核动作" json:"action" valid:"Required"` 24 Action int32 `cname:"审核动作" json:"action" valid:"Required"`
25 // 审核状态 25 // 审核状态
26 CooperationApplicationStatus int32 `cname:"共创申请审核状态" json:"cooperationApplicationStatus"` 26 CooperationApplicationStatus int32 `cname:"共创申请审核状态" json:"cooperationApplicationStatus"`
  27 + // 查询限制
  28 + OffsetLimit bool `cname:"查询限制" json:"offsetLimit"`
27 } 29 }
28 30
29 func (oneClickApprovalCooperationApplicationCommand *OneClickApprovalCooperationApplicationCommand) Valid(validation *validation.Validation) { 31 func (oneClickApprovalCooperationApplicationCommand *OneClickApprovalCooperationApplicationCommand) Valid(validation *validation.Validation) {
@@ -371,6 +371,7 @@ func (cooperationApplicationService *CooperationApplicationService) BatchApprova @@ -371,6 +371,7 @@ func (cooperationApplicationService *CooperationApplicationService) BatchApprova
371 // 获取共创申请 371 // 获取共创申请
372 if count, cooperationApplications, err := cooperationApplicationRepository.Find(map[string]interface{}{ 372 if count, cooperationApplications, err := cooperationApplicationRepository.Find(map[string]interface{}{
373 "cooperationApplicationIds": cooperationApplicationIds, 373 "cooperationApplicationIds": cooperationApplicationIds,
  374 + "offsetLimit": false,
374 }); err != nil { 375 }); err != nil {
375 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 376 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
376 } else { 377 } else {
@@ -451,6 +452,7 @@ func (cooperationApplicationService *CooperationApplicationService) OneClickAppr @@ -451,6 +452,7 @@ func (cooperationApplicationService *CooperationApplicationService) OneClickAppr
451 452
452 // 查询共创申请 453 // 查询共创申请
453 oneClickApprovalCooperationApplicationCommand.CooperationApplicationStatus = 1 // 待审核 454 oneClickApprovalCooperationApplicationCommand.CooperationApplicationStatus = 1 // 待审核
  455 + oneClickApprovalCooperationApplicationCommand.OffsetLimit = false
454 if count, cooperationApplications, err := cooperationApplicationRepository.Find(tool_funs.SimpleStructToMap(oneClickApprovalCooperationApplicationCommand)); err != nil { 456 if count, cooperationApplications, err := cooperationApplicationRepository.Find(tool_funs.SimpleStructToMap(oneClickApprovalCooperationApplicationCommand)); err != nil {
455 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 457 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
456 } else { 458 } else {
@@ -561,6 +561,7 @@ func (cooperationContractService *CooperationContractService) BatchRemoveCoopera @@ -561,6 +561,7 @@ func (cooperationContractService *CooperationContractService) BatchRemoveCoopera
561 cooperationContractIds, _ := utils.SliceAtoi(batchRemoveCooperationContractCommand.CooperationContractIds) 561 cooperationContractIds, _ := utils.SliceAtoi(batchRemoveCooperationContractCommand.CooperationContractIds)
562 if count, cooperationContracts, err := cooperationContractRepository.Find(map[string]interface{}{ 562 if count, cooperationContracts, err := cooperationContractRepository.Find(map[string]interface{}{
563 "cooperationContractIds": cooperationContractIds, 563 "cooperationContractIds": cooperationContractIds,
  564 + "offsetLimit": false,
564 }); err != nil { 565 }); err != nil {
565 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 566 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
566 } else { 567 } else {
@@ -737,6 +738,7 @@ func (cooperationContractService *CooperationContractService) BatchOperateCooper @@ -737,6 +738,7 @@ func (cooperationContractService *CooperationContractService) BatchOperateCooper
737 } 738 }
738 if count, cooperationContracts, err := cooperationContractRepository.Find(map[string]interface{}{ 739 if count, cooperationContracts, err := cooperationContractRepository.Find(map[string]interface{}{
739 "cooperationContractIds": cooperationContractIds, 740 "cooperationContractIds": cooperationContractIds,
  741 + "offsetLimit": false,
740 }); err != nil { 742 }); err != nil {
741 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 743 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
742 } else { 744 } else {
@@ -328,6 +328,7 @@ func (cooperationModeService *CooperationModeService) BatchRemoveCooperationMode @@ -328,6 +328,7 @@ func (cooperationModeService *CooperationModeService) BatchRemoveCooperationMode
328 // 获取共创模式 328 // 获取共创模式
329 if count, cooperationModes, err := cooperationModeRepository.Find(map[string]interface{}{ 329 if count, cooperationModes, err := cooperationModeRepository.Find(map[string]interface{}{
330 "cooperationModeIds": cooperationModeIds, 330 "cooperationModeIds": cooperationModeIds,
  331 + "offsetLimit": false,
331 }); err != nil { 332 }); err != nil {
332 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 333 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
333 } else { 334 } else {
@@ -766,6 +766,7 @@ func (cooperationProjectService *CooperationProjectService) BatchEndCooperationP @@ -766,6 +766,7 @@ func (cooperationProjectService *CooperationProjectService) BatchEndCooperationP
766 } 766 }
767 if count, cooperationProjects, err := cooperationProjectRepository.Find(map[string]interface{}{ 767 if count, cooperationProjects, err := cooperationProjectRepository.Find(map[string]interface{}{
768 "cooperationProjectIds": cooperationProjectIds, 768 "cooperationProjectIds": cooperationProjectIds,
  769 + "offsetLimit": false,
769 }); err != nil { 770 }); err != nil {
770 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 771 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
771 } else { 772 } else {
@@ -343,6 +343,7 @@ func (dividendsEstimateService *DividendsEstimateService) BatchCancelDividendsEs @@ -343,6 +343,7 @@ func (dividendsEstimateService *DividendsEstimateService) BatchCancelDividendsEs
343 // 获取分红预算 343 // 获取分红预算
344 if count, dividendsEstimates, err := dividendsEstimateRepository.Find(map[string]interface{}{ 344 if count, dividendsEstimates, err := dividendsEstimateRepository.Find(map[string]interface{}{
345 "dividendsEstimateIds": dividendsEstimateIds, 345 "dividendsEstimateIds": dividendsEstimateIds,
  346 + "offsetLimit": false,
346 }); err != nil { 347 }); err != nil {
347 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 348 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
348 } else { 349 } else {
@@ -660,6 +661,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent @@ -660,6 +661,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
660 // 获取订单产品 661 // 获取订单产品
661 if _, orderGoods, err := orderGoodRepository.Find(map[string]interface{}{ 662 if _, orderGoods, err := orderGoodRepository.Find(map[string]interface{}{
662 "orderGoodIds": orderGoodIds, 663 "orderGoodIds": orderGoodIds,
  664 + "offsetLimit": false,
663 }); err != nil { 665 }); err != nil {
664 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 666 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
665 } else { 667 } else {
@@ -810,6 +812,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent @@ -810,6 +812,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
810 if len(orderGoodSavedIds) > 0 { 812 if len(orderGoodSavedIds) > 0 {
811 if countOrderGood, orderGoodsFound, err := orderGoodRepository.Find(map[string]interface{}{ 813 if countOrderGood, orderGoodsFound, err := orderGoodRepository.Find(map[string]interface{}{
812 "orderGoodIds": orderGoodSavedIds, 814 "orderGoodIds": orderGoodSavedIds,
  815 + "offsetLimit": false,
813 }); err != nil { 816 }); err != nil {
814 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 817 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
815 } else { 818 } else {
@@ -854,6 +857,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent @@ -854,6 +857,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
854 "dividendsOrderNumbers": dividendsOrderNumbers, 857 "dividendsOrderNumbers": dividendsOrderNumbers,
855 "companyId": confirmDividendsIncentivesEstimateCommand.CompanyId, 858 "companyId": confirmDividendsIncentivesEstimateCommand.CompanyId,
856 "orgId": confirmDividendsIncentivesEstimateCommand.OrgId, 859 "orgId": confirmDividendsIncentivesEstimateCommand.OrgId,
  860 + "offsetLimit": false,
857 }); err != nil { 861 }); err != nil {
858 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 862 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
859 } else { 863 } else {
@@ -897,6 +901,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent @@ -897,6 +901,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
897 "dividendsReturnedOrderNumbers": dividendsReturnedOrderNumbers, 901 "dividendsReturnedOrderNumbers": dividendsReturnedOrderNumbers,
898 "companyId": confirmDividendsIncentivesEstimateCommand.CompanyId, 902 "companyId": confirmDividendsIncentivesEstimateCommand.CompanyId,
899 "orgId": confirmDividendsIncentivesEstimateCommand.OrgId, 903 "orgId": confirmDividendsIncentivesEstimateCommand.OrgId,
  904 + "offsetLimit": false,
900 }); err != nil { 905 }); err != nil {
901 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 906 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
902 } else { 907 } else {