课程分类新增Excel导入

Tiobon.Core.Services/Ghre/Ghre_CourseClassServices.cs

@@ -13,4 +13,130 @@ public class Ghre_CourseClassServices : BaseServices<Ghre_CourseClass, Ghre_Cour
         base.BaseDal = dal;
         base._caching = caching;
     }
+
+
+    #region Excel导入
+
+
+    public override async Task<ServiceResult<string>> DownloadExcel(string menuName)
+    {
+        var physicsPath = $"{Environment.CurrentDirectory}{Path.DirectorySeparatorChar}wwwroot";
+        var path = $"{$"{Path.DirectorySeparatorChar}files{Path.DirectorySeparatorChar}ExcelTemplate{Path.DirectorySeparatorChar}"}";
+        if (!Directory.Exists(physicsPath + path))
+            Directory.CreateDirectory(physicsPath + path);
+
+        Type entityType = typeof(Ghre_CourseClass);
+        var fileName = entityType.GetEntityTableName() + ".xlsx";
+
+
+        var physicsPath1 = physicsPath + path + fileName;
+        //if (dataSourceLists.Any())
+        //    physicsPath1 = physicsPath + path + newFileName;
+        var result = ServiceResult<string>.OprateSuccess("课程分类_" + DateTimeHelper.ConvertToSecondString1(DateTime.Now) + ".xlsx", physicsPath1);
+        return result;
+    }
+    public override async Task<ServiceResult<ExcelData>> ImportExcel(IFormFile file)
+    {
+        var data = new ExcelData();
+        long id = SnowFlakeSingle.instance.getID();
+        var physicsPath = $"{Environment.CurrentDirectory}{Path.DirectorySeparatorChar}wwwroot";
+        var path = $"{$"{Path.DirectorySeparatorChar}files{Path.DirectorySeparatorChar}import{Path.DirectorySeparatorChar}{id}{Path.DirectorySeparatorChar}"}";
+        if (!Directory.Exists(physicsPath + path))
+            Directory.CreateDirectory(physicsPath + path);
+
+        var filepath = physicsPath + path + file.FileName;
+        using (var stream = File.Create(filepath))
+        {
+            await file.CopyToAsync(stream);
+        }
+        string extension = Path.GetExtension(filepath);
+
+        bool isExistError = false;
+        var id1 = SnowFlakeSingle.instance.getID();
+        string errorFileName = path + SnowFlakeSingle.instance.getID() + extension;
+
+        var dt = NPOIHelper.ImportExcel(filepath, "课程分类");
+        if (dt.Columns["Comments"] == null)
+            dt.Columns.Add("Comments", typeof(string));
+
+        for (int i = 0; i < dt.Rows.Count; i++)
+        {
+            var comments = new List<string>();
+
+            if (!dt.Columns.Contains("分类编号"))
+            {
+                comments.Add("未查询到【分类编号】列！");
+                data.ErrorCount++;
+                dt.Rows[i]["Comments"] = string.Join(";", comments.Select(a => a));
+                isExistError = true;
+                continue;
+            }
+            if (!dt.Columns.Contains("分类名称"))
+            {
+                comments.Add("未查询到【分类名称】列！");
+                data.ErrorCount++;
+                dt.Rows[i]["Comments"] = string.Join(";", comments.Select(a => a));
+                isExistError = true;
+                continue;
+            }
+            if (!dt.Columns.Contains("备注"))
+            {
+                comments.Add("未查询到【备注】列！");
+                data.ErrorCount++;
+                dt.Rows[i]["Comments"] = string.Join(";", comments.Select(a => a));
+                isExistError = true;
+                continue;
+            }
+
+            var ClassNo = dt.Rows[i]["分类编号"].ToString();
+            var ClassName = dt.Rows[i]["分类名称"].ToString();
+            if (ClassNo.IsNullOrEmpty() && ClassName.IsNullOrEmpty())
+                continue;
+
+            var remarkSz = dt.Rows[i]["备注"].ToString();
+
+            if (await base.AnyAsync(x => x.ClassName == ClassName && x.ClassNo == ClassNo))
+            {
+                comments.Add($"系统已存在相同编号名称课程分类数据！");
+                data.ErrorCount++;
+                dt.Rows[i]["Comments"] = string.Join(";", comments.Select(a => a));
+                isExistError = true;
+                continue;
+            }
+
+
+            var dict = new Dictionary<string, object>
+                {
+                    { "Id", SnowFlakeSingle.Instance.NextId() },
+                    { "CreateBy", App.User.ID },
+                    { "CreateTime", DateTime.Now },
+                    { "ClassNo", ClassNo },
+                    { "ClassName", ClassName },
+                    { "RemarkSz", remarkSz }
+                };
+            try
+            {
+                await Db.Insertable(dict).AS("Ghre_CourseClass").ExecuteCommandAsync();
+                data.SuccessCount++;
+                //data.SuccessCount += list.Count;
+            }
+            catch (Exception E)
+            {
+                comments.Add(E.Message);
+                data.ErrorCount++;
+                dt.Rows[i]["Comments"] = string.Join(";", comments.Select(a => a));
+                isExistError = true;
+                continue;
+            }
+
+        }
+
+        if (isExistError)
+        {
+            NPOIHelper.ExportExcel(dt, null, "课程分类", physicsPath + errorFileName);
+            data.filePath = errorFileName;
+        }
+        return ServiceResult<ExcelData>.OprateSuccess("导入成功！", data);
+    }
+    #endregion
 }

Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs

@@ -4047,8 +4047,15 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
                 dict.Add("Reverse8", applyOrder.ProbationMonths);
                 dict.Add("ZoneID", applyOrder.ZoneId);
                 dict.Add("StaffType1", applyOrder.StaffType1);
+                dict.Add("StaffType2", applyOrder.StaffType);
                 //dict.Add("Reverse8", applyOrder.ProbationMonths);
             }
+            else
+            {
+                dict.Add("PeriodMasterId", null);
+            }
+            dict.Add("OvertimeRuleID", null);
+            dict.Add("TaxID", null);
 
             if (dict.Count > 0)
                 staffId = await Db.Insertable(dict).AS("Ghra_Staff").ExecuteReturnIdentityAsync();