master
xiaochanghai 6 months ago
parent 5324cc6404
commit 03da45903f
  1. 7
      Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamRecordController.cs
  2. 2
      Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeTemplatePreviewController.cs
  3. 24
      Tiobon.Core.Api/Views/Ghrh_ResumeTemplatePreview/Index.cshtml
  4. 1
      Tiobon.Core.IServices/Ghre/IGhre_ExamRecordServices.cs
  5. 2
      Tiobon.Core.Services/BASE/BaseServices.cs
  6. 25
      Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
  7. 236
      Tiobon.Core.Services/Ghre/Ghre_TeacherServices.cs
  8. 3
      Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs
  9. 4
      Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
  10. 8
      Tiobon.Core/Tiobon.Core.xml

@ -44,8 +44,13 @@ public class Ghre_ExamRecordController : BaseController<IGhre_ExamRecordServices
{ {
return await _service.ModifyActualScore(examRecordId, edit); return await _service.ModifyActualScore(examRecordId, edit);
} }
[HttpPost("ModifyIsPass/{examRecordId}")]
public async Task<ServiceResult> ModifyIsPass(string examRecordId, [FromBody] EditGhre_ExamRecordInput edit)
{
return await _service.ModifyIsPass(examRecordId, edit);
}
/// <summary> //cc/ <summary>
/// 获取考试记录明细扩展接口 /// 获取考试记录明细扩展接口
/// </summary> /// </summary>
/// <param name="examRecordId"></param> /// <param name="examRecordId"></param>

@ -217,6 +217,7 @@ END";
if (o.field == "CertificateType") o.field = "CertificateTypeLabel"; if (o.field == "CertificateType") o.field = "CertificateTypeLabel";
if (o.field == "RegisteredType") o.field = "RegisteredTypeLabel"; if (o.field == "RegisteredType") o.field = "RegisteredTypeLabel";
if (o.field == "EduDegree") o.field = "EduDegreeLabel"; if (o.field == "EduDegree") o.field = "EduDegreeLabel";
if (o.field == "ApplyStatus") o.field = "ApplyStatusLabel";
}); });
x.children = x.children.Where(o => o.field != "EduDegreeLabel" x.children = x.children.Where(o => o.field != "EduDegreeLabel"
@ -290,6 +291,7 @@ END";
columnNames.Add("CertificateTypeLabel"); columnNames.Add("CertificateTypeLabel");
columnNames.Add("RegisteredTypeLabel"); columnNames.Add("RegisteredTypeLabel");
columnNames.Add("EduDegreeLabel"); columnNames.Add("EduDegreeLabel");
columnNames.Add("ApplyStatusLabel");
columnNames.ForEach(x => columnNames.ForEach(x =>
{ {
var value = entity.GetPropertyValue(x); var value = entity.GetPropertyValue(x);

@ -57,7 +57,7 @@
@{ @{
if (BaseDic.ContainsKey(children.field)) if (BaseDic.ContainsKey(children.field))
{ {
if (children.field == "Birthday" || children.field == "GraduateDate") if (children.field == "Birthday" || children.field == "GraduateDate" || children.field == "Indate")
@DateTimeHelper.ConvertToDayString(BaseDic[children.field]) @DateTimeHelper.ConvertToDayString(BaseDic[children.field])
else else
@BaseDic[children.field] @BaseDic[children.field]
@ -262,19 +262,18 @@
@item.tabName @item.tabName
</div> </div>
} }
<div style="float:left;padding-left: 10px;color: #ff9300;">@Html.Raw(ViewBag.StatementRemark)</div>
if (item.children != null && item.children.Any()) if (item.children != null && item.children.Any())
foreach (var children in item.children) foreach (var children in item.children)
{ {
if (ii > 0) // if (ii > 0)
{ // {
<div style="margin-top:5px;width:100%;float:left;"></div> // <div style="margin-top:5px;width:100%;float:left;"></div>
} // }
<div class="ghr-preview-staff-resume-block-item" id="Base-0-StaffName" style="display: flex;width:80%"> <div class="ghr-preview-staff-resume-block-item" id="Base-0-StaffName" style="display: flex;width:80%">
<div class="itemValue" style="float: left;width: 75%;"> <div class="itemValue" style="float: left;width: 75%;">
<p style="margin: 0;padding: 10px;"> <p style="margin: 0;padding: 5px;">
@(ii + 1).&nbsp;@(children.placeholder): @{ @(ii + 1).&nbsp;@(children.placeholder): @{
ii++; ii++;
if (StatementDic.ContainsKey("Statement" + ii)) if (StatementDic.ContainsKey("Statement" + ii))
@ -292,14 +291,21 @@
</div> </div>
</div> </div>
} }
} <div class="ghr-preview-staff-resume-block-item" style="display: flex;width:90%;padding-left: 10px;">
<p>
@Html.Raw(ViewBag.StatementRemark)
</p>
@if (displaySignatureArea) @if (displaySignatureArea)
{ {
<div style="float:left;padding-left: 10px;">申请人签名:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;日期:</div> <p>申请人签名:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;日期:</p>
} }
</div> </div>
} }
</div>
}
} }
} }
<div style="height:50px"></div>
</div> </div>
</div> </div>

@ -29,4 +29,5 @@ public interface IGhre_ExamRecordServices : IBaseServices<Ghre_ExamRecord, Ghre_
Task<ServiceResult> ViewExamPaperCallBackAsync(long examRecordId); Task<ServiceResult> ViewExamPaperCallBackAsync(long examRecordId);
Task<ServiceResult> ModifyActualScore(string examRecordId, EditGhre_ExamRecordInput edit); Task<ServiceResult> ModifyActualScore(string examRecordId, EditGhre_ExamRecordInput edit);
Task<ServiceResult> ModifyIsPass(string examRecordId, EditGhre_ExamRecordInput edit);
} }

