ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gkv Detail Mapping vollständig

Browse Source
This commit is contained in:
Rene Evertz
2025-09-23 12:27:13 +02:00
parent 7d3ab82ec7
commit 0e5db358ab
5 changed files with 104 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Service/ServiceContracts/IAdminService.cs
View File

@@ -25,6 +25,6 @@ namespace BeWo.Service.ServiceContracts
[OperationContract]
[WebInvoke(UriTemplate = "/GetGkvSum?detail={flag}", Method = "POST", RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json)]
object GetGkvAbrechnungSumme(AdminServiceSumReqDC request, string flag);
AdminServiceSumResponseDC GetGkvAbrechnungSumme(AdminServiceSumReqDC request, string flag);
}
}

58
Service/ServiceImplementations/AdminServiceImp.cs
View File

@@ -3,6 +3,7 @@ using BeWo.Data.Entities;
using BeWo.Data.Entities.Light;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.ServiceContracts;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts.AdminService;
using BS.Shared.Extensions;
@@ -10,6 +11,7 @@ using DevExpress.Pdf.Native.BouncyCastle.Ocsp;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.ServiceModel;
using System.Text;
@@ -30,7 +32,7 @@ namespace BeWo.Service.ServiceImplementations
return echo;
}
public object GetGkvAbrechnungSumme(AdminServiceSumReqDC request, string detail)
public AdminServiceSumResponseDC GetGkvAbrechnungSumme(AdminServiceSumReqDC request, string detail)
{
if (request == null)
{
@@ -46,14 +48,13 @@ namespace BeWo.Service.ServiceImplementations
{
throw new ArgumentException("end entspricht nicht ISO8601 Norm.");
}
var sum = DAOFactory.ScriptDAO.GetGkvSumByDateRange(start, end);
var res = new AdminServiceSumResponseDC();
res.Sum = DAOFactory.ScriptDAO.GetGkvSumByDateRange(start, end);
if (detail != "true")
{
var json = JsonUtils.ToSimpleJson("sum", sum);
return json;
return res;
}
string detail_res;
@@ -64,42 +65,37 @@ namespace BeWo.Service.ServiceImplementations
var protokolle = DAOFactory.GenericDAO.LoadByIDs<GkvTransferProtokollLight>(protokolle_oids);
var abrechnung_oids = protokolle.Select(x => x.GkvAbrechnungOid).Distinct();
var abrechnung = DAOFactory.GenericDAO.LoadByIDs<GkvAbrechnungLight>(abrechnung_oids);
var abrechnung_dc = MapperFactory.GkvAbrechnungLight.MapToNewDCs(abrechnung);
var objs = abrechnung.Select(x =>
res.Details = abrechnung_dc.Select(x =>
{
var t = x.TransferProtokolle.First();
return new
var state = x.GetState();
return new AdminServiceSumResponseDetailDC()
{
oid = x.Oid,
toid = t.Oid,
created = x.ErstelltAm,
rec = t.BezDatenannahmestelle,
str = x.AbrechnungsZeitraumStart,
end = x.AbrechnungsZeitraumEnde,
ver = x.Verfahrensstufe.ToString(),
sta = x.GetState().ToString(),
urg = x.UrbelegeGesendet,
bez = x.Bezahlt,
sum = x.Betrag.ToString("0.00€")
Oid = x.Oid,
ProtokollOid = t.Oid.Value,
ErstelltAm = x.ErstelltAm.ToString("o", CultureInfo.InvariantCulture),
Empfanger = t.BezDatenannahmestelle,
AbrechnungsZeitraumStart = x.AbrechnungsZeitraumStart?.ToString("o", CultureInfo.InvariantCulture),
AbrechnungsZeitraumEnde = x.AbrechnungsZeitraumEnde?.ToString("o", CultureInfo.InvariantCulture),
VerfahrensstufeInt = x.Verfahrensstufe,
Verfahrensstufe = ((GkvVerfahrensstufe)x.Verfahrensstufe).ToString(),
StateInt = (int)state,
State = state.ToString(),
UrbelegeGesendet = x.UrbelegeGesendet,
Bezahlt = x.Bezahlt,
Betrag = x.Betrag
};
});
detail_res = JsonUtils.ConvertToJson(objs);
}
else
{
detail_res = "no records found";
res.Details = new List<AdminServiceSumResponseDetailDC>();
}
var rtn = new
{
sum = sum?.ToString("0.00") ?? "0.00",
predicate = detail_res,
};
var json2 = JsonUtils.ConvertToJson(rtn);
return json2;
return res;
}
}
}

19
Shared/DataContracts/AdminService/AdminServiceSumResponseDC.cs Normal file
View File

@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization;
using System.Text;
using System.Threading.Tasks;
namespace BS.Shared.DataContracts.AdminService
{
[DataContract]
public class AdminServiceSumResponseDC : IAdminServiceDC
{
[DataMember(Name = "sum", Order = 1)]
public decimal? Sum { get; set; }
[DataMember(Name = "details", EmitDefaultValue = false, Order = 2)]
public IEnumerable<AdminServiceSumResponseDetailDC> Details { get; set; }
}
}

55
Shared/DataContracts/AdminService/AdminServiceSumResponseDetailDC.cs Normal file
View File

@@ -0,0 +1,55 @@
using BS.Shared.Interface;
using DevExpress.Mvvm.DataAnnotations;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Runtime.Serialization;
using System.Text;
using System.Threading.Tasks;
namespace BS.Shared.DataContracts.AdminService
{
[DataContract]
public class AdminServiceSumResponseDetailDC : IAdminServiceDC
{
[DataMember(Name = "a.oid", Order = 1)]
public long Oid { get; set; }
[DataMember(Name = "t.oid", Order = 2)]
public long ProtokollOid { get; set; }
[DataMember(Name = "sum", Order = 3)]
public decimal Betrag { get; set; }
[DataMember(Name = "paid", Order = 4)]
public bool Bezahlt { get; set; }
[DataMember(Name = "urbelege_sent", Order = 5)]
public bool UrbelegeGesendet { get; set; }
[DataMember(Name = "receiver", Order = 6)]
public string Empfanger { get; set; }
[DataMember(Name = "create", Order = 7)]
public string ErstelltAm { get; set; }
[DataMember(Name = "gkv_start", Order = 8)]
public string AbrechnungsZeitraumStart { get; set; }
[DataMember(Name = "gkv_end", Order = 9)]
public string AbrechnungsZeitraumEnde { get; set; }
[DataMember(Name = "level", Order = 10)]
public int VerfahrensstufeInt { get; set; }
[DataMember(Name = "level_string", Order = 11)]
public string Verfahrensstufe { get; set; }
[DataMember(Name = "state", Order = 20)]
public int StateInt { get; set; }
[DataMember(Name = "state_string", Order = 21)]
public string State { get; set; }
}
}

2
Shared/Shared.csproj
View File

@@ -178,6 +178,8 @@
<Compile Include="Core\WohnheimbuchungsIntervall.cs" />
<Compile Include="DataContracts\AbsenceOverviewFilterDC.cs" />
<Compile Include="DataContracts\AddressDC.cs" />
<Compile Include="DataContracts\AdminService\AdminServiceSumResponseDC.cs" />
<Compile Include="DataContracts\AdminService\AdminServiceSumResponseDetailDC.cs" />
<Compile Include="DataContracts\AdminService\IAdminServiceDC.cs" />
<Compile Include="DataContracts\AdminService\AdminServiceSumReqDC.cs" />
<Compile Include="DataContracts\Feature\AI\AiConfigDC.cs" />