api/admin_views.py

@@ -445,7 +445,7 @@ def statistic_consumer(request):

                             daily_logs[i]['code2'] = daily_code2_logs[k]['num']
              

                             k += 1
              

                 
              

                -    model_logs = list(logs.values('model_uni_name').annotate(num=Count('pk')).order_by('-num'))
              

                +    model_logs = list(logs.values('model_uni_name').annotate(num=Count('pk')).order_by('model_uni_name'))
              

                     model_code1_logs = list(logs.filter(code_version=1).values('model_uni_name').annotate(num=Count('pk')).order_by('model_uni_name'))
              

                     model_code2_logs = list(logs.filter(code_version=2).values('model_uni_name').annotate(num=Count('pk')).order_by('model_uni_name'))
              

                 
              
@@ -461,6 +461,8 @@ def statistic_consumer(request):

                         if k < len(model_code2_logs) and model_logs[i]['model_uni_name'] == model_code2_logs[k]['model_uni_name']:
              

                             model_logs[i]['code2'] = model_code2_logs[k]['num']
              

                             k += 1
              

                +    
              

                +    model_logs.sort(key=lambda k: (-k['num']))
              

                 
              

                     province_logs = list(logs.values('province').annotate(num=Count('pk')).order_by('province'))
              

                     province_code1_logs = list(logs.filter(code_version=1).values('province').annotate(num=Count('pk')).order_by('province'))
              
@@ -478,6 +480,8 @@ def statistic_consumer(request):

                         if k < len(province_code2_logs) and province_logs[i]['province'] == province_code2_logs[k]['province']:
              

                             province_logs[i]['code2'] = province_code2_logs[k]['num']
              

                             k += 1
              

                +    
              

                +    province_logs.sort(key=lambda k: (-k['num']))
              

                 
              

                     return response(200, 'Get Consumer Statistic Success', u'获取消费者统计成功', data={
              

                         'daily_logs': daily_logs,