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

Migrate & Fix Report ขอลาออก #1661, #1665
Some checks failed
release-dev / release-dev (push) Failing after 11s
Details

Browse source
This commit is contained in:
Bright 2025-07-25 18:08:48 +07:00
parent b548d8fea6
commit b40d4e2765
7 changed files with 21430 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

134
BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs
View file

@ -505,6 +505,7 @@ namespace BMA.EHR.Application.Repositories.Reports
p.CommanderRejectReason, p.CommanderRejectReason,
p.CommanderRejectDate, p.CommanderRejectDate,
p.RemarkHorizontal, p.RemarkHorizontal,
Type = "OFFICER"
}) })
.FirstOrDefaultAsync(); .FirstOrDefaultAsync();
if (data == null) if (data == null)
@ -542,10 +543,130 @@ namespace BMA.EHR.Application.Repositories.Reports
p.CommanderRejectReason, p.CommanderRejectReason,
p.CommanderRejectDate, p.CommanderRejectDate,
p.RemarkHorizontal, p.RemarkHorizontal,
Type = "EMPLOYEE",
}) })
.FirstOrDefaultAsync(); .FirstOrDefaultAsync();
if (data == null) if (data == null)
return null; return null;
var approverPositionExecutiveName = "...............";
var approverStatus = "☐ อนุญาต";
var approverRejectStatus = "☐ ยับยั้งการลาออกไว้จนถึงวันที่...................";
var approver = "...................";
var approverPosition = "...................";
var diffDate = "☐ ไม่น้อยกว่า ๓๐ วัน ☐ น้อยกว่า ๓๐ วัน";
if (data.SendDate.HasValue && data.ActiveDate.HasValue)
{
var time = data.ActiveDate.Value - data.SendDate.Value;
var day = time.TotalDays;
if (day < 30)
{
diffDate = "☐ ไม่น้อยกว่า ๓๐ วัน ☑ น้อยกว่า ๓๐ วัน";
}
else
{
diffDate = "☑ ไม่น้อยกว่า ๓๐ วัน ☐ น้อยกว่า ๓๐ วัน";
}
}
var commanderDateUpdate = "วันที่...................";
var commanderStatus = "☐ อนุญาต ตั้งแต่วันที่...................";
var commanderCommentApprove = "...................";
var commanderRejectStatus = "☐ ยับยั้งการลาออกไว้จนถึงวันที่...................";
var commanderCommentReject = "...................";
var commander = "...................";
var commanderPosition = "...................";
if (data.Type == "OFFICER")
{
var Approver = _dbContext.Set<RetirementResignApprover>()
.Where(x => x.RetirementResign.Id == data.Id && x.ApproveType == "APPROVER")
.ToList();
var Commander = _dbContext.Set<RetirementResignApprover>()
.Where(x => x.RetirementResign.Id == data.Id && x.ApproveType == "COMMANDER")
.OrderByDescending(x => x.Seq)
.ToList();
if (Approver.Count > 0)
{
approverPositionExecutiveName = Approver[0].PositionExecutiveName;
approverStatus = Approver[0].ApproveStatus == "APPROVE" ? "☑ อนุญาต" : approverStatus;
approverRejectStatus = Approver[0].ApproveStatus == "REJECT"
? $"☑ ยับยั้งการลาออกไว้จนถึง{(Approver[0].RejectDate != null ? DateTime.Parse(Approver[0].RejectDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber() : "วันที่...................")}"
: approverRejectStatus;
approver = $"{Approver[0].Prefix}{Approver[0].FirstName} {Approver[0].LastName}";
approverPosition = Approver[0].PositionName;
}
if (Commander.Count > 0)
{
commanderDateUpdate = Commander.Count > 1
? Commander[1].LastUpdatedAt != null
? DateTime.Parse(Commander[1].LastUpdatedAt.ToString()).ToThaiFullDate().ToString().ToThaiNumber()
: commanderDateUpdate
: Commander[0].LastUpdatedAt != null
? DateTime.Parse(Commander[0].LastUpdatedAt.ToString()).ToThaiFullDate().ToString().ToThaiNumber()
: commanderDateUpdate;
commanderStatus = Commander[0].ApproveStatus == "APPROVE"
? $"☑ อนุญาต ตั้งแต่{(Commander[0].LastUpdatedAt != null ? DateTime.Parse(Commander[0].LastUpdatedAt.ToString()).ToThaiFullDate().ToString().ToThaiNumber() : "วันที่...................")}"
: commanderStatus;
commanderCommentApprove = Commander[0].ApproveStatus == "APPROVE"
? !string.IsNullOrWhiteSpace(Commander[0].Comment) ? Commander[0].Comment : commanderCommentApprove
: commanderCommentApprove;
commanderRejectStatus = Commander[0].ApproveStatus == "REJECT"
? $"☑ ยับยั้งการลาออกไว้จนถึง{(Commander[0].RejectDate != null ? DateTime.Parse(Commander[0].RejectDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber() : "วันที่...................")}"
: approverRejectStatus;
commanderCommentReject = Commander[0].ApproveStatus == "REJECT"
? !string.IsNullOrWhiteSpace(Commander[0].Comment) ? Commander[0].Comment : commanderCommentReject
: commanderCommentReject;
commander = $"{Commander[0].Prefix}{Commander[0].FirstName} {Commander[0].LastName}";
commanderPosition = Commander[0].PositionName;
}
}
else
{
var EmpApproves = _dbContext.Set<RetirementResignEmployeeApprover>()
.Where(x => x.RetirementResignEmployee.Id == data.Id && x.ApproveType == "APPROVER")
.ToList();
var EmpCommander = _dbContext.Set<RetirementResignEmployeeApprover>()
.Where(x => x.RetirementResignEmployee.Id == data.Id && x.ApproveType == "COMMANDER")
.OrderByDescending(x => x.Seq)
.ToList();
if (EmpApproves.Count > 0)
{
approverPositionExecutiveName = EmpApproves[0].PositionExecutiveName;
approverStatus = EmpApproves[0].ApproveStatus == "APPROVE" ? "☑ อนุญาต" : approverStatus;
approverRejectStatus = EmpApproves[0].ApproveStatus == "REJECT"
? $"☑ ยับยั้งการลาออกไว้จนถึง{(EmpApproves[0].RejectDate != null ? DateTime.Parse(EmpApproves[0].RejectDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber() : "วันที่...................")}"
: approverRejectStatus;
approver = $"{EmpApproves[0].Prefix}{EmpApproves[0].FirstName} {EmpApproves[0].LastName}";
approverPosition = EmpApproves[0].PositionName;
}
if (EmpCommander.Count > 0)
{
commanderDateUpdate = EmpCommander.Count > 1
? EmpCommander[1].LastUpdatedAt != null
? DateTime.Parse(EmpCommander[1].LastUpdatedAt.ToString()).ToThaiFullDate().ToString().ToThaiNumber()
: commanderDateUpdate
: EmpCommander[0].LastUpdatedAt != null
? DateTime.Parse(EmpCommander[0].LastUpdatedAt.ToString()).ToThaiFullDate().ToString().ToThaiNumber()
: commanderDateUpdate;
commanderStatus = EmpCommander[0].ApproveStatus == "APPROVE"
? $"☑ อนุญาต ตั้งแต่{(EmpCommander[0].LastUpdatedAt != null ? DateTime.Parse(EmpCommander[0].LastUpdatedAt.ToString()).ToThaiFullDate().ToString().ToThaiNumber() : "วันที่...................")}"
: commanderStatus;
commanderCommentApprove = EmpCommander[0].ApproveStatus == "APPROVE"
? !string.IsNullOrWhiteSpace(EmpCommander[0].Comment) ? EmpCommander[0].Comment : commanderCommentApprove
: commanderCommentApprove;
commanderRejectStatus = EmpCommander[0].ApproveStatus == "REJECT"
? $"☑ ยับยั้งการลาออกไว้จนถึง{(EmpCommander[0].RejectDate != null ? DateTime.Parse(EmpCommander[0].RejectDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber() : "วันที่...................")}"
: approverRejectStatus;
commanderCommentReject = EmpCommander[0].ApproveStatus == "REJECT"
? !string.IsNullOrWhiteSpace(EmpCommander[0].Comment) ? EmpCommander[0].Comment : commanderCommentReject
: commanderCommentReject;
commander = $"{EmpCommander[0].Prefix}{EmpCommander[0].FirstName} {EmpCommander[0].LastName}";
commanderPosition = EmpCommander[0].PositionName;
}
}
var _data = new var _data = new
{ {
data.Id, data.Id,
@ -580,6 +701,19 @@ namespace BMA.EHR.Application.Repositories.Reports
data.CommanderRejectReason, data.CommanderRejectReason,
CommanderRejectDate = string.IsNullOrEmpty(data.CommanderRejectDate.ToString()) ? string.Empty : DateTime.Parse(data.CommanderRejectDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber(), CommanderRejectDate = string.IsNullOrEmpty(data.CommanderRejectDate.ToString()) ? string.Empty : DateTime.Parse(data.CommanderRejectDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber(),
data.RemarkHorizontal, data.RemarkHorizontal,
dear = approverPositionExecutiveName,
approverStatus,
approverRejectStatus,
approver,
approverPosition,
diffDate,
commanderDateUpdate,
commanderStatus,
commanderCommentApprove,
commanderRejectStatus,
commanderCommentReject,
commander,
commanderPosition
}; };
return _data; return _data;

21243
BMA.EHR.Infrastructure/Migrations/20250725070319_update_table_RetirementResignApprover&RetirementResignEmployeeApprover_add_field_PositionExecutiveName.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

40
BMA.EHR.Infrastructure/Migrations/20250725070319_update_table_RetirementResignApprover&RetirementResignEmployeeApprover_add_field_PositionExecutiveName.cs Normal file
View file

@ -0,0 +1,40 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Infrastructure.Migrations
{
/// <inheritdoc />
public partial class update_table_RetirementResignApproverRetirementResignEmployeeApprover_add_field_PositionExecutiveName : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "PositionExecutiveName",
table: "RetirementResignEmployeeApprovers",
type: "longtext",
nullable: false)
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "PositionExecutiveName",
table: "RetirementResignApprovers",
type: "longtext",
nullable: false)
.Annotation("MySql:CharSet", "utf8mb4");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "PositionExecutiveName",
table: "RetirementResignEmployeeApprovers");
migrationBuilder.DropColumn(
name: "PositionExecutiveName",
table: "RetirementResignApprovers");
}
}
}

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

