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

1
Models/Report2/Report2.cs
View file

@ -77,5 +77,6 @@ namespace BMA.EHR.Organization.Service.Models.Report2
[Comment("สังกัดที่ถือครอง")] [Comment("สังกัดที่ถือครอง")]
public Guid? ProfilePositionId { get; set; } public Guid? ProfilePositionId { get; set; }
public Guid? OrganizationPositionId { get; set; }
} }
} }

193
Services/OrganizationReportService.cs
View file

@ -233,7 +233,7 @@ namespace BMA.EHR.Report.Service.Services
var report2_raw_data = (from r in _context.Report2s.AsNoTracking().ToList() var report2_raw_data = (from r in _context.Report2s.AsNoTracking().ToList()
join ppos in _context.ProfilePositions.AsNoTracking().ToList() on r.ProfilePositionId equals ppos.Id into r_ppos_join join ppos in _context.ProfilePositions.AsNoTracking().ToList() on r.OrganizationPositionId equals ppos.OrganizationPositionId into r_ppos_join
from ppos_join in r_ppos_join.DefaultIfEmpty() from ppos_join in r_ppos_join.DefaultIfEmpty()
//join pf in profile_data.ToList() on ppos_join.ProfileId equals pf.Id into r_pf_join //join pf in profile_data.ToList() on ppos_join.ProfileId equals pf.Id into r_pf_join
//from pf_join in r_pf_join.DefaultIfEmpty() //from pf_join in r_pf_join.DefaultIfEmpty()
@ -257,7 +257,7 @@ namespace BMA.EHR.Report.Service.Services
PositionExecutive = r.PositionExecutive, PositionExecutive = r.PositionExecutive,
PositionExecutiveSide = r.PositionExecutiveSide, PositionExecutiveSide = r.PositionExecutiveSide,
OrganizationPositionId = ppos_join == null ? Guid.Empty : ppos_join.OrganizationPositionId, OrganizationPositionId = r.OrganizationPositionId,
// old // old
OcId = GetOcId(r.OrganizationShortNameId.Value, r.OrganizationOrganizationId.Value), OcId = GetOcId(r.OrganizationShortNameId.Value, r.OrganizationOrganizationId.Value),
@ -347,116 +347,117 @@ namespace BMA.EHR.Report.Service.Services
// }).ToList(); // }).ToList();
var data2 = (from r in report2_raw_data //var data2 = (from r in report2_raw_data
where ocIdList.Contains(r.OcId) // where ocIdList.Contains(r.OcId)
select new Account2ResultItem // select new Account2ResultItem
{ // {
Id = r.Id, // Id = r.Id,
RootOcId = ocId, // RootOcId = ocId,
RootOcName = RootOcName, // RootOcName = RootOcName,
GovernmentCode = r.GovCode, // GovernmentCode = r.GovCode,
OcId = r.OcId, // OcId = r.OcId,
OcFullName = _profileService.FindOCFullPathWithNewLine(r.OcId, false, suppress: RootOcName), // OcFullName = _profileService.FindOCFullPathWithNewLine(r.OcId, false, suppress: RootOcName),
OcName = _profileService.GetOrganizationName(r.OcId), // OcName = _profileService.GetOrganizationName(r.OcId),
ShortName = r.ShortNameOld, // ShortName = r.ShortNameOld,
PositionNumber = r.PositionNumberOld, // PositionNumber = r.PositionNumberOld,
PositionLevel = r.PositionLevelOld, // PositionLevel = r.PositionLevelOld,
PositionName = $"{r.PositionNameOld}\r\n", // PositionName = $"{r.PositionNameOld}\r\n",
PositionSide = r.PositionPathSideOld, // PositionSide = r.PositionPathSideOld,
PositionExecutive = r.PositionExecutiveOld, // PositionExecutive = r.PositionExecutiveOld,
PositionExecutiveSide = r.PositionExecutiveSideOld, // PositionExecutiveSide = r.PositionExecutiveSideOld,
Remark = "", // Remark = "",
PositionType = r.PositionTypeOld, // PositionType = r.PositionTypeOld,
OcIdNew = r.OcId, // OcIdNew = r.OcId,
OcFullNameNew = _profileService.FindOCFullPathWithNewLine(r.OcId, false, suppress: RootOcName), // OcFullNameNew = _profileService.FindOCFullPathWithNewLine(r.OcId, false, suppress: RootOcName),
OcNameNew = _profileService.GetOrganizationName(r.OcId), // OcNameNew = _profileService.GetOrganizationName(r.OcId),
ShortNameNew = r.ShortName, // ShortNameNew = r.ShortName,
PositionNumberNew = r.PositionNumber, // PositionNumberNew = r.PositionNumber,
PositionLevelNew = r.PositionLevel, // PositionLevelNew = r.PositionLevel,
PositionNameNew = $"{r.PositionName}\r\n", // PositionNameNew = $"{r.PositionName}\r\n",
PositionSideNew = r.PositionPathSide, // PositionSideNew = r.PositionPathSide,
PositionExecutiveNew = r.PositionExecutive, // PositionExecutiveNew = r.PositionExecutive,
PositionExecutiveSideNew = r.PositionExecutiveSide, // PositionExecutiveSideNew = r.PositionExecutiveSide,
PositionTypeNew = r.PositionType, // PositionTypeNew = r.PositionType,
PositionNumberInt = r.PositionNumberOldInt, // PositionNumberInt = r.PositionNumberOldInt,
PositionNumberIntNew = r.PositionNumberInt, // PositionNumberIntNew = r.PositionNumberInt,
Prefix = r.Prefix, // Prefix = r.Prefix,
FirstName = r.FirstName, // FirstName = r.FirstName,
LastName = r.LastName, // LastName = r.LastName,
Degree = r.Degree, // Degree = r.Degree,
Salary = Convert.ToInt32(r.Salary), // Salary = Convert.ToInt32(r.Salary),
SalaryPosition = Convert.ToInt32(r.SalaryPosition) // SalaryPosition = Convert.ToInt32(r.SalaryPosition)
}).ToList(); // }).ToList();
//var data = (from op in organizationPositions var data = (from op in organizationPositions
// join pm in positionMasters on op.PositionMasterId equals pm.Id join pm in positionMasters on op.PositionMasterId equals pm.Id
// join oc in organizations on op.OrganizationId equals oc.Id join oc in organizations on op.OrganizationId equals oc.Id
// join oc_n in organizationOrganizations on oc.OrganizationOrganizationId equals oc_n.Id join oc_n in organizationOrganizations on oc.OrganizationOrganizationId equals oc_n.Id
// join sn in organizationShortNames on oc.OrganizationShortNameId equals sn.Id join sn in organizationShortNames on oc.OrganizationShortNameId equals sn.Id
// join pn in positionNumbers on op.PositionNumberId equals pn.Id join pn in positionNumbers on op.PositionNumberId equals pn.Id
// join pp in positionPaths on pm.PositionPathId equals pp.Id join pp in positionPaths on pm.PositionPathId equals pp.Id
// join pps in positionPathSides on pm.PositionPathSideId equals pps.Id into pp_pps_join join pps in positionPathSides on pm.PositionPathSideId equals pps.Id into pp_pps_join
// from pp_pps in pp_pps_join.DefaultIfEmpty() from pp_pps in pp_pps_join.DefaultIfEmpty()
// join ex_p in executivePositions on pm.PositionExecutiveId equals ex_p.Id into pm_exp_join join ex_p in executivePositions on pm.PositionExecutiveId equals ex_p.Id into pm_exp_join
// from pm_exp in pm_exp_join.DefaultIfEmpty() from pm_exp in pm_exp_join.DefaultIfEmpty()
// join ex_p_s in executivePositionSide on pm.PositionExecutiveSideId equals ex_p_s.Id into pm_exp_s_join join ex_p_s in executivePositionSide on pm.PositionExecutiveSideId equals ex_p_s.Id into pm_exp_s_join
// from pm_exp_s in pm_exp_s_join.DefaultIfEmpty() from pm_exp_s in pm_exp_s_join.DefaultIfEmpty()
// join pt in positionTypes on pm.PositionTypeId equals pt.Id join pt in positionTypes on pm.PositionTypeId equals pt.Id
// join rp2 in report2_raw_data.ToList() on op.Id equals rp2.OrganizationPositionId into rp2_join join rp2 in report2_raw_data.ToList() on op.Id equals rp2.OrganizationPositionId into rp2_join
// from rp2_dt in rp2_join.DefaultIfEmpty() from rp2_dt in rp2_join.DefaultIfEmpty()
// where ocIdList.Contains((Guid)op.OrganizationId) where ocIdList.Contains((Guid)op.OrganizationId)
// select new Account2ResultItem select new Account2ResultItem
// { {
// Id = op.Id, Id = op.Id,
// RootOcId = ocId, RootOcId = ocId,
// RootOcName = RootOcName, RootOcName = RootOcName,
// OcId = op.OrganizationId.Value, OcId = op.OrganizationId.Value,
// OcFullName = _profileService.FindOCFullPathWithNewLine(op.OrganizationId.Value, false, suppress: RootOcName), OcFullName = _profileService.FindOCFullPathWithNewLine(op.OrganizationId.Value, false, suppress: RootOcName),
// OcName = _profileService.GetOrganizationName(op.OrganizationId.Value), OcName = _profileService.GetOrganizationName(op.OrganizationId.Value),
// ShortName = sn.Name, ShortName = rp2_dt == null ? sn.Name : rp2_dt.ShortNameOld,
// PositionNumber = pn.Name,
// PositionLevel = rp2_dt == null ? _profileService.GetPositionLevel(pm.Id) : rp2_dt.PositionLevel,
// PositionName = $"{pp.Name}\r\n", PositionNumber = rp2_dt == null ? pn.Name : rp2_dt.PositionNumberOld,
// PositionSide = pm.PositionPathSideObject is null ? "" : Newtonsoft.Json.JsonConvert.DeserializeObject<List<PositionPathSideObject>>(pm.PositionPathSideObject).GetNameList(), PositionLevel = rp2_dt == null ? _profileService.GetPositionLevel(pm.Id) : rp2_dt.PositionLevel,
// PositionExecutive = pm_exp == null ? "" : $"{pm_exp.Name}\r\n",
// PositionExecutiveSide = pm.PositionExecutiveSideObject is null ? "" : Newtonsoft.Json.JsonConvert.DeserializeObject<List<PositionExecutiveSideObject>>(pm.PositionExecutiveSideObject).GetNameList(), PositionName = rp2_dt == null ? $"{pp.Name}\r\n" : $"{ rp2_dt.PositionNameOld }\r\n",
// Remark = op.PositionUserNote, PositionSide = pm.PositionPathSideObject is null ? "" : Newtonsoft.Json.JsonConvert.DeserializeObject<List<PositionPathSideObject>>(pm.PositionPathSideObject).GetNameList(),
// OcOrder = oc.OrganizationOrder.Value, PositionExecutive = pm_exp == null ? "" : $"{pm_exp.Name}\r\n",
// PositionType = pt.Name, PositionExecutiveSide = pm.PositionExecutiveSideObject is null ? "" : Newtonsoft.Json.JsonConvert.DeserializeObject<List<PositionExecutiveSideObject>>(pm.PositionExecutiveSideObject).GetNameList(),
Remark = op.PositionUserNote,
OcOrder = oc.OrganizationOrder.Value,
PositionType = pt.Name,
// OcIdNew = rp2_dt == null ? op.OrganizationId.Value : rp2_dt.OcId, OcIdNew = rp2_dt == null ? op.OrganizationId.Value : rp2_dt.OcId,
// OcFullNameNew = _profileService.FindOCFullPathWithNewLine(op.OrganizationId.Value, false, suppress: RootOcName), OcFullNameNew = _profileService.FindOCFullPathWithNewLine(op.OrganizationId.Value, false, suppress: RootOcName),
// OcNameNew = rp2_dt == null ? _profileService.GetOrganizationName(op.OrganizationId.Value) : _profileService.GetOrganizationName(rp2_dt.OcId), OcNameNew = rp2_dt == null ? _profileService.GetOrganizationName(op.OrganizationId.Value) : _profileService.GetOrganizationName(rp2_dt.OcId),
// ShortNameNew = rp2_dt == null ? "" : rp2_dt.ShortName, ShortNameNew = rp2_dt == null ? "" : rp2_dt.ShortName,
// PositionNumberNew = rp2_dt == null ? "" : rp2_dt.PositionNumber, PositionNumberNew = rp2_dt == null ? "" : rp2_dt.PositionNumber,
// PositionLevelNew = rp2_dt == null ? "" : rp2_dt.PositionLevel, PositionLevelNew = rp2_dt == null ? "" : rp2_dt.PositionLevel,
// PositionNameNew = rp2_dt == null ? "" : rp2_dt.PositionPath, PositionNameNew = rp2_dt == null ? "" : rp2_dt.PositionPath,
// PositionSideNew = rp2_dt == null ? "" : rp2_dt.PositionPathSide, PositionSideNew = rp2_dt == null ? "" : rp2_dt.PositionPathSide,
// PositionExecutiveNew = rp2_dt == null ? "" : rp2_dt.PositionExecutive, PositionExecutiveNew = rp2_dt == null ? "" : rp2_dt.PositionExecutive,
// PositionExecutiveSideNew = rp2_dt == null ? "" : rp2_dt.PositionExecutiveSide, PositionExecutiveSideNew = rp2_dt == null ? "" : rp2_dt.PositionExecutiveSide,
// PositionTypeNew = rp2_dt == null ? "" : rp2_dt.PositionType, PositionTypeNew = rp2_dt == null ? "" : rp2_dt.PositionType,
// Prefix = rp2_dt == null ? "" : rp2_dt.Prefix, Prefix = rp2_dt == null ? "" : rp2_dt.Prefix,
// FirstName = rp2_dt == null ? "" : rp2_dt.FirstName, FirstName = rp2_dt == null ? "" : rp2_dt.FirstName,
// LastName = rp2_dt == null ? "" : rp2_dt.LastName, LastName = rp2_dt == null ? "" : rp2_dt.LastName,
// Degree = rp2_dt == null ? (pm == null ? "" : pm.Qualification) : rp2_dt.Degree, Degree = rp2_dt == null ? (pm == null ? "" : pm.Qualification) : rp2_dt.Degree,
// Salary = rp2_dt == null ? 0 : (int)rp2_dt.Salary.Value, Salary = rp2_dt == null ? 0 : (int)rp2_dt.Salary.Value,
// SalaryPosition = rp2_dt == null ? 0 : (int)rp2_dt.SalaryPosition.Value, SalaryPosition = rp2_dt == null ? 0 : (int)rp2_dt.SalaryPosition.Value,
// }).ToList(); }).ToList();
return data2; return data;
} }
catch catch
{ {

2
appsettings.Development.json
View file

@ -15,7 +15,7 @@
"ConnectionStrings": { "ConnectionStrings": {
"MongoConnection": "mongodb://admin:adminVM123@127.0.0.1:27017", "MongoConnection": "mongodb://admin:adminVM123@127.0.0.1:27017",
"RecruitConnection": "server=127.0.0.1;user=root;password=P@ssw0rd;port=3308;database=bma_recruit;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", "RecruitConnection": "server=127.0.0.1;user=root;password=P@ssw0rd;port=3308;database=bma_recruit;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
"EHRConnection": "server=192.168.1.9;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;", "EHRConnection": "server=192.168.1.9;user=root;password=adminVM123;port=4061;database=bma_ehr;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
"ExamConnection": "server=127.0.0.1;user=root;password=P@ssw0rd;port=3308;database=bma_ehr_exam;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;" "ExamConnection": "server=127.0.0.1;user=root;password=P@ssw0rd;port=3308;database=bma_ehr_exam;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
}, },
"Jwt": { "Jwt": {