Merge remote-tracking branch 'origin/master'

apps/wxapp/repair_order/serializers.py

@@ -14,6 +14,14 @@ class RepairOrderDetailSerializer(serializers.ModelSerializer):
     images = serializers.SerializerMethodField()
     repair_type_name = serializers.CharField(source='repair_type.name', read_only=True)
     create_at = DelayTimeCharField(source='create_time', read_only=True)
+    start = serializers.SerializerMethodField()
+
+    def get_start(self, obj):
+        if obj.status == settings.APPRAISE:
+            repair_order_comment = RepairOrderComment.objects.filter(repair_order=obj).first()
+            if repair_order_comment:
+                return repair_order_comment.start
+        return 0
 
     def get_images(self, obj):
         return UploadSerializer(obj.images, many=True).data
@@ -22,7 +30,7 @@ class RepairOrderDetailSerializer(serializers.ModelSerializer):
         model = RepairOrder
         fields = (
             'id', 'status_text', 'status', 'no', 'fault_des', 'tel', 'name', 'create_at', 'device_address',
-            'repair_type_name', 'images', 'user_id')
+            'repair_type_name', 'images', 'user_id', 'start')
 
 
 class RepairOrderListSerializer(serializers.ModelSerializer):