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

แก้รายงาน บช2

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-06-16 12:00:34 +07:00
parent 411d59d1a5
commit a932af3b3f
4 changed files with 102 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Controllers/OrganizationReportController.cs
View file

@ -280,7 +280,7 @@ namespace BMA.EHR.Report.Service.Controllers
OcName = d.OcName,
ShortName = d.ShortName,
PositionNumber = d.PositionNumber,
PositionNumberInt = d.PositionNumber == "" ? 0 : Convert.ToInt32(d.PositionNumber.Split(".").Last()),
PositionNumberInt = d.PositionNumberInt,
PositionName = d.PositionName,
PositionSide = d.PositionSide,
PositionExecutive = d.PositionExecutive,
@ -295,8 +295,7 @@ namespace BMA.EHR.Report.Service.Controllers
OcNameNew = d.OcNameNew,
ShortNameNew = d.ShortNameNew,
PositionNumberNew = d.PositionNumberNew == "" ? d.PositionNumber : d.PositionNumberNew,
PositionNumberIntNew = d.PositionNumberNew == "" ? Convert.ToInt32(d.PositionNumber.Split(".").Last()) :
Convert.ToInt32(d.PositionNumberNew.Split(".").Last()),
PositionNumberIntNew = d.PositionNumberNew == "" ? d.PositionNumberInt : d.PositionNumberIntNew,
PositionLevelNew = d.PositionLevelNew == "" ? d.PositionLevel : d.PositionLevelNew,
PositionNameNew = d.PositionNameNew == "" ? d.PositionName : d.PositionNameNew,
PositionSideNew = d.PositionSideNew == "" ? d.PositionSide : d.PositionSideNew,