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

แก้คำสั่งพ้น

Browse source
This commit is contained in:
Kittapath 2024-06-11 11:58:38 +07:00
parent bd7fe04395
commit ee72e497e2
11 changed files with 18060 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/release_reportV2.yaml vendored
View file

@ -11,7 +11,7 @@ on:
env:
REGISTRY: docker.frappet.com
IMAGE_NAME: ehr/bma-ehr-report-v2-service
DEPLOY_HOST: 192.168.1.80
DEPLOY_HOST: frappet.com
COMPOSE_PATH: /home/frappet/docker/bma-ehr
TOKEN_LINE: uxuK5hDzS2DsoC5piJBrWRLiz8GgY7iMZZldOWsDDF0

119
BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
View file

@ -322,25 +322,27 @@ namespace BMA.EHR.Application.Repositories.Commands
orderby r.Sequence
select new CommandType03Response
{
// Education = pf.Educations == null || pf.Educations.Count == 0 ? "" :
// pf.Educations.OrderByDescending(x => x.StartDate).FirstOrDefault().Degree,
Education = p.EducationOld == null ? "-" : p.EducationOld,
Seq = r.Sequence.ToString().ToThaiNumber(),
CitizenId = r.CitizenId,
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
// OldOc = pf.Oc == null ? "" : pf.Oc.Replace("/", " "),
// OldPositionName = pf.Position == null ? "" : pf.Position.Name,
// OldPositionLevel = pf.PositionLevel == null ? "" : pf.PositionLevel.Name,
// OldPositionType = pf.PositionType == null ? "" : pf.PositionType.Name,
// OldPositionNumber = pf.PosNo == null ? "" : pf.PosNo.Name.ToThaiNumber(),
// OldSalary = pf.Salaries == null || pf.Salaries.Count == 0 ? "" : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
OldOc = p.rootOld == null ? "" : p.rootOld,
OldPositionName = p.OrganizationOld == null ? "" : p.OrganizationOld,
OldPositionLevel = p.PositionLevelOld == null ? "" : p.PositionLevelOld,
OldPositionType = p.PositionTypeOld == null ? "" : p.PositionTypeOld,
OldPositionNumber = p.PositionNumberOld == null ? "" : p.PositionNumberOld,
OldSalary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
// OldSalaryDate = pf.Salaries == null || pf.Salaries.Count == 0 ? "" : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Date.Value.ToThaiShortDate2().ToThaiNumber(),
// NewOc = p.OrganizationPosition == null || p.OrganizationPosition!.Organization == null ? "" : _organizationCommonRepository.GetOrganizationNameFullPath(p.OrganizationPosition!.Organization!.Id, false, false, "/"),
// NewPositionName = p.PositionPath == null ? "" : p.PositionPath!.Name,
// NewPositionLevel = p.PositionLevel == null ? "" : p.PositionLevel.Name,
// NewPositionType = p.PositionType == null ? "" : p.PositionType.Name,
// NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name.ToThaiNumber(),
OldSalaryDate = p.PositionDate == null ? "" : p.PositionDate.Value.ToThaiShortDate2().ToThaiNumber(),
NewOc = p.root == null ? "" : p.root,
NewPositionName = p.position == null ? "" : p.position,
NewPositionLevel = p.posLevelName == null ? "" : p.posLevelName,
NewPositionType = p.posTypeName == null ? "" : p.posTypeName,
NewPositionNumber = p.posMasterNo == null ? "" :
p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "",
NewSalary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
AppointDate = p.ReportingDate == null ? "" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
Reason = p.Reason == null ? "-" : p.Reason,
@ -394,18 +396,23 @@ namespace BMA.EHR.Application.Repositories.Commands
Seq = r.Sequence.ToString().ToThaiNumber(),
CitizenId = r.CitizenId,
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
// OldOc = pf.Oc == null ? "" : pf.Oc.Replace("/", " "),
// OldPositionName = pf.Position == null ? "" : pf.Position.Name,
// OldPositionLevel = pf.PositionLevel == null ? "" : pf.PositionLevel.Name,
// OldPositionType = pf.PositionType == null ? "" : pf.PositionType.Name,
// OldPositionNumber = pf.PosNo == null ? "" : pf.PosNo.Name.ToThaiNumber(),
// OldSalary = pf.Salaries == null || pf.Salaries.Count == 0 ? "" : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
OldOc = p.rootOld == null ? "" : p.rootOld,
OldPositionName = p.OrganizationOld == null ? "" : p.OrganizationOld,
OldPositionLevel = p.PositionLevelOld == null ? "" : p.PositionLevelOld,
OldPositionType = p.PositionTypeOld == null ? "" : p.PositionTypeOld,
OldPositionNumber = p.PositionNumberOld == null ? "" : p.PositionNumberOld,
OldSalary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
// NewOc = p.OrganizationPosition == null || p.OrganizationPosition!.Organization == null ? "" : _organizationCommonRepository.GetOrganizationNameFullPath(p.OrganizationPosition!.Organization!.Id, false, false, "/"),
// NewPositionName = p.PositionPath == null ? "" : p.PositionPath!.Name,
// NewPositionLevel = p.PositionLevel == null ? "" : p.PositionLevel.Name,
// NewPositionType = p.PositionType == null ? "" : p.PositionType.Name,
// NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name.ToThaiNumber(),
OldSalaryDate = p.PositionDate == null ? "" : p.PositionDate.Value.ToThaiShortDate2().ToThaiNumber(),
NewOc = p.root == null ? "" : p.root,
NewPositionName = p.position == null ? "" : p.position,
NewPositionLevel = p.posLevelName == null ? "" : p.posLevelName,
NewPositionType = p.posTypeName == null ? "" : p.posTypeName,
NewPositionNumber = p.posMasterNo == null ? "" :
p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "",
NewSalary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
AppointDate = p.ReportingDate == null ? "" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
Reason = p.Reason == null ? "-" : p.Reason,
@ -835,10 +842,10 @@ namespace BMA.EHR.Application.Repositories.Commands
var report_data = (from r in raw_data
join p in _dbContext.Set<RetirementResign>()
//.Include(p => p.Profile)
//.ThenInclude(p => p.Position)
//.Include(p => p.Profile)
//.ThenInclude(p => p.Salaries)
//.Include(p => p.Profile)
//.ThenInclude(p => p.Position)
//.Include(p => p.Profile)
//.ThenInclude(p => p.Salaries)
on r.RefPlacementProfileId equals p.Id
orderby r.Sequence
select new CommandType17Response
@ -1128,15 +1135,21 @@ namespace BMA.EHR.Application.Repositories.Commands
{
Seq = r.Sequence.ToString().ToThaiNumber(),
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
Organization = p.OrganizationPositionOld,
Organization = p.rootOld,
OldPositionName = p.OrganizationPositionOld,
OldPositionLevel = p.PositionLevelOld,
OldPositionNumber = p.PositionNumberOld == null ? null : p.PositionNumberOld.ToThaiNumber(),
OldSalary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
// NewOc = p.OrganizationPosition == null || p.OrganizationPosition!.Organization == null ? "" : _organizationCommonRepository.GetOrganizationNameFullPath(p.OrganizationPosition!.Organization!.Id, false, false, "/"),
// NewPositionName = p.OrgEmployee == null || p.OrgEmployee.PositionEmployeePosition == null ? "" : p.OrgEmployee.PositionEmployeePosition.Name,
// NewPositionLevel = p.OrgEmployee == null || p.OrgEmployee.OrganizationPositionEmployeeLevels == null || p.OrgEmployee.OrganizationPositionEmployeeLevels.Count() == 0 ? "" : p.OrgEmployee.OrganizationPositionEmployeeLevels.FirstOrDefault().PositionEmployeeLevel.Name,
// NewPositionNumber = p.OrgEmployee == null || p.OrgEmployee.PosNo == null ? "" : p.OrgEmployee.PosNo.ToThaiNumber(),
NewOc = p.root == null ? "" : p.root,
NewPositionName = p.position == null ? "" : p.position,
NewPositionLevel = p.posLevelName == null ? "" : p.posLevelName,
// NewPositionType = p.posTypeName == null ? "" : p.posTypeName,
NewPositionNumber = p.posMasterNo == null ? "" :
p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "",
NewSalary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
Reason = p.Reason == null ? "-" : p.Reason,
})
@ -1165,20 +1178,20 @@ namespace BMA.EHR.Application.Repositories.Commands
var report_data = (from r in raw_data
join p in _dbContext.Set<RetirementResign>()
//.Include(x => x.Profile)
//.ThenInclude(x => x.Position)
//.Include(x => x.Profile)
//.ThenInclude(x => x.PositionLevel)
//.Include(x => x.Profile)
//.ThenInclude(x => x.PositionType)
//.Include(x => x.Profile)
//.ThenInclude(x => x.PosNo)
//.Include(x => x.Profile)
//.ThenInclude(x => x.Position)
//.Include(x => x.Profile)
//.ThenInclude(x => x.PositionLevel)
//.Include(x => x.Profile)
//.ThenInclude(x => x.PositionType)
//.Include(x => x.Profile)
//.ThenInclude(x => x.PosNo)
//.Include(x => x.Profile)
//.ThenInclude(x => x.PositionEmployeePosition)
//.Include(x => x.Profile)
//.ThenInclude(x => x.PositionEmployeeLevel)
//.Include(x => x.Profile)
//.ThenInclude(x => x.PositionEmployeePosition)
//.Include(x => x.Profile)
//.ThenInclude(x => x.PositionEmployeeLevel)
//.Include(x => x.OrgEmployee)
//.ThenInclude(x => x.OrganizationAgency)
//.ThenInclude(x => x.OrganizationOrganization)
@ -1260,10 +1273,16 @@ namespace BMA.EHR.Application.Repositories.Commands
OldPositionLevel = p.PositionLevelOld,
OldPositionNumber = p.PositionNumberOld == null ? null : p.PositionNumberOld.ToThaiNumber(),
OldSalary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
// NewOc = p.OrganizationPosition == null || p.OrganizationPosition!.Organization == null ? "" : _organizationCommonRepository.GetOrganizationNameFullPath(p.OrganizationPosition!.Organization!.Id, false, false, "/"),
// NewPositionName = p.OrgEmployee == null || p.OrgEmployee.PositionEmployeePosition == null ? "" : p.OrgEmployee.PositionEmployeePosition.Name,
// NewPositionLevel = p.OrgEmployee == null || p.OrgEmployee.OrganizationPositionEmployeeLevels == null || p.OrgEmployee.OrganizationPositionEmployeeLevels.Count() == 0 ? "" : p.OrgEmployee.OrganizationPositionEmployeeLevels.FirstOrDefault().PositionEmployeeLevel.Name,
// NewPositionNumber = p.OrgEmployee == null || p.OrgEmployee.PosNo == null ? "" : p.OrgEmployee.PosNo.ToThaiNumber(),
NewOc = p.root == null ? "" : p.root,
NewPositionName = p.position == null ? "" : p.position,
NewPositionLevel = p.posLevelName == null ? "" : p.posLevelName,
// NewPositionType = p.posTypeName == null ? "" : p.posTypeName,
NewPositionNumber = p.posMasterNo == null ? "" :
p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "",
NewSalary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
Reason = p.Reason == null ? "-" : p.Reason,
})

