zhouj1203@hotmail.com hai 1 ano
pai
achega
aaabcb6111

+ 1 - 1
TEAMModelOS.SDK/Helper/Common/DateTimeHelper/DateTimeHelper.cs

@@ -58,7 +58,7 @@ namespace TEAMModelOS.SDK
             //处理UTC时差
             TimeZoneInfo localTimezone = TimeZoneInfo.Local;
             var Hours = localTimezone.BaseUtcOffset.Hours;
-            dateTime = dateTime.AddHours(GMT - Hours);
+            dateTime = dateTime.AddHours(Hours - GMT);
             return dateTime;
         }
 

+ 7 - 7
TEAMModelOS/Controllers/Analysis/ClassAnalysisController.cs

@@ -663,13 +663,13 @@ namespace TEAMModelOS.Controllers.Analysis
                 }
 
 
-                DateTimeOffset now = DateTimeOffset.UtcNow.GetUTCTime(TimeZone);
+                //DateTimeOffset now = DateTimeOffset.UtcNow.GetUTCTime(TimeZone);
 
                 List<string> classes = await getStudentsAsync(pId.GetString(), client, "Class", "School");
                 if (records.Count > 0)
                 {
-                    var sTime = now.ToUnixTimeMilliseconds();
-                    var time = now.ToString("yyyy-MM-dd");
+                    var sTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+                    var time = DateTimeOffset.UtcNow.ToString("yyyy-MM-dd");
                     var today = DateTimeHelper.FromUnixTimestamp(sTime);
                     DateTime startWeek = today.AddDays(1 - Convert.ToInt32(today.DayOfWeek.ToString("d")));
                     DateTime startMonth = today.AddDays(1 - today.Day);  //本月月初
@@ -681,10 +681,10 @@ namespace TEAMModelOS.Controllers.Analysis
                     string wst = string.Format("{0}{1}{2}", wwt, " ", "00:00:00");
                     string mst = string.Format("{0}{1}{2}", mmt, " ", "00:00:00");
                     string est = string.Format("{0}{1}{2}", time, " ", "23:59:59");
-                    var tt = DateTimeOffset.Parse(sst).ToUnixTimeMilliseconds();
-                    var weekstime = DateTimeOffset.Parse(wst).ToUnixTimeMilliseconds();
-                    var monthstime = DateTimeOffset.Parse(mst).ToUnixTimeMilliseconds();
-                    var endtime = DateTimeOffset.Parse(est).ToUnixTimeMilliseconds();
+                    var tt = DateTimeOffset.Parse(sst).GetUTCTime(TimeZone).ToUnixTimeMilliseconds();
+                    var weekstime = DateTimeOffset.Parse(wst).GetUTCTime(TimeZone).ToUnixTimeMilliseconds();
+                    var monthstime = DateTimeOffset.Parse(mst).GetUTCTime(TimeZone).ToUnixTimeMilliseconds();
+                    var endtime = DateTimeOffset.Parse(est).GetUTCTime(TimeZone).ToUnixTimeMilliseconds();
                     var response = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemStreamAsync(code.GetString(), new PartitionKey($"Base"));
                     School sc = new School();
                     if (response.Status == 200)