Simon
/
Tiobon.Web.Core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复面试记录表日期格式显示不一致

Browse Source 
简历保存 新增工作经历反推工作年限
简历推荐报错修改
master
xiaochanghai 5 months ago
parent 4806eb0260
commit 5e33c772e1
5 changed files with 60 additions and 41 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      Tiobon.Core.Common/DB/Aop/SqlsugarAop.cs
  2. 38
      Tiobon.Core.Common/Helper/DateTimeHelper.cs
  3. 27
      Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs
  4. 4
      Tiobon.Core.Services/Ghrh/Ghrh_InterviewRecordServices.cs
  5. 30
      Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs

2
Tiobon.Core.Common/DB/Aop/SqlsugarAop.cs
Unescape View File

@ -93,7 +93,7 @@ public static class SqlSugarAop
var dyCreateBy = getType.GetProperty("CreateBy"); var dyCreateBy = getType.GetProperty("CreateBy");
var dyCreateTime = getType.GetProperty("CreateTime"); var dyCreateTime = getType.GetProperty("CreateTime");
BasePoco ent = entityInfo.EntityValue as BasePoco; BasePoco ent = entityInfo.EntityValue as BasePoco;
if (ent.Id == 0) if (ent != null && ent.Id == 0)
ent.Id = SnowFlakeSingle.Instance.NextId(); ent.Id = SnowFlakeSingle.Instance.NextId();
if (App.User?.ID > 0 && dyCreateBy != null && dyCreateBy.GetValue(entityInfo.EntityValue) == null) if (App.User?.ID > 0 && dyCreateBy != null && dyCreateBy.GetValue(entityInfo.EntityValue) == null)
{ {

38
Tiobon.Core.Common/Helper/DateTimeHelper.cs
Unescape View File

@ -62,7 +62,7 @@ public class DateTimeHelper
return ConvertToYearString((DateTime)dateTime); return ConvertToYearString((DateTime)dateTime);
} }
/// <summary> /// <summary>
/// 格式化DateTime类型为字符串类型，精确到月，如：2008/01 /// 格式化DateTime类型为字符串类型，精确到月，如：2008-01
/// </summary> /// </summary>
/// <param name="dateTime"></param> /// <param name="dateTime"></param>
/// <returns></returns> /// <returns></returns>
@ -72,10 +72,10 @@ public class DateTimeHelper
{ {
return ""; return "";
} }
return dateTime.ToString(@"yyyy\/MM"); return dateTime.ToString(@"yyyy\-MM");
} }
/// <summary> /// <summary>
/// 格式化object类型为字符串类型，精确到月，如：2008/01 /// 格式化object类型为字符串类型，精确到月，如：2008-01
/// </summary> /// </summary>
/// <param name="dateTime"></param> /// <param name="dateTime"></param>
/// <returns></returns> /// <returns></returns>
@ -88,7 +88,7 @@ public class DateTimeHelper
return ConvertToMonthString((DateTime)dateTime); return ConvertToMonthString((DateTime)dateTime);
} }
/// <summary> /// <summary>
/// 格式化DateTime类型为字符串类型，精确到天，如：2008/01/01 /// 格式化DateTime类型为字符串类型，精确到天，如：2008-01-01
/// </summary> /// </summary>
/// <param name="dateTime"></param> /// <param name="dateTime"></param>
/// <returns></returns> /// <returns></returns>
@ -98,10 +98,10 @@ public class DateTimeHelper
{ {
return ""; return "";
} }
return dateTime.ToString(@"yyyy\/MM\/dd"); return dateTime.ToString(@"yyyy\-MM\-dd");
} }
/// <summary> /// <summary>
/// 格式化DateTime类型为字符串类型，精确到天，如：2008/01/01 /// 格式化DateTime类型为字符串类型，精确到天，如：2008-01-01
/// </summary> /// </summary>
/// <param name="dateTime"></param> /// <param name="dateTime"></param>
/// <returns></returns> /// <returns></returns>
@ -119,7 +119,7 @@ public class DateTimeHelper
} }
/// <summary> /// <summary>
/// 格式化DateTime类型为字符串类型，精确到小时，如：2008/01/01 18 /// 格式化DateTime类型为字符串类型，精确到小时，如：2008-01-01 18
/// </summary> /// </summary>
/// <param name="dateTime"></param> /// <param name="dateTime"></param>
/// <returns></returns> /// <returns></returns>
@ -129,10 +129,10 @@ public class DateTimeHelper
{ {
return ""; return "";
} }
return dateTime.ToString(@"yyyy\/MM\/dd HH"); return dateTime.ToString(@"yyyy\-MM\-dd HH");
} }
/// <summary> /// <summary>
/// 格式化object类型为字符串类型，精确到小时，如：2008/01/01 18 /// 格式化object类型为字符串类型，精确到小时，如：2008-01-01 18
/// </summary> /// </summary>
/// <param name="dateTime"></param> /// <param name="dateTime"></param>
/// <returns></returns> /// <returns></returns>
@ -146,7 +146,7 @@ public class DateTimeHelper
} }
/// <summary> /// <summary>
/// 格式化object类型为字符串类型，精确到天，如：2008/01/01 /// 格式化object类型为字符串类型，精确到天，如：2008-01-01
/// </summary> /// </summary>
/// <param name="dateTime"></param> /// <param name="dateTime"></param>
/// <returns></returns> /// <returns></returns>
@ -162,7 +162,7 @@ public class DateTimeHelper
} }
/// <summary> /// <summary>
/// 格式化DateTime类型为字符串类型，精确到分钟，如：2008/01/01 18:09 /// 格式化DateTime类型为字符串类型，精确到分钟，如：2008-01-01 18:09
/// </summary> /// </summary>
/// <param name="dateTime"></param> /// <param name="dateTime"></param>
/// <returns></returns> /// <returns></returns>
@ -172,11 +172,11 @@ public class DateTimeHelper
{ {
return ""; return "";
} }
return dateTime.ToString(@"yyyy\/MM\/dd HH:mm"); return dateTime.ToString(@"yyyy\-MM\-dd HH:mm");
} }
/// <summary> /// <summary>
/// 格式化object类型为字符串类型，精确到分钟，如：2008/01/01 18:09 /// 格式化object类型为字符串类型，精确到分钟，如：2008-01-01 18:09
/// </summary> /// </summary>
/// <param name="dateTime"></param> /// <param name="dateTime"></param>
/// <returns></returns> /// <returns></returns>
@ -190,7 +190,7 @@ public class DateTimeHelper
} }
/// <summary> /// <summary>
/// 格式化DateTime类型为字符串类型，精确到秒，如：2008/01/01 18:09:20 /// 格式化DateTime类型为字符串类型，精确到秒，如：2008-01-01 18:09:20
/// </summary> /// </summary>
/// <param name="dateTime"></param> /// <param name="dateTime"></param>
/// <returns></returns> /// <returns></returns>
@ -200,7 +200,7 @@ public class DateTimeHelper
{ {
return ""; return "";
} }
return dateTime.ToString(@"yyyy\/MM\/dd HH:mm:ss"); return dateTime.ToString(@"yyyy\-MM\-dd HH:mm:ss");
} }
/// <summary> /// <summary>
/// 格式化DateTime类型为字符串类型，精确到秒，如：20080101180920 /// 格式化DateTime类型为字符串类型，精确到秒，如：20080101180920
@ -216,7 +216,7 @@ public class DateTimeHelper
return dateTime.ToString(@"yyyyMMddHHmmss"); return dateTime.ToString(@"yyyyMMddHHmmss");
} }
/// <summary> /// <summary>
/// 格式化object类型为字符串类型，精确到秒，如：2008/01/01 18:09:20 /// 格式化object类型为字符串类型，精确到秒，如：2008-01-01 18:09:20
/// </summary> /// </summary>
/// <param name="dateTime"></param> /// <param name="dateTime"></param>
/// <returns></returns> /// <returns></returns>
@ -310,7 +310,7 @@ public class DateTimeHelper
} }
/// <summary> /// <summary>
/// 格式化DateTime类型为字符串类型，如：2020/05 /// 格式化DateTime类型为字符串类型，如：2020-05
/// </summary> /// </summary>
/// <param name="dateTime"></param> /// <param name="dateTime"></param>
/// <returns></returns> /// <returns></returns>
@ -320,10 +320,10 @@ public class DateTimeHelper
{ {
return ""; return "";
} }
return dateTime.ToString(@"yyyy\/MM"); return dateTime.ToString(@"yyyy\-MM");
} }
/// <summary> /// <summary>
/// 格式化object类型为字符串类型，如：2020/05 /// 格式化object类型为字符串类型，如：2020-05
/// </summary> /// </summary>
/// <param name="dateTime"></param> /// <param name="dateTime"></param>
/// <returns></returns> /// <returns></returns>

