This commit is contained in:
parent
da9ed437dc
commit
077d20a779
2 changed files with 182 additions and 18 deletions
|
|
@ -368,7 +368,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
try
|
||||
{
|
||||
var insignalPeriod = await _repository.GetKhr5TotalReport(req.roundId, type, req.node, req.nodeId);
|
||||
var yearInsignalPeriod = await _repository.GetYearInsigniaPeriod(req.roundId);
|
||||
var yearInsignalNote = await _repository.GetYearInsigniaNote(req.roundId);
|
||||
var detailList = new List<dynamic>();
|
||||
var male = 0;
|
||||
var feMale = 0;
|
||||
|
|
@ -439,13 +439,12 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
{
|
||||
profileType = type == "employee" ? "ลูกจ้างประจำ" : "ข้าราชการสามัญกรุงเทพมหานคร",
|
||||
org = org,
|
||||
year = yearInsignalPeriod,
|
||||
year = yearInsignalNote,
|
||||
date = date,
|
||||
data = detailList,
|
||||
}
|
||||
};
|
||||
return Success(result);
|
||||
|
||||
}
|
||||
catch
|
||||
{
|
||||
|
|
@ -469,6 +468,77 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
{
|
||||
try
|
||||
{
|
||||
var insignalPeriod = await _repository.GetKhr6TotalReport(req.roundId, type, req.node, req.nodeId);
|
||||
var nameNote = await _repository.GetNameInsigniaNote(req.roundId);
|
||||
var detailList = new List<dynamic>();
|
||||
var pending = 0;
|
||||
var done = 0;
|
||||
var _pending = 0;
|
||||
var _done = 0;
|
||||
var pendingSum = 0;
|
||||
var doneSum = 0;
|
||||
var row = 1;
|
||||
var nameType = "";
|
||||
var org = "";
|
||||
foreach (var _data in insignalPeriod)
|
||||
{
|
||||
// return Success("result");
|
||||
if (nameType != "" && nameType != _data.GetType().GetProperty("InsigniaTypeName").GetValue(_data))
|
||||
{
|
||||
org = _data.GetType().GetProperty("DepartmentName").GetValue(_data);
|
||||
detailList.Add(new
|
||||
{
|
||||
row = "",
|
||||
type = "",
|
||||
name = "รวม",
|
||||
pending = pending.ToString().ToThaiNumber(),
|
||||
done = done.ToString().ToThaiNumber(),
|
||||
sum = (pending + done).ToString().ToThaiNumber(),
|
||||
});
|
||||
pendingSum = pendingSum + pending;
|
||||
doneSum = pendingSum + done;
|
||||
pending = 0;
|
||||
done = 0;
|
||||
row = 1;
|
||||
}
|
||||
nameType = _data.GetType().GetProperty("InsigniaTypeName").GetValue(_data);
|
||||
|
||||
_pending = _data.GetType().GetProperty("Pending").GetValue(_data);
|
||||
_done = _data.GetType().GetProperty("Done").GetValue(_data);
|
||||
detailList.Add(new
|
||||
{
|
||||
row = row.ToString().ToThaiNumber(),
|
||||
type = _data.GetType().GetProperty("InsigniaTypeName").GetValue(_data),
|
||||
name = _data.GetType().GetProperty("RequestInsigniaName").GetValue(_data),
|
||||
pending = _pending.ToString().ToThaiNumber(),
|
||||
done = _done.ToString().ToThaiNumber(),
|
||||
sum = (_pending + _done).ToString().ToThaiNumber(),
|
||||
});
|
||||
pending = pending + _data.GetType().GetProperty("Pending").GetValue(_data);
|
||||
done = done + _data.GetType().GetProperty("Done").GetValue(_data);
|
||||
row = row + 1;
|
||||
}
|
||||
detailList.Add(new
|
||||
{
|
||||
row = "",
|
||||
type = "",
|
||||
name = "รวม",
|
||||
pending = pending.ToString().ToThaiNumber(),
|
||||
done = done.ToString().ToThaiNumber(),
|
||||
sum = (pending + done).ToString().ToThaiNumber(),
|
||||
});
|
||||
pendingSum = pendingSum + pending;
|
||||
doneSum = pendingSum + done;
|
||||
detailList.Add(new
|
||||
{
|
||||
row = "",
|
||||
type = "",
|
||||
name = "รวมทั้งหมด",
|
||||
pending = pendingSum.ToString().ToThaiNumber(),
|
||||
done = doneSum.ToString().ToThaiNumber(),
|
||||
sum = (pendingSum + doneSum).ToString().ToThaiNumber(),
|
||||
});
|
||||
|
||||
var date = $"ณ วันที่ {DateTime.Now.Date.ToThaiShortDate().ToThaiNumber()}";
|
||||
var result = new
|
||||
{
|
||||
|
|
@ -476,13 +546,14 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
reportName = "reportInsignia6",
|
||||
data = new
|
||||
{
|
||||
yearInsignalPeriod = "",
|
||||
profileType = type == "employee" ? "ลูกจ้างประจำ" : "ข้าราชการสามัญกรุงเทพมหานคร",
|
||||
org = org,
|
||||
name = nameNote,
|
||||
date = date,
|
||||
data = "",
|
||||
data = detailList,
|
||||
}
|
||||
};
|
||||
return Success(result);
|
||||
|
||||
}
|
||||
catch
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue