考试成绩新增Excel数据导入

master
xiaochanghai 6 months ago
parent 093743bbac
commit c6f476fc0a
  1. 4
      Tiobon.Core.Api/Controllers/Base/BaseController.cs
  2. 2
      Tiobon.Core.IServices/BASE/IBaseServices.cs
  3. 2
      Tiobon.Core.Services/BASE/BaseServices.cs
  4. 4
      Tiobon.Core.Services/Ghre/Ghre_CertificateServices.cs
  5. 2
      Tiobon.Core.Services/Ghre/Ghre_CourseClassServices.cs
  6. 2
      Tiobon.Core.Services/Ghre/Ghre_CourseSceneServices.cs
  7. 2
      Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
  8. 228
      Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
  9. 2
      Tiobon.Core.Services/Ghre/Ghre_QuestionServices.cs
  10. 2
      Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
  11. 2
      Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs

@ -330,9 +330,9 @@ public class BaseController<IServiceBase, TEntity, TEntityDto, TInsertDto, TEdit
#region Excel导入 #region Excel导入
[HttpPost("ImportExcel")] [HttpPost("ImportExcel")]
public async Task<ServiceResult<ExcelData>> ImportExcel(IFormFile file) public async Task<ServiceResult<ExcelData>> ImportExcel(IFormFile file, string menuName = null, long? MasterId = null)
{ {
var data = (await InvokeServiceAsync("ImportExcel", [file])) as ServiceResult<ExcelData>; var data = (await InvokeServiceAsync("ImportExcel", [file, menuName, MasterId])) as ServiceResult<ExcelData>;
return data; return data;
} }
#endregion #endregion

@ -157,7 +157,7 @@ namespace Tiobon.Core.IServices.BASE
Task<ServicePageResult<TEntityDto>> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true); Task<ServicePageResult<TEntityDto>> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true);
Task<ServiceResult<ExcelData>> ExportExcel(QueryExport body); Task<ServiceResult<ExcelData>> ExportExcel(QueryExport body);
Task<ServiceResult<ExcelData>> ImportExcel(IFormFile file); Task<ServiceResult<ExcelData>> ImportExcel(IFormFile file, string menuName = null, long? MasterId = null);
Task<ServiceResult<string>> DownloadExcel(string menuName); Task<ServiceResult<string>> DownloadExcel(string menuName);

