Merge remote-tracking branch 'remotes/origin/dev' into test

Controller/StatisticsController.py

@@ -204,20 +204,16 @@ def statistcsPushMonth(request):
     if token.code != 0:
         return response.json(token.code)
 
-    localtime = time.localtime()
-    current_month = localtime.tm_mon
+    gmtime = time.gmtime(int(time.time()) + 28800)
+    current_month = gmtime.tm_mon - 1
     print(current_month)
 
-    distance_time = 8 * 60 * 60
-
-    time_struct = [localtime.tm_year, localtime.tm_mon, 1, 0, 0, 0, 0, 0, 0]
-    start_time = int(time.mktime(tuple(time_struct)))
-    start_time = start_time - time.timezone - distance_time
+    time_struct = [gmtime.tm_year, current_month, 1, 0, 0, 0, 0, 0, gmtime.tm_isdst]
+    start_time = int(time.mktime(tuple(time_struct))) - 28800
     print(start_time)
 
     time_struct[1] = current_month + 1
-    end_time = int(time.mktime(tuple(time_struct)))
-    end_time = end_time - time.timezone - distance_time
+    end_time = int(time.mktime(tuple(time_struct))) - 28800
     print(end_time)
 
     eq_qs = EquipmentInfoExStatisticsModel.objects.filter(statistics_date__gte=start_time, statistics_date__lte=end_time, date_type=0)