优化导出excel时数字类型的转换

cq-panda · cq-panda · commit 7ff53afb6583 · 2021-04-05T10:56:49.000+08:00
diff --git a/Vue.Net/VOL.Core/Utilities/EPPlusHelper.cs b/Vue.Net/VOL.Core/Utilities/EPPlusHelper.cs
@@ -396,29 +396,29 @@ IEnumerable<string> GetListValues(string cellValues, string propertyName)
                 {
                     for (int j = 0; j < propertyInfo.Count; j++)
                     {
-                        string cellValue = null;
+                        object cellValue = null;
                         if (dateArr != null && dateArr.Contains(propertyInfo[j].Name))
                         {
                             object value = propertyInfo[j].GetValue(list[i]);
                             cellValue = value == null ? "" : ((DateTime)value).ToString("yyyy-MM-dd HH:mm:sss").Replace(" 00:00:00", "");
                         }
                         else
                         {
-                            cellValue = (propertyInfo[j].GetValue(list[i]) ?? "").ToString();
+                            cellValue = propertyInfo[j].GetValue(list[i]);
                         }
-                        if (dicNoKeys.Exists(x => x.ColumnName == propertyInfo[j].Name))
+                        if (cellValue!=null&&dicNoKeys.Exists(x => x.ColumnName == propertyInfo[j].Name))
                         {
                             //2021.01.24修复多选类型，导出excel文件没有转换数据源的问题
                             if (selectList.Contains(propertyInfo[j].Name))
                             {
-                                cellValue = string.Join(",", GetListValues(cellValue, propertyInfo[j].Name));
+                                cellValue = string.Join(",", GetListValues(cellValue.ToString(), propertyInfo[j].Name));
                             }
                             else
                             {
                                 cellOptions.Where(x => x.ColumnName == propertyInfo[j].Name)
                             .Select(s => s.KeyValues)
                             .FirstOrDefault()
-                            .TryGetValue(cellValue, out string result);
+                            .TryGetValue(cellValue.ToString(), out string result);
                                 cellValue = result ?? cellValue;
                             }
 
diff --git a/开发版dev/Vue.NetCore/Vue.Net/VOL.Core/Utilities/EPPlusHelper.cs b/开发版dev/Vue.NetCore/Vue.Net/VOL.Core/Utilities/EPPlusHelper.cs
@@ -396,29 +396,29 @@ IEnumerable<string> GetListValues(string cellValues, string propertyName)
                 {
                     for (int j = 0; j < propertyInfo.Count; j++)
                     {
-                        string cellValue = null;
+                        object cellValue = null;
                         if (dateArr != null && dateArr.Contains(propertyInfo[j].Name))
                         {
                             object value = propertyInfo[j].GetValue(list[i]);
                             cellValue = value == null ? "" : ((DateTime)value).ToString("yyyy-MM-dd HH:mm:sss").Replace(" 00:00:00", "");
                         }
                         else
                         {
-                            cellValue = (propertyInfo[j].GetValue(list[i]) ?? "").ToString();
+                            cellValue = propertyInfo[j].GetValue(list[i]);
                         }
-                        if (dicNoKeys.Exists(x => x.ColumnName == propertyInfo[j].Name))
+                        if (cellValue!=null&&dicNoKeys.Exists(x => x.ColumnName == propertyInfo[j].Name))
                         {
                             //2021.01.24修复多选类型，导出excel文件没有转换数据源的问题
                             if (selectList.Contains(propertyInfo[j].Name))
                             {
-                                cellValue = string.Join(",", GetListValues(cellValue, propertyInfo[j].Name));
+                                cellValue = string.Join(",", GetListValues(cellValue.ToString(), propertyInfo[j].Name));
                             }
                             else
                             {
                                 cellOptions.Where(x => x.ColumnName == propertyInfo[j].Name)
                             .Select(s => s.KeyValues)
                             .FirstOrDefault()
-                            .TryGetValue(cellValue, out string result);
+                            .TryGetValue(cellValue.ToString(), out string result);
                                 cellValue = result ?? cellValue;
                             }
 

Original file line number	Diff line number	Diff line change
`@@ -396,29 +396,29 @@ IEnumerable<string> GetListValues(string cellValues, string propertyName)`
`396`	`396`	`{`
`397`	`397`	`for (int j = 0; j < propertyInfo.Count; j++)`
`398`	`398`	`{`
`399`		`- string cellValue = null;`
	`399`	`+ object cellValue = null;`
`400`	`400`	`if (dateArr != null && dateArr.Contains(propertyInfo[j].Name))`
`401`	`401`	`{`
`402`	`402`	`object value = propertyInfo[j].GetValue(list[i]);`
`403`	`403`	`cellValue = value == null ? "" : ((DateTime)value).ToString("yyyy-MM-dd HH:mm:sss").Replace(" 00:00:00", "");`
`404`	`404`	`}`
`405`	`405`	`else`
`406`	`406`	`{`
`407`		`- cellValue = (propertyInfo[j].GetValue(list[i]) ?? "").ToString();`
	`407`	`+ cellValue = propertyInfo[j].GetValue(list[i]);`
`408`	`408`	`}`
`409`		`- if (dicNoKeys.Exists(x => x.ColumnName == propertyInfo[j].Name))`
	`409`	`+ if (cellValue!=null&&dicNoKeys.Exists(x => x.ColumnName == propertyInfo[j].Name))`
`410`	`410`	`{`
`411`	`411`	`//2021.01.24修复多选类型，导出excel文件没有转换数据源的问题`
`412`	`412`	`if (selectList.Contains(propertyInfo[j].Name))`
`413`	`413`	`{`
`414`		`- cellValue = string.Join(",", GetListValues(cellValue, propertyInfo[j].Name));`
	`414`	`+ cellValue = string.Join(",", GetListValues(cellValue.ToString(), propertyInfo[j].Name));`
`415`	`415`	`}`
`416`	`416`	`else`
`417`	`417`	`{`
`418`	`418`	`cellOptions.Where(x => x.ColumnName == propertyInfo[j].Name)`
`419`	`419`	`.Select(s => s.KeyValues)`
`420`	`420`	`.FirstOrDefault()`
`421`		`- .TryGetValue(cellValue, out string result);`
	`421`	`+ .TryGetValue(cellValue.ToString(), out string result);`
`422`	`422`	`cellValue = result ?? cellValue;`
`423`	`423`	`}`
`424`	`424`