增加导入时读取原生excel方法(可以自定义读取excel内容)

283591387@qq.com · 283591387@qq.com · commit ce1f9f8f3854 · 2022-06-20T01:53:16.000+08:00
diff --git a/.Net6版本/VOL.Core/BaseProvider/ServiceBase.cs b/.Net6版本/VOL.Core/BaseProvider/ServiceBase.cs
@@ -125,7 +125,7 @@ private void CheckUpdateMultiTenancy(string ids, string tableKey)
             //例如sql，只能(编辑)自己创建的数据:判断数据是不是当前用户创建的
             //sql = $" {sql} and createid!={UserContext.Current.UserId}";
             object obj = repository.DapperContext.ExecuteScalar(sql, null);
-            if (obj == null || obj.GetInt() > 0)
+            if (obj == null || obj.GetInt() == 0)
             {
                 Response.Error("不能编辑此数据");
             }
@@ -143,7 +143,8 @@ private void CheckDelMultiTenancy(string ids, string tableKey)
             //例如sql，只能(删除)自己创建的数据:找出不是自己创建的数据
             //sql = $" {sql} and createid!={UserContext.Current.UserId}";
             object obj = repository.DapperContext.ExecuteScalar(sql, null);
-            if (obj == null || obj.GetInt() > 0)
+            int idsCount = ids.Split(",").Distinct().Count();
+            if (obj == null || obj.GetInt() != idsCount)
             {
                 Response.Error("不能删除此数据");
             }