@ -17661,6 +17661,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.IsRequired() .IsRequired()
.HasColumnType("longtext"); .HasColumnType("longtext");
b.Property<string>("PositionExecutiveName")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("PositionName") b.Property<string>("PositionName")
.IsRequired() .IsRequired()
.HasColumnType("longtext"); .HasColumnType("longtext");
@ -18642,6 +18646,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.IsRequired() .IsRequired()
.HasColumnType("longtext"); .HasColumnType("longtext");
b.Property<string>("PositionExecutiveName")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("PositionName") b.Property<string>("PositionName")
.IsRequired() .IsRequired()
.HasColumnType("longtext"); .HasColumnType("longtext");

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

@ -3157,6 +3157,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
FirstName = r.FirstName, FirstName = r.FirstName,
LastName = r.LastName, LastName = r.LastName,
PositionName = r.PositionName, PositionName = r.PositionName,
PositionExecutiveName = r.PositionExecutiveName,
ProfileId = r.ProfileId, ProfileId = r.ProfileId,
KeycloakId = r.KeycloakId, KeycloakId = r.KeycloakId,
Org = r.Org, Org = r.Org,

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

@ -2624,6 +2624,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
FirstName = r.FirstName, FirstName = r.FirstName,
LastName = r.LastName, LastName = r.LastName,
PositionName = r.PositionName, PositionName = r.PositionName,
PositionExecutiveName = r.PositionExecutiveName,
ProfileId = r.ProfileId, ProfileId = r.ProfileId,
KeycloakId = r.KeycloakId, KeycloakId = r.KeycloakId,
Org = r.Org, Org = r.Org,

3
BMA.EHR.Retirement.Service/Requests/RetirementRequestApproverDto.cs
View file

@ -19,6 +19,9 @@ namespace BMA.EHR.Retirement.Service.Requests
[JsonProperty("positionName")] [JsonProperty("positionName")]
public string PositionName { get; set; } = string.Empty; public string PositionName { get; set; } = string.Empty;
[JsonProperty("positionExecutiveName")]
public string PositionExecutiveName { get; set; } = string.Empty;
[JsonProperty("profileId")] [JsonProperty("profileId")]
public Guid ProfileId { get; set; } = Guid.Empty; public Guid ProfileId { get; set; } = Guid.Empty;