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

คำสั่ง 22 เพิ่มครั้งที่

Browse source
This commit is contained in:
Kittapath 2023-10-31 23:02:23 +07:00
parent cc711146c5
commit 6cfe02a2e0
8 changed files with 17021 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2850,7 +2850,7 @@ namespace BMA.EHR.Command.Service.Controllers
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
public async Task<ActionResult<ResponseObject>> PostType24Async([FromBody] CreateCommandGroup0Request req)
public async Task<ActionResult<ResponseObject>> PostType24Async([FromBody] CreateCommandGroup12Request req)
{
try
{
@ -2869,6 +2869,9 @@ namespace BMA.EHR.Command.Service.Controllers
CommandAffectDate = req.orderDate,
OwnerGovId = OcId,
ConclusionTranferNo = req.conclusionTranferNo,
ConclusionTranferDate = req.conclusionTranferDate,
};
var result = await _repository.AddAsync(inserted);
@ -2893,7 +2896,7 @@ namespace BMA.EHR.Command.Service.Controllers
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
public async Task<ActionResult<ResponseObject>> PutType24Async(Guid orderId, [FromBody] CreateCommandGroup0Request req)
public async Task<ActionResult<ResponseObject>> PutType24Async(Guid orderId, [FromBody] CreateCommandGroup12Request req)
{
try
{
@ -2915,6 +2918,8 @@ namespace BMA.EHR.Command.Service.Controllers
order.AuthorizedPosition = req.signatoryPosition;
order.CommandStatus = status!;
order.CommandAffectDate = req.orderDate;
order.ConclusionTranferNo = req.conclusionTranferNo;
order.ConclusionTranferDate = req.conclusionTranferDate;
var result = await _repository.UpdateAsync(order);

27
BMA.EHR.Command.Service/Requests/CreateCommandGroup12Request.cs Normal file
View file

@ -0,0 +1,27 @@
namespace BMA.EHR.Command.Service.Requests
{
public class CreateCommandGroup12Request
{
public Guid orderTypeValue { get; set; }
public string orderTitle { get; set; } = string.Empty;
public string orderNo { get; set; } = string.Empty;
public int orderYear { get; set; }
public DateTime orderDate { get; set; }
public Guid orderBy { get; set; }
public string orderByOrganizationName { get; set; } = string.Empty;
public string signatoryBy { get; set; } = string.Empty;
public string signatoryPosition { get; set; } = string.Empty;
public string? conclusionTranferNo { get; set; }
public DateTime? conclusionTranferDate { get; set; }
}
}

10
BMA.EHR.Domain/Models/Commands/Core/Command.cs
View file

@ -190,6 +190,16 @@ namespace BMA.EHR.Domain.Models.Commands.Core
#endregion
#region " คำสั่ง C-PM-22 "
[Comment("การประชุม ครั้งที่")]
public string? ConclusionTranferNo { get; set; } = string.Empty;
[Comment("การประชุม ลงวันที่")]
public DateTime? ConclusionTranferDate { get; set; } = DateTime.Now;
#endregion
public virtual List<CommandDocument> Documents { get; set; } = new();
public virtual List<CommandReceiver> Receivers { get; set; }

16925
BMA.EHR.Infrastructure/Migrations/20231031151029_update table command add tranferNo.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

42
BMA.EHR.Infrastructure/Migrations/20231031151029_update table command add tranferNo.cs Normal file
View file

@ -0,0 +1,42 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Infrastructure.Migrations
{
/// <inheritdoc />
public partial class updatetablecommandaddtranferNo : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<DateTime>(
name: "ConclusionTranferDate",
table: "Commands",
type: "datetime(6)",
nullable: true,
comment: "การประชุม ลงวันที่");
migrationBuilder.AddColumn<string>(
name: "ConclusionTranferNo",
table: "Commands",
type: "longtext",
nullable: true,
comment: "การประชุม ครั้งที่")
.Annotation("MySql:CharSet", "utf8mb4");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ConclusionTranferDate",
table: "Commands");
migrationBuilder.DropColumn(
name: "ConclusionTranferNo",
table: "Commands");
}
}
}

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

@ -132,6 +132,14 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnType("longtext")
.HasComment("มติ กก. ครั้งที่ (เรื่อง กลับเข้ารับราชการ)");
b.Property<DateTime?>("ConclusionTranferDate")
.HasColumnType("datetime(6)")
.HasComment("การประชุม ลงวันที่");
b.Property<string>("ConclusionTranferNo")
.HasColumnType("longtext")
.HasComment("การประชุม ครั้งที่");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime(6)")
.HasColumnOrder(100)

2
BMA.EHR.Report.Service/Controllers/CommandReportController.cs
View file

@ -2284,6 +2284,7 @@ namespace BMA.EHR.Report.Service.Controllers
var command = new
{
CommandNo = raw_data.CommandNo.ToThaiNumber(),
ConclusionTranferNo = raw_data.ConclusionTranferNo == null ? null : raw_data.ConclusionTranferNo.ToThaiNumber(),
CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(),
IssuerOrganizationName = raw_data.IssuerOrganizationName,
ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(),
@ -2293,6 +2294,7 @@ namespace BMA.EHR.Report.Service.Controllers
// PositionList = "",
Count = raw_data.Receivers.Count.ToString().ToThaiNumber(),
CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(),
ConclusionTranferDate = raw_data.ConclusionTranferDate == null ? "" : raw_data.ConclusionTranferDate.Value.ToThaiFullDate3().ToThaiNumber(),
AuthorizedUserFullName = raw_data.AuthorizedUserFullName,
AuthorizedPosition = raw_data.AuthorizedPosition,
// ConclusionReturnNo = raw_data.ConclusionReturnNo.ToThaiNumber(),

BIN
BMA.EHR.Report.Service/Reports/คำสั่งแต่งตั้งลูกจ้างประจำ(ย้าย).trdp
View file

Binary file not shown.