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

แก้ไขเส้นบรรทัด บัญชี3

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-06-08 11:48:31 +07:00
parent 2c85181268
commit 4168b178c9
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
Report/Organization/rptAccount3.trdp
View file

Binary file not shown.

10
Services/OrganizationReportService.cs
View file

@ -254,10 +254,10 @@ namespace BMA.EHR.Report.Service.Services
PositionNumber = pn.Name, PositionNumber = pn.Name,
PositionLevel = rp2_dt == null ? _profileService.GetPositionLevel(pm.Id) : rp2_dt.PositionLevel, PositionLevel = rp2_dt == null ? _profileService.GetPositionLevel(pm.Id) : rp2_dt.PositionLevel,
PositionName = pp.Name, PositionName = $"{pp.Name}\r\n",
PositionSide = pp_pps == null ? "" : $"({pp_pps.Name})", PositionSide = pm.PositionPathSideObject is null ? "" : Newtonsoft.Json.JsonConvert.DeserializeObject<List<PositionPathSideObject>>(pm.PositionPathSideObject).GetNameList(),
PositionExecutive = pm_exp == null ? "" : pm_exp.Name, PositionExecutive = pm_exp == null ? "" : $"{pm_exp.Name}\r\n",
PositionExecutiveSide = pm_exp_s == null ? "" : $"({pm_exp_s.Name})", PositionExecutiveSide = pm.PositionExecutiveSideObject is null ? "" : Newtonsoft.Json.JsonConvert.DeserializeObject<List<PositionExecutiveSideObject>>(pm.PositionExecutiveSideObject).GetNameList(),
Remark = op.PositionUserNote, Remark = op.PositionUserNote,
OcOrder = oc.OrganizationOrder.Value, OcOrder = oc.OrganizationOrder.Value,
PositionType = pt.Name, PositionType = pt.Name,
@ -418,8 +418,6 @@ namespace BMA.EHR.Report.Service.Services
} }
public class OrganizationItem public class OrganizationItem
{ {
public Guid Id { get; set; } public Guid Id { get; set; }