2
BMA.EHR.Application/Responses/Reports/CommandType22Response.cs
View file

@ -10,7 +10,7 @@
public string? OldPositionLevel { get; set; } = string.Empty;
public string? OldPositionNumber { get; set; } = string.Empty;
public string? OldSalary { get; set; } = "";
// public string NewOc { get; set; } = string.Empty;
public string? NewOc { get; set; } = string.Empty;
public string? NewPositionName { get; set; } = string.Empty;
public string? NewPositionLevel { get; set; } = string.Empty;
public string? NewPositionNumber { get; set; } = string.Empty;

11
BMA.EHR.Command.Service/Controllers/OrderController.cs
View file

@ -4565,11 +4565,11 @@ namespace BMA.EHR.Command.Service.Controllers
.OrderBy(x => x.Sequence)
.Select(r => new CommandReceiverResponse
{
RefRecordId = r.RefPlacementProfileId == null? Guid.Parse("00000000-0000-0000-0000-000000000000") : r.RefPlacementProfileId.Value,
RefRecordId = r.RefPlacementProfileId == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : r.RefPlacementProfileId.Value,
PersonalId = r.Id,
Sequence = r.Sequence,
IdCard = r.CitizenId,
Name = $"{r.Prefix!}{r.FirstName!} {r.LastName!}",
Name = $"{r.FirstName!} {r.LastName!}",
SelectStatus = r.RefPlacementProfileId == null ? false : (existed.FirstOrDefault(x => x.RefPlacementProfileId!.Value == r.RefPlacementProfileId!.Value) != null),
Education = "" // ยังหาไม่เจอว่าอยุ่ field ไหน
}).ToList();
@ -4846,14 +4846,13 @@ namespace BMA.EHR.Command.Service.Controllers
var deploys = new List<CommandDeployment>();
foreach (var p in req)
{
var prefix = await _prefixRepository.GetByIdAsync(p.PrefixId);
deploys.Add(new CommandDeployment
{
CitizenId = p.IdCard,
Prefix = prefix.Name,
CitizenId = p.CitizenId,
Prefix = p.Prefix,
FirstName = p.FirstName,
LastName = p.LastName,
OrganizationName = p.Unit,
OrganizationName = p.OrganizationName,
PositionName = p.Position
});
}

