hujingpei 4 年 前
コミット
f823223ca5
3 ファイル変更8 行追加2 行削除
  1. 3 2
      apps/customer/filters.py
  2. 1 0
      apps/customer/serializers.py
  3. 4 0
      apps/customer/views.py

+ 3 - 2
apps/customer/filters.py

@@ -3,6 +3,7 @@ import django_filters
 
 from .models import ReportCustomer, NewCustomer, Review
 
+
 class ReportCustomerFilter(django_filters.FilterSet):
     name = django_filters.CharFilter(field_name='name', lookup_expr='icontains')
     tel = django_filters.CharFilter(field_name='tel', lookup_expr='icontains')
@@ -13,8 +14,8 @@ class ReportCustomerFilter(django_filters.FilterSet):
 
 
 class NewCustomerFilter(django_filters.FilterSet):
-    name = django_filters.CharFilter(field_name='report_customer__name', lookup_expr='icontains')
-    tel = django_filters.CharFilter(field_name='report_customer__tel', lookup_expr='icontains')
+    name = django_filters.CharFilter(field_name='name', lookup_expr='icontains')
+    tel = django_filters.CharFilter(field_name='tel', lookup_expr='icontains')
 
     class Meta:
         model = NewCustomer

+ 1 - 0
apps/customer/serializers.py

@@ -127,6 +127,7 @@ class ReviewSerializer(serializers.ModelSerializer):
     tel = serializers.CharField(source='customer.tel', read_only=True)
     village = serializers.CharField(source='customer.village', read_only=True)
     address = serializers.CharField(source='customer.address', read_only=True)
+    stage_progress_text = serializers.CharField(source='customer.stage_progress.name', read_only=True)
     project_text = serializers.SerializerMethodField()
 
     def get_project_text(self, obj):

+ 4 - 0
apps/customer/views.py

@@ -19,6 +19,7 @@ from .filters import ReportCustomerFilter,NewCustomerFilter,ReviewFilter
 from django.contrib.auth import get_user_model
 User = get_user_model()
 
+
 class ReportCustomerViewSet(CustomModelViewSet):
     permission_classes = [isLogin]
     queryset = ReportCustomer.objects.filter()
@@ -110,6 +111,7 @@ class ReportCustomerDictView(APIView):
             'level': serializer_level.data,
         })
 
+
 class UserDictView(APIView):
     permission_classes = [isLogin]
 
@@ -194,6 +196,7 @@ class NewCustomerViewSet(CustomModelViewSet):
             return response_error(str(e))
         return response_ok()
 
+
 class StageCountView(APIView):
     permission_classes = [isLogin]
 
@@ -216,6 +219,7 @@ class StageCountView(APIView):
             data.append(stage_count)
         return response_ok(data)
 
+
 class ReviewViewSet(CustomModelViewSet):
     permission_classes = [isLogin]
     queryset = Review.objects.filter()