@ -935,7 +935,7 @@ public class BaseServices<TEntity, TEntityDto, TInsertDto, TEditDto> : IBaseServ
} }
return result; return result;
} }
public async virtual Task<ServiceResult<ExcelData>> ImportExcel(IFormFile file) public async virtual Task<ServiceResult<ExcelData>> ImportExcel(IFormFile file, string menuName = null, long? MasterId = null)
{ {
//long id = SnowFlakeSingle.instance.getID(); //long id = SnowFlakeSingle.instance.getID();
//var physicsPath = $"{Environment.CurrentDirectory}{Path.DirectorySeparatorChar}wwwroot"; //var physicsPath = $"{Environment.CurrentDirectory}{Path.DirectorySeparatorChar}wwwroot";

@ -81,8 +81,6 @@ public class Ghre_CertificateServices : BaseServices<Ghre_Certificate, Ghre_Cert
} }
#region Excel导入 #region Excel导入
public override async Task<ServiceResult<string>> DownloadExcel(string menuName) public override async Task<ServiceResult<string>> DownloadExcel(string menuName)
{ {
var physicsPath = $"{Environment.CurrentDirectory}{Path.DirectorySeparatorChar}wwwroot"; var physicsPath = $"{Environment.CurrentDirectory}{Path.DirectorySeparatorChar}wwwroot";
@ -100,7 +98,7 @@ public class Ghre_CertificateServices : BaseServices<Ghre_Certificate, Ghre_Cert
var result = ServiceResult<string>.OprateSuccess("人证对照表_" + DateTimeHelper.ConvertToSecondString1(DateTime.Now) + ".xlsx", physicsPath1); var result = ServiceResult<string>.OprateSuccess("人证对照表_" + DateTimeHelper.ConvertToSecondString1(DateTime.Now) + ".xlsx", physicsPath1);
return result; return result;
} }
public override async Task<ServiceResult<ExcelData>> ImportExcel(IFormFile file) public override async Task<ServiceResult<ExcelData>> ImportExcel(IFormFile file, string menuName = null, long? MasterId = null)
{ {
var data = new ExcelData(); var data = new ExcelData();
long id = SnowFlakeSingle.instance.getID(); long id = SnowFlakeSingle.instance.getID();

@ -35,7 +35,7 @@ public class Ghre_CourseClassServices : BaseServices<Ghre_CourseClass, Ghre_Cour
var result = ServiceResult<string>.OprateSuccess("课程分类_" + DateTimeHelper.ConvertToSecondString1(DateTime.Now) + ".xlsx", physicsPath1); var result = ServiceResult<string>.OprateSuccess("课程分类_" + DateTimeHelper.ConvertToSecondString1(DateTime.Now) + ".xlsx", physicsPath1);
return result; return result;
} }
public override async Task<ServiceResult<ExcelData>> ImportExcel(IFormFile file) public override async Task<ServiceResult<ExcelData>> ImportExcel(IFormFile file, string menuName = null, long? MasterId = null)
{ {
var data = new ExcelData(); var data = new ExcelData();
long id = SnowFlakeSingle.instance.getID(); long id = SnowFlakeSingle.instance.getID();

@ -81,7 +81,7 @@ public class Ghre_CourseSceneServices : BaseServices<Ghre_CourseScene, Ghre_Cour
var result = ServiceResult<string>.OprateSuccess("课程场景_" + DateTimeHelper.ConvertToSecondString1(DateTime.Now) + ".xlsx", physicsPath1); var result = ServiceResult<string>.OprateSuccess("课程场景_" + DateTimeHelper.ConvertToSecondString1(DateTime.Now) + ".xlsx", physicsPath1);
return result; return result;
} }
public override async Task<ServiceResult<ExcelData>> ImportExcel(IFormFile file) public override async Task<ServiceResult<ExcelData>> ImportExcel(IFormFile file, string menuName = null, long? MasterId = null)
{ {
var data = new ExcelData(); var data = new ExcelData();
long id = SnowFlakeSingle.instance.getID(); long id = SnowFlakeSingle.instance.getID();

@ -691,7 +691,7 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
var result = ServiceResult<string>.OprateSuccess("课程管理_" + DateTimeHelper.ConvertToSecondString1(DateTime.Now) + ".xlsx", physicsPath1); var result = ServiceResult<string>.OprateSuccess("课程管理_" + DateTimeHelper.ConvertToSecondString1(DateTime.Now) + ".xlsx", physicsPath1);
return result; return result;
} }
public override async Task<ServiceResult<ExcelData>> ImportExcel(IFormFile file) public override async Task<ServiceResult<ExcelData>> ImportExcel(IFormFile file, string menuName = null, long? MasterId = null)
{ {
var data = new ExcelData(); var data = new ExcelData();
long id = SnowFlakeSingle.instance.getID(); long id = SnowFlakeSingle.instance.getID();

@ -1,4 +1,5 @@
using AgileObjects.AgileMapper.Extensions; using AgileObjects.AgileMapper.Extensions;
using Amazon.Auth.AccessControlPolicy;
using MongoDB.Driver.Linq; using MongoDB.Driver.Linq;
using System.Net; using System.Net;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
@ -1018,4 +1019,231 @@ public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRe
return ServiceResult.OprateSuccess("成功!"); return ServiceResult.OprateSuccess("成功!");
} }
#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_ExamRecord);
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, string menuName = null, long? MasterId = null)
{
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));
var fields = new List<string>
{
"工号",
"姓名",
"考试日期",
"考试分数",
"调整分",
"实操分",
"是否合格",
"备注"
};
for (int i = 0; i < dt.Rows.Count; i++)
{
var comments = new List<string>();
bool isContinue = false;
fields.ForEach(x =>
{
if (!dt.Columns.Contains(x))
{
comments.Add("未查询到【" + x + "】列!");
data.ErrorCount++;
dt.Rows[i]["Comments"] = string.Join(";", comments.Select(a => a));
isExistError = true;
isContinue = true;
}
});
if (isContinue)
continue;
var StaffNo = dt.Rows[i]["工号"].ToString();
var StaffName = dt.Rows[i]["姓名"].ToString();
var ExamDate = dt.Rows[i]["考试日期"].ToString();
var Score = dt.Rows[i]["考试分数"].ToString();
var AdjustScore = dt.Rows[i]["调整分"].ToString();
var ActualScore = dt.Rows[i]["实操分"].ToString();
var IsPass = dt.Rows[i]["是否合格"].ToString();
if (StaffNo.IsNullOrEmpty() && StaffName.IsNullOrEmpty())
continue;
var remarkSz = dt.Rows[i]["备注"].ToString();
var staff = await Db.Queryable<Ghra_Staff>().Where(x => x.StaffNo == StaffNo && x.StaffName == StaffName).FirstAsync();
if (staff == null)
{
comments.Add($"未查询到该员工,工号或姓名填写错误!");
data.ErrorCount++;
dt.Rows[i]["Comments"] = string.Join(";", comments.Select(a => a));
isExistError = true;
continue;
}
var exam = await Db.Queryable<Ghre_Exam>().Where(x => x.Id == MasterId).FirstAsync();
if (ExamDate.IsNullOrEmpty())
ExamDate = DateTime.Now.ToString();
if (Score.IsNullOrEmpty())
Score = "0";
try
{
Convert.ToInt32(Score);
}
catch (Exception)
{
comments.Add($"考试分数填写有误!");
data.ErrorCount++;
dt.Rows[i]["Comments"] = string.Join(";", comments.Select(a => a));
isExistError = true;
continue;
}
try
{
Convert.ToInt32(AdjustScore);
}
catch (Exception)
{
comments.Add($"调整分填写有误!");
data.ErrorCount++;
dt.Rows[i]["Comments"] = string.Join(";", comments.Select(a => a));
isExistError = true;
continue;
}
try
{
Convert.ToInt32(ActualScore);
}
catch (Exception)
{
comments.Add($"实操分填写有误!");
data.ErrorCount++;
dt.Rows[i]["Comments"] = string.Join(";", comments.Select(a => a));
isExistError = true;
continue;
}
try
{
Convert.ToDateTime(ExamDate);
}
catch (Exception)
{
comments.Add($"考试日期填写有误!");
data.ErrorCount++;
dt.Rows[i]["Comments"] = string.Join(";", comments.Select(a => a));
isExistError = true;
continue;
}
//if (await base.AnyAsync(x => x.CertificateRuleId == rule.Id && x.StaffId == staff.StaffID && x.CourseId == course.Id))
//{
// comments.Add($"系统已存在相同证照数据!");
// data.ErrorCount++;
// dt.Rows[i]["Comments"] = string.Join(";", comments.Select(a => a));
// isExistError = true;
// continue;
//}
var snap = await Db.Queryable<Ghre_CourseSnap>().FirstAsync(x => x.CourseId == exam.CourseId);
var ExamRecordId = SnowFlakeSingle.Instance.NextId();
var StudyRecordId = SnowFlakeSingle.Instance.NextId();
var dict1 = new Dictionary<string, object>
{
{ "Id", StudyRecordId },
{ "CreateBy", App.User.ID },
{ "CreateTime", DateTime.Now },
{ "ExamId", MasterId },
{ "StaffId", staff.StaffID },
{ "CourseId", exam.CourseId },
{ "CourseSnapId", snap?.Id },
{ "CourseSceneId", exam.CourseSceneId },
{ "JoinTime", DateTime.Now },
{ "RemarkSz", "导入考试成绩生成" }
};
var dict = new Dictionary<string, object>
{
{ "Id", ExamRecordId },
{ "CreateBy", App.User.ID },
{ "CreateTime", DateTime.Now },
{ "ExamId", MasterId },
{ "StudyRecordId", StudyRecordId },
{ "StaffId", staff.StaffID },
//{ "CourseId", exam.CourseId },
{ "CourseSnapId", snap?.Id },
{ "Score", Score },
{ "AdjustScore", Score },
{ "ActualScore", ActualScore },
{ "ExamDate", ExamDate },
{ "IsPass", IsPass=="是"?true:false },
{ "ScoreStatus", "HasScore" },
{ "Source", "ExcelImport" },
{ "ExamPaperId",exam.ExamPaperId },
{ "RemarkSz", remarkSz }
};
try
{
await Db.Insertable(dict1).AS("Ghre_StudyRecord").ExecuteCommandAsync();
await Db.Insertable(dict).AS("Ghre_ExamRecord").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
} }