@@ -425,7 +426,8 @@ public virtual WebResponseContent Import(List<Microsoft.AspNetCore.Http.IFormFil
             }
             try
             {
-                Response = EPPlusHelper.ReadToDataTable<T>(dicPath, DownLoadTemplateColumns, GetIgnoreTemplate());
+                //2022.06.20增加原生excel读取方法(导入时可以自定义读取excel内容)
+                Response = EPPlusHelper.ReadToDataTable<T>(dicPath, DownLoadTemplateColumns, GetIgnoreTemplate(), readValue: ImportOnReadCellValue);
             }
             catch (Exception ex)
             {
@@ -443,15 +445,15 @@ public virtual WebResponseContent Import(List<Microsoft.AspNetCore.Http.IFormFil
             if (HttpContext.Current.Request.Query.ContainsKey("table"))
             {
                 ImportOnExecuted?.Invoke(list);
-                return Response.OK("文件上传成功",list.Serialize());
+                return Response.OK("文件上传成功", list.Serialize());
             }
             repository.AddRange(list, true);
             if (ImportOnExecuted != null)
             {
                 Response = ImportOnExecuted.Invoke(list);
                 if (CheckResponseResult()) return Response;
             }
-            return Response.OK("文件上传成功" );
+            return Response.OK("文件上传成功");
         }
 
         /// <summary>
diff --git a/.Net6版本/VOL.Core/Filters/ServiceFunFilter.cs b/.Net6版本/VOL.Core/Filters/ServiceFunFilter.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using OfficeOpenXml;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
@@ -8,7 +9,7 @@
 
 namespace VOL.Core.Filters
 {
-    public  abstract class ServiceFunFilter<T> where T : class
+    public abstract class ServiceFunFilter<T> where T : class
     {
 
         /// <summary>
@@ -192,5 +193,16 @@ public  abstract class ServiceFunFilter<T> where T : class
         /// </summary>
         protected Func<List<T>, WebResponseContent> ImportOnExecuting;
 
+        /// <summary>
+        /// 2022.06.20增加原生excel读取方法(导入时可以自定义读取excel内容)
+        /// string=当前读取的excel单元格的值
+        /// ExcelWorksheet=excel对象
+        /// ExcelRange当前excel单元格对象
+        /// int=当前读取的第几数
+        /// int=当前读取的第几列
+        /// string=返回的值
+        /// </summary>
+        protected Func<string, ExcelWorksheet, ExcelRange, int, int, string> ImportOnReadCellValue;
+
     }
 }
diff --git a/.Net6版本/VOL.Core/Utilities/EPPlusHelper.cs b/.Net6版本/VOL.Core/Utilities/EPPlusHelper.cs
@@ -26,7 +26,10 @@ public class EPPlusHelper
         /// <param name="ignoreColumns">忽略不导出的列(如果设置了exportColumns,ignoreColumns不会生效)</param>
         /// <returns></returns>
 
-        public static WebResponseContent ReadToDataTable<T>(string path, Expression<Func<T, object>> exportColumns = null, List<string> ignoreTemplate = null)
+        public static WebResponseContent ReadToDataTable<T>(string path,
+            Expression<Func<T, object>> exportColumns = null,
+            List<string> ignoreTemplate = null,
+            Func<string, ExcelWorksheet, ExcelRange, int, int, string> readValue = null)
         {
             WebResponseContent responseContent = new WebResponseContent();
 
@@ -90,7 +93,13 @@ public static WebResponseContent ReadToDataTable<T>(string path, Expression<Func
                     T entity = Activator.CreateInstance<T>();
                     for (int j = sheet.Dimension.Start.Column, k = sheet.Dimension.End.Column; j <= k; j++)
                     {
+
                         string value = sheet.Cells[m, j].Value?.ToString();
+                        //2022.06.20增加原生excel读取方法
+                        if (readValue != null)
+                        {
+                            value = readValue(value, sheet, sheet.Cells[m, j], m, j);
+                        }
 
                         CellOptions options = cellOptions.Where(x => x.Index == j).FirstOrDefault();
                         PropertyInfo property = propertyInfos.Where(x => x.Name == options.ColumnName).FirstOrDefault();
@@ -516,7 +525,7 @@ private static List<CellOptions> GetExportColumnInfo(string tableName, bool teml
             }
             return cellOptions;
         }
-     
+
         /// <summary>
         /// 2021.01.10增加通过excel导出功能
         /// </summary>
diff --git a/Vue.Net/VOL.Core/BaseProvider/ServiceBase.cs b/Vue.Net/VOL.Core/BaseProvider/ServiceBase.cs
@@ -426,7 +426,8 @@ public virtual WebResponseContent Import(List<Microsoft.AspNetCore.Http.IFormFil
             }
             try
             {
-                Response = EPPlusHelper.ReadToDataTable<T>(dicPath, DownLoadTemplateColumns, GetIgnoreTemplate());
+                //2022.06.20增加原生excel读取方法(导入时可以自定义读取excel内容)
+                Response = EPPlusHelper.ReadToDataTable<T>(dicPath, DownLoadTemplateColumns, GetIgnoreTemplate(),readValue: ImportOnReadCellValue);
             }
             catch (Exception ex)
             {
diff --git a/Vue.Net/VOL.Core/Filters/ServiceFunFilter.cs b/Vue.Net/VOL.Core/Filters/ServiceFunFilter.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using OfficeOpenXml;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
@@ -192,5 +193,16 @@ public  abstract class ServiceFunFilter<T> where T : class
         /// </summary>
         protected Func<List<T>, WebResponseContent> ImportOnExecuting;
 
+        /// <summary>
+        /// 2022.06.20增加原生excel读取方法(导入时可以自定义读取excel内容)
+        /// string=当前读取的excel单元格的值
+        /// ExcelWorksheet=excel对象
+        /// ExcelRange当前excel单元格对象
+        /// int=当前读取的第几数
+        /// int=当前读取的第几列
+        /// string=返回的值
+        /// </summary>
+        protected Func<string, ExcelWorksheet, ExcelRange,int,int, string> ImportOnReadCellValue;
+
     }
 }
diff --git a/Vue.Net/VOL.Core/Utilities/EPPlusHelper.cs b/Vue.Net/VOL.Core/Utilities/EPPlusHelper.cs
@@ -26,7 +26,10 @@ public class EPPlusHelper
         /// <param name="ignoreColumns">忽略不导出的列(如果设置了exportColumns,ignoreColumns不会生效)</param>
         /// <returns></returns>
 
-        public static WebResponseContent ReadToDataTable<T>(string path, Expression<Func<T, object>> exportColumns = null, List<string> ignoreTemplate = null)
+        public static WebResponseContent ReadToDataTable<T>(string path,
+            Expression<Func<T, object>> exportColumns = null,
+            List<string> ignoreTemplate = null,
+            Func<string, ExcelWorksheet, ExcelRange,int,int, string> readValue = null)
         {
             WebResponseContent responseContent = new WebResponseContent();
 
@@ -90,7 +93,13 @@ public static WebResponseContent ReadToDataTable<T>(string path, Expression<Func
                     T entity = Activator.CreateInstance<T>();
                     for (int j = sheet.Dimension.Start.Column, k = sheet.Dimension.End.Column; j <= k; j++)
                     {
+
                         string value = sheet.Cells[m, j].Value?.ToString();
+                        //2022.06.20增加原生excel读取方法
+                        if (readValue != null)
+                        {
+                            value = readValue(value, sheet, sheet.Cells[m, j],m,j);
+                        }
 
                         CellOptions options = cellOptions.Where(x => x.Index == j).FirstOrDefault();
                         PropertyInfo property = propertyInfos.Where(x => x.Name == options.ColumnName).FirstOrDefault();
@@ -516,7 +525,7 @@ private static List<CellOptions> GetExportColumnInfo(string tableName, bool teml
             }
             return cellOptions;
         }
-     
+
         /// <summary>
         /// 2021.01.10增加通过excel导出功能
         /// </summary>
diff --git a/开发版dev/Vue.NetCore/Vue.Net/VOL.Core/BaseProvider/ServiceBase.cs b/开发版dev/Vue.NetCore/Vue.Net/VOL.Core/BaseProvider/ServiceBase.cs
@@ -426,7 +426,8 @@ public virtual WebResponseContent Import(List<Microsoft.AspNetCore.Http.IFormFil
             }
             try
             {
-                Response = EPPlusHelper.ReadToDataTable<T>(dicPath, DownLoadTemplateColumns, GetIgnoreTemplate());
+                //2022.06.20增加原生excel读取方法(导入时可以自定义读取excel内容)
+                Response = EPPlusHelper.ReadToDataTable<T>(dicPath, DownLoadTemplateColumns, GetIgnoreTemplate(),readValue: ImportOnReadCellValue);
             }
             catch (Exception ex)
             {
diff --git a/开发版dev/Vue.NetCore/Vue.Net/VOL.Core/Filters/ServiceFunFilter.cs b/开发版dev/Vue.NetCore/Vue.Net/VOL.Core/Filters/ServiceFunFilter.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using OfficeOpenXml;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
@@ -192,5 +193,16 @@ public  abstract class ServiceFunFilter<T> where T : class
         /// </summary>
         protected Func<List<T>, WebResponseContent> ImportOnExecuting;
 
+        /// <summary>
+        /// 2022.06.20增加原生excel读取方法(导入时可以自定义读取excel内容)
+        /// string=当前读取的excel单元格的值
+        /// ExcelWorksheet=excel对象
+        /// ExcelRange当前excel单元格对象
+        /// int=当前读取的第几数
+        /// int=当前读取的第几列
+        /// string=返回的值
+        /// </summary>
+        protected Func<string, ExcelWorksheet, ExcelRange,int,int, string> ImportOnReadCellValue;
+
     }
 }
diff --git a/开发版dev/Vue.NetCore/Vue.Net/VOL.Core/Utilities/EPPlusHelper.cs b/开发版dev/Vue.NetCore/Vue.Net/VOL.Core/Utilities/EPPlusHelper.cs
@@ -26,7 +26,10 @@ public class EPPlusHelper
         /// <param name="ignoreColumns">忽略不导出的列(如果设置了exportColumns,ignoreColumns不会生效)</param>
         /// <returns></returns>
 
-        public static WebResponseContent ReadToDataTable<T>(string path, Expression<Func<T, object>> exportColumns = null, List<string> ignoreTemplate = null)
+        public static WebResponseContent ReadToDataTable<T>(string path,
+            Expression<Func<T, object>> exportColumns = null,
+            List<string> ignoreTemplate = null,
+            Func<string, ExcelWorksheet, ExcelRange,int,int, string> readValue = null)
         {
             WebResponseContent responseContent = new WebResponseContent();
 
@@ -90,7 +93,13 @@ public static WebResponseContent ReadToDataTable<T>(string path, Expression<Func
                     T entity = Activator.CreateInstance<T>();
                     for (int j = sheet.Dimension.Start.Column, k = sheet.Dimension.End.Column; j <= k; j++)
                     {
+
                         string value = sheet.Cells[m, j].Value?.ToString();
+                        //2022.06.20增加原生excel读取方法
+                        if (readValue != null)
+                        {
+                            value = readValue(value, sheet, sheet.Cells[m, j],m,j);
+                        }
 
                         CellOptions options = cellOptions.Where(x => x.Index == j).FirstOrDefault();
                         PropertyInfo property = propertyInfos.Where(x => x.Name == options.ColumnName).FirstOrDefault();
@@ -516,7 +525,7 @@ private static List<CellOptions> GetExportColumnInfo(string tableName, bool teml
             }
             return cellOptions;
         }
-     
+
         /// <summary>
         /// 2021.01.10增加通过excel导出功能
         /// </summary>

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ private void CheckUpdateMultiTenancy(string ids, string tableKey)`
`125`	`125`	`//例如sql，只能(编辑)自己创建的数据:判断数据是不是当前用户创建的`
`126`	`126`	`//sql = $" {sql} and createid!={UserContext.Current.UserId}";`
`127`	`127`	`object obj = repository.DapperContext.ExecuteScalar(sql, null);`
`128`		`- if (obj == null \|\| obj.GetInt() > 0)`
	`128`	`+ if (obj == null \|\| obj.GetInt() == 0)`
`129`	`129`	`{`
`130`	`130`	`Response.Error("不能编辑此数据");`
`131`	`131`	`}`
`@@ -143,7 +143,8 @@ private void CheckDelMultiTenancy(string ids, string tableKey)`
`143`	`143`	`//例如sql，只能(删除)自己创建的数据:找出不是自己创建的数据`
`144`	`144`	`//sql = $" {sql} and createid!={UserContext.Current.UserId}";`
`145`	`145`	`object obj = repository.DapperContext.ExecuteScalar(sql, null);`
`146`		`- if (obj == null \|\| obj.GetInt() > 0)`
	`146`	`+ int idsCount = ids.Split(",").Distinct().Count();`
	`147`	`+ if (obj == null \|\| obj.GetInt() != idsCount)`
`147`	`148`	`{`
`148`	`149`	`Response.Error("不能删除此数据");`
`149`	`150`	`}`
`@@ -425,7 +426,8 @@ public virtual WebResponseContent Import(List<Microsoft.AspNetCore.Http.IFormFil`
`425`	`426`	`}`
`426`	`427`	`try`
`427`	`428`	`{`
`428`		`- Response = EPPlusHelper.ReadToDataTable<T>(dicPath, DownLoadTemplateColumns, GetIgnoreTemplate());`
	`429`	`+ //2022.06.20增加原生excel读取方法(导入时可以自定义读取excel内容)`
	`430`	`+ Response = EPPlusHelper.ReadToDataTable<T>(dicPath, DownLoadTemplateColumns, GetIgnoreTemplate(), readValue: ImportOnReadCellValue);`
`429`	`431`	`}`
`430`	`432`	`catch (Exception ex)`
`431`	`433`	`{`
`@@ -443,15 +445,15 @@ public virtual WebResponseContent Import(List<Microsoft.AspNetCore.Http.IFormFil`
`443`	`445`	`if (HttpContext.Current.Request.Query.ContainsKey("table"))`
`444`	`446`	`{`
`445`	`447`	`ImportOnExecuted?.Invoke(list);`
`446`		`- return Response.OK("文件上传成功",list.Serialize());`
	`448`	`+ return Response.OK("文件上传成功", list.Serialize());`
`447`	`449`	`}`
`448`	`450`	`repository.AddRange(list, true);`
`449`	`451`	`if (ImportOnExecuted != null)`
`450`	`452`	`{`
`451`	`453`	`Response = ImportOnExecuted.Invoke(list);`
`452`	`454`	`if (CheckResponseResult()) return Response;`
`453`	`455`	`}`
`454`		`- return Response.OK("文件上传成功" );`
	`456`	`+ return Response.OK("文件上传成功");`
`455`	`457`	`}`
`456`	`458`
`457`	`459`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -426,7 +426,8 @@ public virtual WebResponseContent Import(List<Microsoft.AspNetCore.Http.IFormFil`
`426`	`426`	`}`
`427`	`427`	`try`
`428`	`428`	`{`
`429`		`- Response = EPPlusHelper.ReadToDataTable<T>(dicPath, DownLoadTemplateColumns, GetIgnoreTemplate());`
	`429`	`+ //2022.06.20增加原生excel读取方法(导入时可以自定义读取excel内容)`
	`430`	`+ Response = EPPlusHelper.ReadToDataTable<T>(dicPath, DownLoadTemplateColumns, GetIgnoreTemplate(),readValue: ImportOnReadCellValue);`
`430`	`431`	`}`
`431`	`432`	`catch (Exception ex)`
`432`	`433`	`{`