@ -2053,7 +2053,7 @@ ORDER BY SortNo ASC";
sql = @$"Declare @Json nvarchar(max) = '' sql = @$"Declare @Json nvarchar(max) = ''
set @Json = (select '{title}' title, set @Json = (select '{title}' title,
'text' msgtype, 'text' msgtype,
'{content}\n请至ESS-' [description] , '{content}\n请至GHR人力资源系统-' [description] ,
'Re'+(select Top 1 ParameterValue from Ghrs_Parameter where ParameterNo='GHRURL')+'/appOauth.html?jumpPage='+'F_APP_message/msgGroupList' url, 'Re'+(select Top 1 ParameterValue from Ghrs_Parameter where ParameterNo='GHRURL')+'/appOauth.html?jumpPage='+'F_APP_message/msgGroupList' url,
'GHR' picurl, 'GHR' picurl,
'' htmlStr, '' htmlStr,

@ -1,5 +1,4 @@
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;
@ -158,7 +157,7 @@ public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRe
if (examPaper != null) if (examPaper != null)
entity.IsPass = examPaper.PassScore > (entity.Score + entity.AdjustScore) ? false : true; entity.IsPass = examPaper.PassScore > (entity.Score + entity.AdjustScore) ? false : true;
await Update(entity, ["IsPass", "AdjustScore"]); await Update(entity, ["IsPass", "AdjustScore", "UpdateTime", "UpdateBy"]);
return ServiceResult.OprateSuccess("修改成功!"); return ServiceResult.OprateSuccess("修改成功!");
@ -179,7 +178,27 @@ public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRe
//string score1 = Regex.Replace(entity.Score.ToString(), @"\.(0+)$", "") + "/" + Regex.Replace(entity.Score.ToString(), @"\.(0+)$", ""); //string score1 = Regex.Replace(entity.Score.ToString(), @"\.(0+)$", "") + "/" + Regex.Replace(entity.Score.ToString(), @"\.(0+)$", "");
await Update(entity, ["ActualScore"]); await Update(entity, ["ActualScore", "UpdateTime", "UpdateBy"]);
return ServiceResult.OprateSuccess("修改成功!");
}
public async Task<ServiceResult> ModifyIsPass(string examRecordId, EditGhre_ExamRecordInput edit)
{
var entity = await QuerySingle(examRecordId);
if (entity != null && entity.ExamId != null)
if (await Db.Queryable<Ghre_Exam>().Where(x => x.Id == entity.ExamId.Value && x.Status == "Disabled").AnyAsync())
return ServiceResult.OprateFailed($"该考试已归档,不可进行调整!");
if (entity.ActualScore is null && entity.AdjustScore is null)
return ServiceResult.OprateFailed($"请先变更调整分或实操分!");
entity.IsPass = edit.IsPass ?? false;
//string score1 = Regex.Replace(entity.Score.ToString(), @"\.(0+)$", "") + "/" + Regex.Replace(entity.Score.ToString(), @"\.(0+)$", "");
await Update(entity, ["IsPass", "UpdateTime", "UpdateBy"]);
return ServiceResult.OprateSuccess("修改成功!"); return ServiceResult.OprateSuccess("修改成功!");
} }

