hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

add ReasonResign
Some checks failed
release-dev / release-dev (push) Failing after 13s
Details

Browse source
This commit is contained in:
kittapath 2025-01-13 16:52:51 +07:00
parent 549bbfcf52
commit a6b256a39c
9 changed files with 19284 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Domain/Models/Retirement/RetirementResign.cs
View file

@ -18,6 +18,8 @@ namespace BMA.EHR.Domain.Models.Retirement
[Comment("วันที่ขอออกราชการ")]
public DateTime? ActiveDate { get; set; }
[Comment("เหตุผลที่ลาออกจากราชการ")]
public string? ReasonResign { get; set; } = string.Empty;
[Comment("เหตุผลที่ลาออกจากราชการ")]
public string? Reason { get; set; } = string.Empty;
[Comment("เหตุผลที่ลาออกจากราชการ(อื่นๆ)")]
public string? Remark { get; set; } = string.Empty;

2
BMA.EHR.Domain/Models/Retirement/RetirementResignEmployee.cs
View file

@ -18,6 +18,8 @@ namespace BMA.EHR.Domain.Models.Retirement
[Comment("วันที่ขอออกราชการ")]
public DateTime? ActiveDate { get; set; }
[Comment("เหตุผลที่ลาออกจากราชการ")]
public string? ReasonResign { get; set; } = string.Empty;
[Comment("เหตุผลที่ลาออกจากราชการ")]
public string? Reason { get; set; } = string.Empty;
[Comment("เหตุผลที่ลาออกจากราชการ(อื่นๆ)")]
public string? Remark { get; set; } = string.Empty;

19187
BMA.EHR.Infrastructure/Migrations/20250113094243_update table RetirementResigns add ReasonResign.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

42
BMA.EHR.Infrastructure/Migrations/20250113094243_update table RetirementResigns add ReasonResign.cs Normal file
View file

@ -0,0 +1,42 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Infrastructure.Migrations
{
/// <inheritdoc />
public partial class updatetableRetirementResignsaddReasonResign : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "ReasonResign",
table: "RetirementResigns",
type: "longtext",
nullable: true,
comment: "เหตุผลที่ลาออกจากราชการ")
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "ReasonResign",
table: "RetirementResignEmployees",
type: "longtext",
nullable: true,
comment: "เหตุผลที่ลาออกจากราชการ")
.Annotation("MySql:CharSet", "utf8mb4");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ReasonResign",
table: "RetirementResigns");
migrationBuilder.DropColumn(
name: "ReasonResign",
table: "RetirementResignEmployees");
}
}
}

8
BMA.EHR.Infrastructure/Migrations/ApplicationDBContextModelSnapshot.cs
View file

@ -16021,6 +16021,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("เหตุผลที่ลาออกจากราชการ");
b.Property<string>("ReasonResign")
.HasColumnType("longtext")
.HasComment("เหตุผลที่ลาออกจากราชการ");
b.Property<string>("RejectReason")
.HasColumnType("longtext")
.HasComment("เหตุผลไม่อนุมัติ");
@ -16722,6 +16726,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("เหตุผลที่ลาออกจากราชการ");
b.Property<string>("ReasonResign")
.HasColumnType("longtext")
.HasComment("เหตุผลที่ลาออกจากราชการ");
b.Property<string>("RejectReason")
.HasColumnType("longtext")
.HasComment("เหตุผลไม่อนุมัติ");

23
BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
View file