12
BMA.EHR.Command.Service/Requests/CreateCommandDeploymentRequest.cs
View file

@ -4,16 +4,16 @@
{
public Guid ProfileId { get; set; } = Guid.Empty;
public string IdCard { get; set; } = string.Empty;
public string CitizenId { get; set; } = string.Empty;
public Guid PrefixId { get; set;} = Guid.Empty;
public string Prefix { get; set; } = string.Empty;
public string FirstName { get; set;} = string.Empty;
public string FirstName { get; set; } = string.Empty;
public string LastName { get; set;} = string.Empty;
public string LastName { get; set; } = string.Empty;
public string Position { get; set;} = string.Empty;
public string Position { get; set; } = string.Empty;
public string Unit { get; set;} = string.Empty;
public string OrganizationName { get; set; } = string.Empty;
}
}

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

@ -43,6 +43,10 @@ namespace BMA.EHR.Domain.Models.Retirement
public bool IsActive { get; set; } = true;
[Comment("สถานะไม่เป็นหนี้สหกรณ์")]
public bool IsNoDebt { get; set; } = false;
[Comment("สถานะไม่มีภาระผูกพันค้ำประกันทุนการศึกษา")]
public bool IsNoBurden { get; set; } = false;
[Comment("สถานะพฤติการณ์ทางวินัย")]
public bool IsDiscipline { get; set; } = false;
[Comment("สถานะยับยั้งผู้ดูแล")]
public bool? OligarchReject { get; set; }
[Comment("เหตุผลอนุมัติผู้ดูแล")]