27
Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs
Unescape View File

@ -191,22 +191,25 @@ WHERE A.IsEnable = 1 AND A.Id = {entitys[i].YearHumanId}");
public override async Task<Ghrh_HumanRequestDto> QueryById(object objId) public override async Task<Ghrh_HumanRequestDto> QueryById(object objId)
{ {
var result = await base.QueryById(objId); var result = await base.QueryById(objId);
result.DeptName = (await Db.Queryable<Ghro_Dept>().FirstAsync(o => result.DeptId == o.DeptID))?.DeptName; if (result != null)
if (result.TitleId.IsNotEmptyOrNull())
result.TitleName = (await Db.Queryable<Ghra_Title>().FirstAsync(o => result.TitleId == o.TitleID))?.TitleName;
#region 返回部门负责人信息
var dept = await Db.Queryable<Ghro_Dept>().Where(x => x.DeptID == result.DeptId).FirstAsync();
if (dept != null)
{ {
var staff = await Db.Queryable<Ghra_Staff>().Where(x => x.StaffID == dept.DeptManagerID).FirstAsync(); result.DeptName = (await Db.Queryable<Ghro_Dept>().FirstAsync(o => result.DeptId == o.DeptID))?.DeptName;
if (staff != null) if (result.TitleId.IsNotEmptyOrNull())
result.TitleName = (await Db.Queryable<Ghra_Title>().FirstAsync(o => result.TitleId == o.TitleID))?.TitleName;
#region 返回部门负责人信息
var dept = await Db.Queryable<Ghro_Dept>().Where(x => x.DeptID == result.DeptId).FirstAsync();
if (dept != null)
{ {
result.DeptManagerID = staff.StaffID; var staff = await Db.Queryable<Ghra_Staff>().Where(x => x.StaffID == dept.DeptManagerID).FirstAsync();
result.DeptManagerEmail = staff.Email; if (staff != null)
{
result.DeptManagerID = staff.StaffID;
result.DeptManagerEmail = staff.Email;
}
} }
#endregion
} }
#endregion
return result; return result;
} }

