评价

apps/tenant/repair_order/models.py

@@ -256,7 +256,9 @@ class RepairOrderComment(models.Model):
                                      related_name='repair_order_comment')
     content = models.CharField(max_length=200, verbose_name='评价内容')
     user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=u"评价人", on_delete=models.PROTECT,
-                             editable=False)
+                             related_name='comment_user', editable=False)
+    repair_user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=u"维修人", on_delete=models.PROTECT,
+                                    related_name='comment_repair_user',editable=False)
     start = models.PositiveSmallIntegerField(verbose_name='评分', default=5)
     create_time = models.DateTimeField(verbose_name='评价时间', auto_now_add=True)
 

apps/wxapp/repair_order/views.py

@@ -264,7 +264,7 @@ class RepairOrderViewSet(CustomModelViewSet):
             with transaction.atomic():
                 instance.status = settings.APPRAISE
                 instance.save()
-                RepairOrderComment.objects.create(repair_order=instance, content=content, start=start, user=user)
+                RepairOrderComment.objects.create(repair_order=instance, content=content, start=start, user=user, repair_user=instance.repair_users)
                 # 增加工单记录
                 RepairOrderRecord.objects.create(repair_order_id=pk, status=settings.APPRAISE, user=user)
         except CustomError as e:

apps/wxapp/views.py

@@ -182,13 +182,14 @@ class StatisticsEvaluateView(APIView):
         tenant = request.user.employee.tenant
         now = timezone.now()
         date = (now + datetime.timedelta(days=-days)).strftime('%Y-%m-%d')
+        # 分组统计分析
         rows = RepairOrderComment.objects.filter(repair_order__tenant=tenant,create_time__gte=date,) \
-            .values('user_id') \
+            .values('repair_user_id') \
             .annotate(count=Sum('start')) \
-            .values('user__employee__name', 'count')
+            .values('repair_user__employee__name', 'count')
         for row in rows:
             item = {
-                'title':row['user__employee__name'],
+                'title':row['repair_user__employee__name'],
                 'data':row['count'],
             }
             data.append(item)