17920
BMA.EHR.Infrastructure/Migrations/20240611045153_update table RetirementProfile add isdiscripline.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

42
BMA.EHR.Infrastructure/Migrations/20240611045153_update table RetirementProfile add isdiscripline.cs Normal file
View file

@ -0,0 +1,42 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Infrastructure.Migrations
{
/// <inheritdoc />
public partial class updatetableRetirementProfileaddisdiscripline : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "IsDiscipline",
table: "RetirementResigns",
type: "tinyint(1)",
nullable: false,
defaultValue: false,
comment: "สถานะพฤติการณ์ทางวินัย");
migrationBuilder.AddColumn<bool>(
name: "IsNoBurden",
table: "RetirementResigns",
type: "tinyint(1)",
nullable: false,
defaultValue: false,
comment: "สถานะไม่มีภาระผูกพันค้ำประกันทุนการศึกษา");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "IsDiscipline",
table: "RetirementResigns");
migrationBuilder.DropColumn(
name: "IsNoBurden",
table: "RetirementResigns");
}
}
}

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

@ -15622,6 +15622,14 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("tinyint(1)")
.HasComment("สถานะการใช้งาน");
b.Property<bool>("IsDiscipline")
.HasColumnType("tinyint(1)")
.HasComment("สถานะพฤติการณ์ทางวินัย");
b.Property<bool>("IsNoBurden")
.HasColumnType("tinyint(1)")
.HasComment("สถานะไม่มีภาระผูกพันค้ำประกันทุนการศึกษา");
b.Property<bool>("IsNoDebt")
.HasColumnType("tinyint(1)")
.HasComment("สถานะไม่เป็นหนี้สหกรณ์");

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

@ -548,6 +548,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
if (updated == null)
return Error(GlobalMessages.RetirementResignNotFound, 404);
updated.IsNoDebt = req.IsNoDebt;
updated.IsNoBurden = req.IsNoBurden;
updated.IsDiscipline = req.IsDiscipline;
updated.LastUpdateFullName = FullName ?? "System Administrator";
updated.LastUpdateUserId = UserId ?? "";
updated.LastUpdatedAt = DateTime.Now;

2
BMA.EHR.Retirement.Service/Requests/RetirementResignDebtRequest.cs
View file

@ -6,6 +6,8 @@ namespace BMA.EHR.Retirement.Service.Requests
public class RetirementResignDebtRequest
{
public bool IsNoDebt { get; set; }
public bool IsNoBurden { get; set; }
public bool IsDiscipline { get; set; }
// public List<FormFile>? File { get; set; }
}
}