@ -782,7 +782,7 @@ public class Ghre_QuestionServices : BaseServices<Ghre_Question, Ghre_QuestionDt
} }
#region Excel导入 #region Excel导入
public override async Task<ServiceResult<ExcelData>> ImportExcel(IFormFile file) public override async Task<ServiceResult<ExcelData>> ImportExcel(IFormFile file, string menuName = null, long? MasterId = null)
{ {
var data = new ExcelData(); var data = new ExcelData();
long id = SnowFlakeSingle.instance.getID(); long id = SnowFlakeSingle.instance.getID();

@ -434,7 +434,7 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
} }
#region Excel导入 #region Excel导入
public override async Task<ServiceResult<ExcelData>> ImportExcel(IFormFile file) public override async Task<ServiceResult<ExcelData>> ImportExcel(IFormFile file, string menuName = null, long? MasterId = null)
{ {
var data = new ExcelData(); var data = new ExcelData();
long id = SnowFlakeSingle.instance.getID(); long id = SnowFlakeSingle.instance.getID();

@ -249,7 +249,7 @@ public class Ghrh_YearHumanSettingsServices : BaseServices<Ghrh_YearHumanSetting
#region Excel导入 #region Excel导入
public override async Task<ServiceResult<ExcelData>> ImportExcel(IFormFile file) public override async Task<ServiceResult<ExcelData>> ImportExcel(IFormFile file, string menuName = null, long? MasterId = null)
{ {
var data = new ExcelData(); var data = new ExcelData();
long id = SnowFlakeSingle.instance.getID(); long id = SnowFlakeSingle.instance.getID();

Loading…
Cancel
Save