XCKJ/irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改导表日期处理

Browse Source
This commit is contained in:
hang
2024-11-11 12:23:58 +08:00
parent 4d4af84716
commit 28587c8e91
4 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Infrastructure/Extention/ExportExcelDateConverter.cs
+18 -9
View File
@@ -19,7 +19,7 @@ namespace IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson
}
public override bool CanConvert(Type objectType)
{
return objectType == typeof(DateTime) || objectType == typeof(DateTime?);
}
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
@@ -37,7 +37,7 @@ namespace IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson
writer.WriteNull();
}
}
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
@@ -58,7 +58,7 @@ namespace IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson
}
public class ExportExcelConverterDate
public class ExportExcelConverterDate
{
public static T ConvertToClientTimeInObject<T>(T obj, string timeZoneId)
{
@@ -67,7 +67,7 @@ namespace IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson
return obj;
// 将对象序列化为 JSON 字符串
string json = JsonConvert.SerializeObject(obj,new JsonSerializerSettings() { DateFormatString= "yyyy-MM-dd HH:mm:ss.fff" });
string json = JsonConvert.SerializeObject(obj, new JsonSerializerSettings() { DateFormatString = "yyyy-MM-dd HH:mm:ss.fff" });
// 将 JSON 字符串反序列化回对象
var deserializedObj = JsonConvert.DeserializeObject<T>(json, new JsonSerializerSettings
@@ -80,7 +80,7 @@ namespace IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson
return deserializedObj!;
}
public static string DateTimeInternationalToString(DateTime? dateTime, string? clientZoneId=null)
public static string DateTimeInternationalToString(DateTime? dateTime, string? clientZoneId = null)
{
var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
@@ -94,15 +94,24 @@ namespace IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson
needDealTime = TimeZoneInfo.ConvertTime(needDealTime, TimeZoneInfo.Local, TimeZoneInfo.FindSystemTimeZoneById(clientZoneId));
}
if (isEn_US)
if (needDealTime.Hour == 0 && needDealTime.Minute == 0 && needDealTime.Second == 0)
{
//暂时保持一致，等需求确认，修改英文要展示的日期格式
return needDealTime.ToString("yyyy-MM-dd HH:mm:ss");
return needDealTime.ToString("yyyy-MM-dd");
}
else
{
return needDealTime.ToString("yyyy-MM-dd HH:mm:ss");
if (isEn_US)
{
//暂时保持一致，等需求确认，修改英文要展示的日期格式
return needDealTime.ToString("yyyy-MM-dd HH:mm:ss");
}
else
{
return needDealTime.ToString("yyyy-MM-dd HH:mm:ss");
}
}
}
else
{