@ -318,4 +318,240 @@ FROM (SELECT A.*,
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_Teacher);
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 TeacherType = dt.Rows[i]["讲师分类"].ToString();
var StaffNo = dt.Rows[i]["工号"].ToString();
var StaffName = dt.Rows[i]["姓名"].ToString();
var SchoolName = 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();
//var IsPass = dt.Rows[i]["手机号码"].ToString();
//var IsPass = dt.Rows[i]["讲师等级"].ToString();
//var IsPass = 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
} }

@ -1,5 +1,4 @@
using AgileObjects.AgileMapper.Extensions.Internal; using AgileObjects.AgileMapper.Extensions.Internal;
using System.ComponentModel.Design;
namespace Tiobon.Core.Services; namespace Tiobon.Core.Services;
@ -192,7 +191,7 @@ public class Ghrh_OfferApplyOrderServices : BaseServices<Ghrh_OfferApplyOrder, G
if (order is null) if (order is null)
{ {
var resume = await Db.Queryable<Ghrh_Resume>().Where(x => x.Id == resumeId).FirstAsync(); var resume = await Db.Queryable<Ghrh_Resume>().Where(x => x.Id == resumeId).FirstAsync();
entity.OrderNo = await GenerateContinuousSequence("Ghrh_OfferApplyOrder", "OrderNo", "LYSQ"); entity.OrderNo = await GenerateContinuousSequence("Ghrh_OfferApplyOrder", "OrderNo", "L");
entity.ApplicantId = GetStaffId(); entity.ApplicantId = GetStaffId();
entity.ApplyTime = DateTime.Now; entity.ApplyTime = DateTime.Now;
entity.WorkState = 1; entity.WorkState = 1;

@ -4403,8 +4403,8 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
) )
select {staffId},null, select {staffId},null,
'{inTime.Value.Date}', '{inTime.Value.Date}',
30, -- 23, --
1135, -- 1130, --
0,'Todo',1,'', 0,'Todo',1,'',
1,0,0,0, 1,0,0,0,
{App.User.ID},GETDATE(), 'SyncToStaff', {App.User.ID},GETDATE(), 'SyncToStaff',

@ -1020,13 +1020,7 @@
<param name="body">条件</param> <param name="body">条件</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Tiobon.Core.Api.Controllers.Ghre_ExamRecordController.ExtendAsync(System.Int64)"> <!-- Badly formed XML comment ignored for member "M:Tiobon.Core.Api.Controllers.Ghre_ExamRecordController.ExtendAsync(System.Int64)" -->
<summary>
获取考试记录明细扩展接口
</summary>
<param name="examRecordId"></param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Api.Controllers.Ghre_ExamRecordController.CommentAsync(Tiobon.Core.Model.Ghre_ExamRecordExtend,System.Int64)"> <member name="M:Tiobon.Core.Api.Controllers.Ghre_ExamRecordController.CommentAsync(Tiobon.Core.Model.Ghre_ExamRecordExtend,System.Int64)">
<summary> <summary>
提交评语接口 提交评语接口

Loading…
Cancel
Save