@ -149,6 +149,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.SendDate,
p.ActiveDate,
p.Reason,
p.ReasonResign,
p.Remark,
p.ApproveReason,
p.RejectReason,
@ -243,6 +244,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.SendDate,
p.ActiveDate,
p.Reason,
p.ReasonResign,
p.Remark,
p.Status,
salary = p.AmountOld,
@ -366,6 +368,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.SendDate,
p.ActiveDate,
p.Reason,
p.ReasonResign,
p.Remark,
p.Status,
salary = p.AmountOld,
@ -458,6 +461,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
data.SendDate,
data.ActiveDate,
data.Reason,
data.ReasonResign,
data.Remark,
data.Status,
data.salary,
@ -884,6 +888,19 @@ namespace BMA.EHR.Retirement.Service.Controllers
// if (profile == null)
// return Error(GlobalMessages.DataNotFound, 404);
var Remark = req.Remark;
if (req.Reason != null)
{
switch (req.Reason.Trim().ToLower())
{
case "CAREER": Remark = $"ประกอบอาชีพอื่น ({req.Remark})"; break;
case "MOVE": Remark = $"รับราชการสังกัดอื่น ({req.Remark})"; break;
case "FAMILY": Remark = $"ดูแลบิดามารดา ({req.Remark})"; break;
case "EDUCATION": Remark = $"ศึกษาต่อ ({req.Remark})"; break;
case "OTHER": Remark = $"อื่น ๆ ({req.Remark})"; break;
}
}
var retirementResign = new RetirementResign
{
// Profile = profile,
@ -891,6 +908,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
SendDate = DateTime.Now,
ActiveDate = req.ActiveDate,
Reason = req.Reason,
ReasonResign = Remark,
Remark = req.Remark,
// AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount,
// PositionLevelOld = profile.PositionLevel == null ? null : profile.PositionLevel.Name,
@ -1028,8 +1046,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
updated.Location = req.Location;
updated.ActiveDate = req.ActiveDate;
updated.Reason = req.Reason;
// updated.Reason = req.Reason;
updated.Remark = req.Remark;
updated.ReasonResign = req.Reason;
updated.OrganizationPositionOld = req.OrganizationPositionOld;
updated.RemarkHorizontal = req.RemarkHorizontal;
updated.PositionTypeOld = req.PositionTypeOld;
@ -1180,7 +1199,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
Location = updated.Location,
SendDate = updated.SendDate,
ActiveDate = updated.ActiveDate,
Reason = updated.Reason,
Reason = updated.ReasonResign,
Remark = updated.Remark,
OrganizationPositionOld = updated.OrganizationPositionOld,
PositionTypeOld = updated.PositionTypeOld,

22
BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
View file

@ -93,6 +93,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.SendDate,
p.ActiveDate,
p.Reason,
p.ReasonResign,
p.Remark,
p.ApproveReason,
p.RejectReason,
@ -187,6 +188,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.SendDate,
p.ActiveDate,
p.Reason,
p.ReasonResign,
p.Remark,
p.Status,
salary = p.AmountOld,
@ -309,6 +311,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.SendDate,
p.ActiveDate,
p.Reason,
p.ReasonResign,
p.Remark,
p.Status,
salary = p.AmountOld,
@ -401,6 +404,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
data.SendDate,
data.ActiveDate,
data.Reason,
data.ReasonResign,
data.Remark,
data.Status,
data.salary,
@ -827,6 +831,18 @@ namespace BMA.EHR.Retirement.Service.Controllers
// if (profile == null)
// return Error(GlobalMessages.DataNotFound, 404);
var Remark = req.Remark;
if (req.Reason != null)
{
switch (req.Reason.Trim().ToLower())
{
case "CAREER": Remark = $"ประกอบอาชีพอื่น ({req.Remark})"; break;
case "MOVE": Remark = $"รับราชการสังกัดอื่น ({req.Remark})"; break;
case "FAMILY": Remark = $"ดูแลบิดามารดา ({req.Remark})"; break;
case "EDUCATION": Remark = $"ศึกษาต่อ ({req.Remark})"; break;
case "OTHER": Remark = $"อื่น ๆ ({req.Remark})"; break;
}
}
var retirementResignEmployee = new RetirementResignEmployee
{
// Profile = profile,
@ -834,6 +850,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
SendDate = DateTime.Now,
ActiveDate = req.ActiveDate,
Reason = req.Reason,
ReasonResign = Remark,
Remark = req.Remark,
// AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount,
// PositionLevelOld = profile.PositionLevel == null ? null : profile.PositionLevel.Name,
@ -971,8 +988,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
updated.Location = req.Location;
updated.ActiveDate = req.ActiveDate;
updated.Reason = req.Reason;
// updated.Reason = req.Reason;
updated.Remark = req.Remark;
updated.ReasonResign = req.Reason;
updated.OrganizationPositionOld = req.OrganizationPositionOld;
updated.RemarkHorizontal = req.RemarkHorizontal;
updated.PositionTypeOld = req.PositionTypeOld;
@ -1123,7 +1141,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
Location = updated.Location,
SendDate = updated.SendDate,
ActiveDate = updated.ActiveDate,
Reason = updated.Reason,
Reason = updated.ReasonResign,
Remark = updated.Remark,
OrganizationPositionOld = updated.OrganizationPositionOld,
PositionTypeOld = updated.PositionTypeOld,

1
BMA.EHR.Retirement.Service/Requests/RetirementResignEmployeeRequest.cs
View file

@ -10,6 +10,7 @@ namespace BMA.EHR.Retirement.Service.Requests
public DateTime? ActiveDate { get; set; }
public string? Reason { get; set; }
public string? Remark { get; set; }
public string? ReasonResign { get; set; }
public string? OrganizationPositionOld { get; set; }
public string? PositionTypeOld { get; set; }
public string? PositionLevelOld { get; set; }

1
BMA.EHR.Retirement.Service/Requests/RetirementResignRequest.cs
View file

@ -10,6 +10,7 @@ namespace BMA.EHR.Retirement.Service.Requests
public DateTime? ActiveDate { get; set; }
public string? Reason { get; set; }
public string? Remark { get; set; }
public string? ReasonResign { get; set; }
public string? OrganizationPositionOld { get; set; }
public string? PositionTypeOld { get; set; }
public string? PositionLevelOld { get; set; }