From 6e78892c440406c94fa1190d8daa04480620f13a Mon Sep 17 00:00:00 2001 From: Ben Lin <maobin001@msn.com> Date: 星期六, 28 十二月 2024 01:31:02 +0800 Subject: [PATCH] 通用导入Excel更新 --- Tiger.Business/Common/ImportExcel.cs | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Tiger.Business/Common/ImportExcel.cs b/Tiger.Business/Common/ImportExcel.cs index bd02b51..1300ea9 100644 --- a/Tiger.Business/Common/ImportExcel.cs +++ b/Tiger.Business/Common/ImportExcel.cs @@ -21,22 +21,22 @@ /// <summary> /// 閫氱敤瀵煎叆Excel /// </summary> - public class ImportExcel : IImportExcel + public class ImportExcel : ICommonImportExcel { /// <summary> /// 瀵煎叆 /// </summary> /// <typeparam name="T"></typeparam> /// <param name="newEntity"></param> - /// <param name="jsonStr"></param> + /// <param name="input"></param> /// <returns></returns> - public async Task<ApiAction> Import<T>(T newEntity, string jsonStr) where T : class, new() + public async Task<ApiAction> Import<T>(T newEntity, ImportInput input) where T : class, new() { var result = new ApiAction(); try { - List<T> list = JsonConvert.DeserializeObject<List<T>>(jsonStr); + List<T> list = JsonConvert.DeserializeObject<List<T>>(input.EntityJson); DbClient db = Biz.Db; if (list.Any()) { @@ -75,13 +75,13 @@ /// <param name="newEntity"></param> /// <param name="input"></param> /// <returns></returns> - public async Task<ApiAction<List<T>>> ValidateTableImport<T>(T newEntity, ImportEntityValidate input) { + public async Task<ApiAction<List<T>>> ValidateTableImport<T>(T newEntity, ImportValidateInput input) { var result = new ApiAction<List<T>>(); try { List<T> list = JsonConvert.DeserializeObject<List<T>>(input.EntityJson); List<string> chkColumns = JsonConvert.DeserializeObject<List<string>>(input.CheckJson); - List<string> wheres = JsonConvert.DeserializeObject<List<string>>(input.where); + List<string> wheres = JsonConvert.DeserializeObject<List<string>>(input.where); //鐩墠鍙湁=锛屼互鍚庡彲浠ュ鍔犲叾浠栫殑鏌ヨ鏉′欢 Type entityType = typeof(T); //T娉涘瀷 //閫氳繃灞炴�у悕鑾峰彇灞炴�у�� 鈥淰ALIDATION_TYPE鈥濆睘鎬у悕绉� PropertyInfo typeInfo = entityType.GetProperty("VALIDATION_TYPE"); -- Gitblit v1.9.3