Skip to content

D
DataCenter_Core2.1_20190520
Commit bfaf066f by jianshuqin
Options

优化:组件功能

parent 1906be4a
Showing with 4 additions and 4 deletions
Bailun.DC.Services/Component/BaseService.cs
...@@ -169,7 +169,7 @@ namespace Bailun.DC.Services.Component ...@@ -169,7 +169,7 @@ namespace Bailun.DC.Services.Component
string value = table.Rows[row][header.Name]?.ToString(); string value = table.Rows[row][header.Name]?.ToString();
if (!string.IsNullOrWhiteSpace(value)) if (!string.IsNullOrWhiteSpace(value))
{ {
if (header.Format == true) if (header.Format is bool && header.Format == true)
{ {
if (value.Equals("true", StringComparison.OrdinalIgnoreCase) || value == "1") if (value.Equals("true", StringComparison.OrdinalIgnoreCase) || value == "1")
{ {
...@@ -185,7 +185,7 @@ namespace Bailun.DC.Services.Component ...@@ -185,7 +185,7 @@ namespace Bailun.DC.Services.Component
DateTime parseTime = DateTime.Now; DateTime parseTime = DateTime.Now;
if (DateTime.TryParse(value, out parseTime)) if (DateTime.TryParse(value, out parseTime))
{ {
value = parseTime.ToString(header.Format); value = parseTime.ToString(header.Format.Replace("hh", "HH"));
} }
} }
dataRow.CreateCell(col).SetCellValue(value); dataRow.CreateCell(col).SetCellValue(value);
...@@ -272,7 +272,7 @@ namespace Bailun.DC.Services.Component ...@@ -272,7 +272,7 @@ namespace Bailun.DC.Services.Component
string value = reader[header.Prop]?.ToString(); string value = reader[header.Prop]?.ToString();
if (!string.IsNullOrWhiteSpace(value)) if (!string.IsNullOrWhiteSpace(value))
{ {
if (header.Format == true) if (header.Format is bool && header.Format == true)
{ {
if (value.Equals("true", StringComparison.OrdinalIgnoreCase) || value == "1") if (value.Equals("true", StringComparison.OrdinalIgnoreCase) || value == "1")
{ {
...@@ -288,7 +288,7 @@ namespace Bailun.DC.Services.Component ...@@ -288,7 +288,7 @@ namespace Bailun.DC.Services.Component
DateTime parseTime = DateTime.Now; DateTime parseTime = DateTime.Now;
if (DateTime.TryParse(value, out parseTime)) if (DateTime.TryParse(value, out parseTime))
{ {
value = parseTime.ToString(header.Format); value = parseTime.ToString(header.Format.Replace("hh", "HH"));
} }
} }
dataRow.CreateCell(col).SetCellValue(value.ToString()); dataRow.CreateCell(col).SetCellValue(value.ToString());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment