更新activity_contribute_list 筛选逻辑
1 gewijzigde bestanden met toevoegingen van 10 en 6 verwijderingen
+ 10
- 6
api/member_views.py
@@ -551,16 +551,20 @@ def activity_contribute_list(request): |
||
| 551 | 551 |
activity_id = request.POST.get('activity_id', '')
|
| 552 | 552 |
content_type = get_query_value(request, 'content_type', val_cast_type='int') |
| 553 | 553 |
is_selected = get_query_value(request, 'is_selected', val_cast_type='int') |
| 554 |
+ is_myself = get_query_value(request, 'is_myself', val_cast_type='int') |
|
| 555 |
+ is_audit_pass = get_query_value(request, 'is_audit_pass', val_cast_type='int') |
|
| 554 | 556 |
page = request.POST.get('page', 1)
|
| 555 | 557 |
num = request.POST.get('num', 20)
|
| 556 | 558 |
|
| 557 |
- contributions = MemberActivityContributionInfo.objects.filter(content_type=content_type, is_audit_pass=True, status=True) |
|
| 558 |
- if user_id: |
|
| 559 |
+ contributions = MemberActivityContributionInfo.objects.filter(activity_id=activity_id, status=True) |
|
| 560 |
+ if content_type != '': |
|
| 561 |
+ contributions.filter(content_type=content_type) |
|
| 562 |
+ if is_audit_pass != '': |
|
| 563 |
+ contributions = contributions.filter(is_audit_pass=is_audit_pass) |
|
| 564 |
+ if is_myself: |
|
| 559 | 565 |
contributions = contributions.filter(user_id=user_id) |
| 560 |
- if activity_id: |
|
| 561 |
- contributions = contributions.filter(activity_id=activity_id) |
|
| 562 |
- if is_selected: |
|
| 563 |
- contributions = contributions.filter(is_selected=True) |
|
| 566 |
+ if is_selected != '': |
|
| 567 |
+ contributions = contributions.filter(is_selected=is_selected) |
|
| 564 | 568 |
contributions = contributions.order_by('-pk')
|
| 565 | 569 |
contributions, left = pagination(contributions, page, num) |
| 566 | 570 |
contributions = [contribution.data for contribution in contributions] |