4
Tiobon.Core.Services/Ghrh/Ghrh_InterviewRecordServices.cs
Unescape View File

@ -1,6 +1,4 @@
using MySqlX.XDevAPI.Common; namespace Tiobon.Core.Services;
namespace Tiobon.Core.Services;
/// <summary> /// <summary>
/// 面试记录 (服务) /// 面试记录 (服务)

30
Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs
Unescape View File

@ -1316,6 +1316,24 @@ A.DataType, A.ColumnType, A.IsRequired, A.DataSourceType, A.DataSource, A.DataSo
} }
#endregion #endregion
resume.Base.Education = resume.Base.EduDegree; resume.Base.Education = resume.Base.EduDegree;
#region 计算工作年限
var days = 0;
if (resume.WorkExp != null && resume.WorkExp.Any())
{
resume.WorkExp.ForEach(x =>
{
if (x.BeginDate != null && x.EndDate != null && x.EndDate > x.BeginDate)
{
var difference = x.EndDate.Value - x.BeginDate.Value;
days += difference.TotalDays.ObjToInt();
}
});
}
resume.Base.WorkYears = days / 365;
#endregion
await base.Update(id, resume.Base); await base.Update(id, resume.Base);
await _ghrh_ResumeHomeServices.Delete(x => x.ResumeId != null && x.ResumeId == id);//家庭关系 await _ghrh_ResumeHomeServices.Delete(x => x.ResumeId != null && x.ResumeId == id);//家庭关系
@ -3050,12 +3068,12 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
{ {
var request = await _ghrh_HumanRequestServices.QueryById(order.RequestId); var request = await _ghrh_HumanRequestServices.QueryById(order.RequestId);
result.RequestId = order.RequestId; result.RequestId = order.RequestId;
result.DeptName = request.DeptName; result.DeptName = request?.DeptName;
result.TitleName = request.TitleName; result.TitleName = request?.TitleName;
result.ResumeCount = request.RequestCount; result.ResumeCount = request?.RequestCount;
result.RecommendCount = request.RecommendCount; result.RecommendCount = request?.RecommendCount;
result.InterviewCount = request.InterviewCount; result.InterviewCount = request?.InterviewCount;
result.OfferCount = request.OfferCount; result.OfferCount = request?.OfferCount;
} }
else else
{ {

Write Preview
Loading…
Cancel
Save