Commit 3b6caa62 by AlexNasyr

xml classes added

parent 18bef3c7
Showing with 809 additions and 431 deletions
......@@ -14,6 +14,15 @@ namespace SocialMinistryDataExchange.Controllers {
_repository = repository;
}
//тестовый запрос для симуляции получения XML запроса
[HttpGet]
[Route("[controller]/putXMLDefenceStatus")]
public async Task<string> PutXMLDefenceStatus() {
var request = System.IO.File.ReadAllText("Model/reference/Request.xml");
var responce = await _repository.PutDefenceStatus(request);
return String.Empty;
}
// тестовый запрос зачисленности личности
[HttpGet]
[Route("[controller]/getFixPerson")]
......@@ -25,9 +34,11 @@ namespace SocialMinistryDataExchange.Controllers {
new SMPersonDataOccupationMessage() {
Person = new Person() {
rowguid_eais = "223322",
PersonDocumentSeria = "V-II",
PersonDocumentNumber = "123456",
PersonDocumentDate = DateTime.Parse("2010-01-01"),
PersonDocument = new PersonDocument(){
PersonDocumentSeria = "V-II",
PersonDocumentNumber = "123456",
PersonDocumentDate = DateTime.Parse("2010-01-01"),
},
PersonFamilyName = "Мкртчян",
PersonName = "Василий",
PersonSurname = "Алибабаевич",
......@@ -38,9 +49,11 @@ namespace SocialMinistryDataExchange.Controllers {
new SMPersonDataOccupationMessage() {
Person = new Person() {
rowguid_eais = "223322",
PersonDocumentSeria = "V-II",
//PersonDocumentNumber = "123456",
PersonDocumentDate = DateTime.Parse("2010-01-01"),
PersonDocument = new PersonDocument(){
PersonDocumentSeria = "V-II",
PersonDocumentNumber = "123456",
PersonDocumentDate = DateTime.Parse("2010-01-01"),
},
PersonFamilyName = "Мкртчян",
PersonName = "Василий",
PersonSurname = "Алибабаевич",
......@@ -64,16 +77,18 @@ namespace SocialMinistryDataExchange.Controllers {
MsgData = new SMPersonDataOccupationMessage[] {
new SMPersonDataOccupationMessage() {
Person = new Person() {
rowguid_eais = "223322",
PersonDocumentSeria = "V-II",
PersonDocumentNumber = "123456"
rowguid_eais = "223322",
PersonDocument = new PersonDocument(){
PersonDocumentSeria = "V-II",
PersonDocumentNumber = "123456",
PersonDocumentDate = DateTime.Parse("2010-01-01"),
},
},
PersonOccupation = new SMPersonOccupationStatus()
}
}
};
var result = await _repository.GetPersonByDoc(JsonSerializer.Serialize(msg));
//var result = await _repository.GetPersonByDoc(JsonSerializer.Serialize(new List<SMPersonRequest>() { new SMPersonRequest() { rowguid_eais = "223322", document_seria = "V-II", document_number = "123456" }, new SMPersonRequest() { rowguid_eais = "322223", document_seria = "1234", document_number = "123456" } }));
return result;
}
// тестовый запрос для получения json формата для данных о личности (нуждаемость)
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Addrobg59
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Addrobg59new
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ApplicationLog
{
......
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.Json;
using System.Threading.Tasks;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB.Center {
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Contingent_center_Context : DbContext, IContingentContext {
public Contingent_center_Context() {
public Contingent_center_Context()
{
}
public Contingent_center_Context(DbContextOptions<Contingent_center_Context> options)
: base(options) {
: base(options)
{
}
public virtual DbSet<СтатусыНуждаемости> СтатусыНуждаемостиs { get; set; }
public virtual DbSet<ТипНуждаемости> ТипНуждаемостиs { get; set; }
public virtual DbSet<Addrobg59> Addrobg59s { get; set; }
public virtual DbSet<Addrobg59new> Addrobg59news { get; set; }
public virtual DbSet<ApplicationLog> ApplicationLogs { get; set; }
......@@ -151,6 +146,7 @@ namespace SocialMinistryDataExchange.Model.DB.Center {
public virtual DbSet<СловарьИмен> СловарьИменs { get; set; }
public virtual DbSet<СловарьОтчеств> СловарьОтчествs { get; set; }
public virtual DbSet<СодержаниеСтраницы> СодержаниеСтраницыs { get; set; }
public virtual DbSet<СоставСемьи> СоставСемьиs { get; set; }
public virtual DbSet<СотрудникОрганизации> СотрудникОрганизацииs { get; set; }
public virtual DbSet<СпециализацияГруппы> СпециализацияГруппыs { get; set; }
public virtual DbSet<Специальность> Специальностьs { get; set; }
......@@ -160,6 +156,7 @@ namespace SocialMinistryDataExchange.Model.DB.Center {
public virtual DbSet<Справка> Справкаs { get; set; }
public virtual DbSet<СрокОбучения> СрокОбученияs { get; set; }
public virtual DbSet<СтатусОбразовательнойОрганизации> СтатусОбразовательнойОрганизацииs { get; set; }
public virtual DbSet<СтатусыНуждаемости> СтатусыНуждаемостиs { get; set; }
public virtual DbSet<Стн> Стнs { get; set; }
public virtual DbSet<ТекущаяЛичностьПодразделения> ТекущаяЛичностьПодразделенияs { get; set; }
public virtual DbSet<Территория> Территорияs { get; set; }
......@@ -170,6 +167,7 @@ namespace SocialMinistryDataExchange.Model.DB.Center {
public virtual DbSet<ТипЛьготнойКатегории> ТипЛьготнойКатегорииs { get; set; }
public virtual DbSet<ТипЛьготнойКатегорииДоу> ТипЛьготнойКатегорииДоуs { get; set; }
public virtual DbSet<ТипМероприятия> ТипМероприятияs { get; set; }
public virtual DbSet<ТипНуждаемости> ТипНуждаемостиs { get; set; }
public virtual DbSet<ТипОбразовательнойОрганизации> ТипОбразовательнойОрганизацииs { get; set; }
public virtual DbSet<ТипОбразовательнойПрограммы> ТипОбразовательнойПрограммыs { get; set; }
public virtual DbSet<ТипОбъектаИнтеграции> ТипОбъектаИнтеграцииs { get; set; }
......@@ -181,6 +179,7 @@ namespace SocialMinistryDataExchange.Model.DB.Center {
public virtual DbSet<ТипУслуги> ТипУслугиs { get; set; }
public virtual DbSet<ТипУчебногоПлана> ТипУчебногоПланаs { get; set; }
public virtual DbSet<ТипФинансирования> ТипФинансированияs { get; set; }
public virtual DbSet<ТипЧленаСемьи> ТипЧленаСемьиs { get; set; }
public virtual DbSet<УровеньМероприятия> УровеньМероприятияs { get; set; }
public virtual DbSet<УровеньОбразования> УровеньОбразованияs { get; set; }
public virtual DbSet<Услуга> Услугаs { get; set; }
......@@ -198,7 +197,7 @@ namespace SocialMinistryDataExchange.Model.DB.Center {
if (!optionsBuilder.IsConfigured)
{
#warning To protect potentially sensitive information in your connection string, you should move it out of source code. You can avoid scaffolding the connection string by using the Name= syntax to read it from configuration - see https://go.microsoft.com/fwlink/?linkid=2131148. For more guidance on storing connection strings, see http://go.microsoft.com/fwlink/?LinkId=723263.
optionsBuilder.UseSqlServer("Server=176.124.136.11;Database=Контингент_center;User ID=contingent_user;Password=@yn!dpkjv;");
optionsBuilder.UseSqlServer("Server=176.124.136.11,1433;Database=Контингент_center;User ID=contingent_user;password=@yn!dpkjv");
}
}
......@@ -206,75 +205,6 @@ namespace SocialMinistryDataExchange.Model.DB.Center {
{
modelBuilder.HasAnnotation("Relational:Collation", "Cyrillic_General_CI_AS");
modelBuilder.Entity<СтатусыНуждаемости>(entity => {
entity.HasKey(e => e.PrimaryKey)
.HasName("PK__СтатусыН__E05C3ED3375EAFB6");
entity.ToTable("СтатусыНуждаемости");
entity.Property(e => e.PrimaryKey)
.ValueGeneratedNever()
.HasColumnName("primaryKey");
entity.Property(e => e.CreateTime).HasColumnType("datetime");
entity.Property(e => e.Creator)
.HasMaxLength(255)
.IsUnicode(false);
entity.Property(e => e.EditTime).HasColumnType("datetime");
entity.Property(e => e.Editor)
.HasMaxLength(255)
.IsUnicode(false);
entity.Property(e => e.КонечнаяДатаСтатуса).HasColumnType("datetime");
entity.Property(e => e.НачальнаяДатаСтатуса).HasColumnType("datetime");
entity.Property(e => e.ПрожиточныйМинимум).HasColumnType("decimal(18, 0)");
entity.Property(e => e.СреднедушевойДоходСемьи).HasColumnType("decimal(18, 0)");
entity.HasOne(d => d.ЛичностьNavigation)
.WithMany(p => p.СтатусыНуждаемостиs)
.HasForeignKey(d => d.Личность)
.OnDelete(DeleteBehavior.ClientSetNull)
.HasConstraintName("СтатусыНуждаемости_FЛичность_0");
entity.HasOne(d => d.ТипНуждаемостиNavigation)
.WithMany(p => p.СтатусыНуждаемостиs)
.HasForeignKey(d => d.ТипНуждаемости)
.OnDelete(DeleteBehavior.ClientSetNull)
.HasConstraintName("СтатусыНуждаемости_FТипНуждаемости_0");
});
modelBuilder.Entity<ТипНуждаемости>(entity => {
entity.HasKey(e => e.PrimaryKey)
.HasName("PK__ТипНужда__E05C3ED3597324AC");
entity.ToTable("ТипНуждаемости");
entity.Property(e => e.PrimaryKey)
.ValueGeneratedNever()
.HasColumnName("primaryKey");
entity.Property(e => e.CreateTime).HasColumnType("datetime");
entity.Property(e => e.Creator)
.HasMaxLength(255)
.IsUnicode(false);
entity.Property(e => e.EditTime).HasColumnType("datetime");
entity.Property(e => e.Editor)
.HasMaxLength(255)
.IsUnicode(false);
entity.Property(e => e.Наименование)
.HasMaxLength(255)
.IsUnicode(false);
});
modelBuilder.Entity<Addrobg59>(entity =>
{
entity.HasKey(e => e.Aoid)
......@@ -7347,6 +7277,48 @@ namespace SocialMinistryDataExchange.Model.DB.Center {
.HasConstraintName("СодержаниеСтраницы_FSTORMAG_0");
});
modelBuilder.Entity<СоставСемьи>(entity =>
{
entity.HasKey(e => e.PrimaryKey)
.HasName("PK__СоставСе__E05C3ED37002C70B");
entity.ToTable("СоставСемьи");
entity.Property(e => e.PrimaryKey)
.ValueGeneratedNever()
.HasColumnName("primaryKey");
entity.Property(e => e.CreateTime).HasColumnType("datetime");
entity.Property(e => e.Creator)
.HasMaxLength(255)
.IsUnicode(false);
entity.Property(e => e.EditTime).HasColumnType("datetime");
entity.Property(e => e.Editor)
.HasMaxLength(255)
.IsUnicode(false);
entity.HasOne(d => d.ЛичностьNavigation)
.WithMany(p => p.СоставСемьиЛичностьNavigations)
.HasForeignKey(d => d.Личность)
.OnDelete(DeleteBehavior.ClientSetNull)
.HasConstraintName("СоставСемьи_FЛичность_0");
entity.HasOne(d => d.ТипЧленаСемьиNavigation)
.WithMany(p => p.СоставСемьиs)
.HasForeignKey(d => d.ТипЧленаСемьи)
.OnDelete(DeleteBehavior.ClientSetNull)
.HasConstraintName("СоставСемьи_FТипЧленаСемьи_0");
entity.HasOne(d => d.ЧленСемьиNavigation)
.WithMany(p => p.СоставСемьиЧленСемьиNavigations)
.HasForeignKey(d => d.ЧленСемьи)
.OnDelete(DeleteBehavior.ClientSetNull)
.HasConstraintName("ЧленСемьи_FЛичность_0");
});
modelBuilder.Entity<СотрудникОрганизации>(entity =>
{
entity.HasKey(e => e.PrimaryKey)
......@@ -7767,6 +7739,50 @@ namespace SocialMinistryDataExchange.Model.DB.Center {
.IsUnicode(false);
});
modelBuilder.Entity<СтатусыНуждаемости>(entity =>
{
entity.HasKey(e => e.PrimaryKey)
.HasName("PK__СтатусыН__E05C3ED3375EAFB6");
entity.ToTable("СтатусыНуждаемости");
entity.Property(e => e.PrimaryKey)
.ValueGeneratedNever()
.HasColumnName("primaryKey");
entity.Property(e => e.CreateTime).HasColumnType("datetime");
entity.Property(e => e.Creator)
.HasMaxLength(255)
.IsUnicode(false);
entity.Property(e => e.EditTime).HasColumnType("datetime");
entity.Property(e => e.Editor)
.HasMaxLength(255)
.IsUnicode(false);
entity.Property(e => e.КонечнаяДатаСтатуса).HasColumnType("datetime");
entity.Property(e => e.НачальнаяДатаСтатуса).HasColumnType("datetime");
entity.Property(e => e.ПрожиточныйМинимум).HasColumnType("decimal(18, 0)");
entity.Property(e => e.СреднедушевойДоходСемьи).HasColumnType("decimal(18, 0)");
entity.HasOne(d => d.ЛичностьNavigation)
.WithMany(p => p.СтатусыНуждаемостиs)
.HasForeignKey(d => d.Личность)
.OnDelete(DeleteBehavior.ClientSetNull)
.HasConstraintName("СтатусыНуждаемости_FЛичность_0");
entity.HasOne(d => d.ТипНуждаемостиNavigation)
.WithMany(p => p.СтатусыНуждаемостиs)
.HasForeignKey(d => d.ТипНуждаемости)
.OnDelete(DeleteBehavior.ClientSetNull)
.HasConstraintName("СтатусыНуждаемости_FТипНуждаемости_0");
});
modelBuilder.Entity<Стн>(entity =>
{
entity.HasKey(e => e.PrimaryKey)
......@@ -8189,6 +8205,34 @@ namespace SocialMinistryDataExchange.Model.DB.Center {
.IsUnicode(false);
});
modelBuilder.Entity<ТипНуждаемости>(entity =>
{
entity.HasKey(e => e.PrimaryKey)
.HasName("PK__ТипНужда__E05C3ED3597324AC");
entity.ToTable("ТипНуждаемости");
entity.Property(e => e.PrimaryKey)
.ValueGeneratedNever()
.HasColumnName("primaryKey");
entity.Property(e => e.CreateTime).HasColumnType("datetime");
entity.Property(e => e.Creator)
.HasMaxLength(255)
.IsUnicode(false);
entity.Property(e => e.EditTime).HasColumnType("datetime");
entity.Property(e => e.Editor)
.HasMaxLength(255)
.IsUnicode(false);
entity.Property(e => e.Наименование)
.HasMaxLength(255)
.IsUnicode(false);
});
modelBuilder.Entity<ТипОбразовательнойОрганизации>(entity =>
{
entity.HasKey(e => e.PrimaryKey)
......@@ -8526,6 +8570,34 @@ namespace SocialMinistryDataExchange.Model.DB.Center {
.IsUnicode(false);
});
modelBuilder.Entity<ТипЧленаСемьи>(entity =>
{
entity.HasKey(e => e.PrimaryKey)
.HasName("PK__ТипЧлена__E05C3ED3D7629CB1");
entity.ToTable("ТипЧленаСемьи");
entity.Property(e => e.PrimaryKey)
.ValueGeneratedNever()
.HasColumnName("primaryKey");
entity.Property(e => e.CreateTime).HasColumnType("datetime");
entity.Property(e => e.Creator)
.HasMaxLength(255)
.IsUnicode(false);
entity.Property(e => e.EditTime).HasColumnType("datetime");
entity.Property(e => e.Editor)
.HasMaxLength(255)
.IsUnicode(false);
entity.Property(e => e.Наименование)
.HasMaxLength(255)
.IsUnicode(false);
});
modelBuilder.Entity<УровеньМероприятия>(entity =>
{
entity.HasKey(e => e.PrimaryKey)
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Ecsplog
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class GovernorApiLog
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class House59
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class IntegrationFriserviceLog
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class IntegrationPdoserviceLog
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class IntegrationServiceLog
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class IntegrationServiceLogArc
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class IsConnectToUv
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ObjectsHash
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ObjectsToPdoHash
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Pdolog
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class PromedLog
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Session
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Socrbase
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Storm
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Stormac
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class StormadvLimit
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Stormag
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class StormauEntity
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class StormauField
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class StormauObjType
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Stormf
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Stormfilterdetail
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Stormfilterlookup
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Stormfiltersetting
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Stormi
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Stormla
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Stormlg
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Stormlo
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Stormlr
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Stormlv
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Stormnetlockdatum
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Stormp
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Stormsetting
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Stormwebsearch
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class SyncLog
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class SyncLogObj
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class SyncScript
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class SyncSetting
{
......
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class UserSetting
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class АдаптированностьОп
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class АрхивОрганизации
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class АссоциацияТерриторий
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Ведомство
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ВедомствоЭпос
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ВидДанныхДляДашборда
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ВидДокументаЗаявления
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ВидДокументаОбОбразовании
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ВидЗаявления
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ВидМедицинскогоДокумента
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ВидОбразовательнойУслуги
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ВидОбученияБольныхДетей
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ВидОбученияОграниченноЗдоровых
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ВидПоказателяУслуги
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ВидПриказа
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ВидСистемыОценивания
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ВидСмены
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ВидСостоянияЗаявления
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ВидСпециалистаДоу
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ВидУдостоверяющегоДокумента
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ВидУслуги
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ВидУчебногоПериода
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ВидУчредителя
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ВнешняяСистема
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ВозрастнаяКатегория
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ВыходныеДни
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Вэдорганизации
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ГруппаЗдоровья
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ДанныеДляДашборда
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ДетиМинобр
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ДляОтчетовСпо
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ДляОтчетовУдо
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ДокументЛичности
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ДокументОбОбразовании
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ДолжностьУфхд
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ДостижениеУчащегося
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ЗаконныйПредставительЛичности
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ЗакрепленныйАдрес
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ЗакрепленныйДом
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ЗаявлениеОприеме
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ИзменениеСостоянияОрганизации
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ИсторияЗдоровья
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class КатегорияИнвалидности
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class КатегорияПотребителейУслуг
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class КатегорияРебенка
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class КлючиВнешнихСистем
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class КоличествоМестДляПриемаВгруппуДоу
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class КоличествоМестДляПриемаВдоу
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class КоличествоСпециалистовДоу
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class КорпусОрганизации
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ЛицензияОрганизации
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Личность
{
......@@ -19,6 +19,8 @@ namespace SocialMinistryDataExchange.Model.DB
ЛичностьПодразделенияs = new HashSet<ЛичностьПодразделения>();
ПитаниеУчащихсяs = new HashSet<ПитаниеУчащихся>();
ПричинаНахожденияВтжсs = new HashSet<ПричинаНахожденияВтжс>();
СоставСемьиЛичностьNavigations = new HashSet<СоставСемьи>();
СоставСемьиЧленСемьиNavigations = new HashSet<СоставСемьи>();
Справкаs = new HashSet<Справка>();
СтатусыНуждаемостиs = new HashSet<СтатусыНуждаемости>();
ТекущаяЛичностьПодразделенияs = new HashSet<ТекущаяЛичностьПодразделения>();
......@@ -153,6 +155,8 @@ namespace SocialMinistryDataExchange.Model.DB
public virtual ICollection<ЛичностьПодразделения> ЛичностьПодразделенияs { get; set; }
public virtual ICollection<ПитаниеУчащихся> ПитаниеУчащихсяs { get; set; }
public virtual ICollection<ПричинаНахожденияВтжс> ПричинаНахожденияВтжсs { get; set; }
public virtual ICollection<СоставСемьи> СоставСемьиЛичностьNavigations { get; set; }
public virtual ICollection<СоставСемьи> СоставСемьиЧленСемьиNavigations { get; set; }
public virtual ICollection<Справка> Справкаs { get; set; }
public virtual ICollection<СтатусыНуждаемости> СтатусыНуждаемостиs { get; set; }
public virtual ICollection<ТекущаяЛичностьПодразделения> ТекущаяЛичностьПодразделенияs { get; set; }
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ЛичностьПодразделения
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ЛичностьФио
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class МедицинскийДокументЛичности
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Микрорайон
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class НаправлениеОбучения
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class НаправленностьЗаболевания
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class НастройкаБазы
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ОбразовательнаяОрганизация
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ОбразовательнаяПрограммаОрганизации
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Оквэд
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Окогу
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Окопф
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Оксм
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Окфс
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ОрганВыдачиДокумента
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ОснованиеОтчисления
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ОснованиеСостоянияЗаявления
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ОтделениеОбразовательнойОрганизации
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ОтсутствиеРебенкаВдоу
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ОценкаУчащегося
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Параллель
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ПитаниеУчащихся
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ПодразделениеОбразовательнойОрганизации
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Помещение
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ПоселениеТерритории
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ПоставщикСистемыПитания
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Предмет
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Приказ
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ПричинаНахожденияВтжс
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ПричинаОтказаПоЗаявлению
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ПродолжительностьРаботыГруппы
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Профиль
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class РежимРаботыГруппы
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class СвязьУслуг
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class СловарьИмен
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class СловарьОтчеств
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class СодержаниеСтраницы
{
......
using System;
using System;
using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class СоставСемьи
{
public Guid PrimaryKey { get; set; }
public Guid Личность { get; set; }
public Guid ТипЧленаСемьи { get; set; }
public Guid ЧленСемьи { get; set; }
public DateTime? CreateTime { get; set; }
public string Creator { get; set; }
public DateTime? EditTime { get; set; }
public string Editor { get; set; }
public virtual Личность ЛичностьNavigation { get; set; }
public virtual ТипЧленаСемьи ТипЧленаСемьиNavigation { get; set; }
public virtual Личность ЧленСемьиNavigation { get; set; }
}
}
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class СотрудникОрганизации
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class СпециализацияГруппы
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Специальность
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class СпециальностьОо
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class СпециальностьПодразделения
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class СпособПодачиЗаявления
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Справка
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class СрокОбучения
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class СтатусОбразовательнойОрганизации
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class СтатусыНуждаемости
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Стн
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ТекущаяЛичностьПодразделения
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Территория
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ТипАооп
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ТипБазовойОп
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ТипГрафикаАттестации
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ТипЗаконногоПредставителя
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ТипЛьготнойКатегории
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ТипЛьготнойКатегорииДоу
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ТипМероприятия
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ТипНуждаемости
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ТипОбразовательнойОрганизации
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ТипОбразовательнойПрограммы
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ТипОбъектаИнтеграции
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ТипОценки
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ТипПитания
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ТипПодразделения
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ТипРезультатаАоп
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ТипСпециалистаОвз
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ТипУслуги
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ТипУчебногоПлана
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ТипФинансирования
{
......
using System;
using System;
using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ТипЧленаСемьи
{
public ТипЧленаСемьи()
{
СоставСемьиs = new HashSet<СоставСемьи>();
}
public Guid PrimaryKey { get; set; }
public int? Код { get; set; }
public string Наименование { get; set; }
public bool? Актуально { get; set; }
public DateTime? CreateTime { get; set; }
public string Creator { get; set; }
public DateTime? EditTime { get; set; }
public string Editor { get; set; }
public virtual ICollection<СоставСемьи> СоставСемьиs { get; set; }
}
}
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class УровеньМероприятия
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class УровеньОбразования
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Услуга
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class УчебныйГод
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class Файл
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ФайлЛичностиПодразделения
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ФактическоеЗначениеПоказателяУслуги
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ФизкультурнаяГруппа
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ФормаОбучения
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ФормаРеализацииОбучения
{
......
using System;
using System;
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
#nullable disable
namespace SocialMinistryDataExchange.Model.DB
namespace SocialMinistryDataExchange.Model.Contingent.Center
{
public partial class ЯзыкОбучения
{
......
using System;
using System.ComponentModel;
using System.Xml.Serialization;
namespace SocialMinistryDataExchange.Model.EscpSD {
[Serializable()]
[DesignerCategory("code")]
[XmlType(AnonymousType = true, Namespace = "urn://ru.permkrai.ecsp/mv/ecsp-sending-status-maloimushch")]
[XmlRoot(Namespace = "urn://ru.permkrai.ecsp/mv/ecsp-sending-status-maloimushch", IsNullable = false)]
public partial class EcspSendingStatusMaloimushch {
public string PrimaryKey { get; set; }
[XmlElement(DataType = "date")]
public DateTime DateTime { get; set; }
public string OrganSZ { get; set; }
public byte ObshKolChlenovSem { get; set; }
public string LgotKat { get; set; }
public decimal SrednedushevoiDohod { get; set; }
public decimal ProzhitMinimum { get; set; }
[XmlElement(DataType = "date")]
public DateTime SrokDeistviiaS { get; set; }
[XmlElement(DataType = "date")]
public DateTime SrokDeistviiaDo { get; set; }
public EcspSendingStatusMaloimushchLeechnost Leechnost { get; set; }
[XmlArrayItem("LeechostvSemya", IsNullable = false)]
public EcspSendingStatusMaloimushchLeechostvSemya[] Semya { get; set; }
}
[Serializable()]
[DesignerCategory("code")]
[XmlType(AnonymousType = true, Namespace = "urn://ru.permkrai.ecsp/mv/ecsp-sending-status-maloimushch")]
public partial class EcspSendingStatusMaloimushchLeechnost {
public string PrimaryKeyEAIS { get; set; }
public string PrimaryKeyKontingent { get; set; }
public string Famillia { get; set; }
public string Imia { get; set; }
public string Otchestvo { get; set; }
[XmlElement(DataType = "date", ElementName = "DataRozhdenia")]
public DateTime PersonBirthday { get; set; }
public EcspSendingStatusMaloimushchLeechnostUdostDokument UdostDokument { get; set; }
public ulong Snils { get; set; }
public string Propiska { get; set; }
}
[Serializable()]
[DesignerCategory("code")]
[XmlType(AnonymousType = true, Namespace = "urn://ru.permkrai.ecsp/mv/ecsp-sending-status-maloimushch")]
public partial class EcspSendingStatusMaloimushchLeechnostUdostDokument {
public string VidUdostDoc { get; set; }
public ushort Seriia { get; set; }
public uint Nomer { get; set; }
[XmlElement(DataType = "date")]
public DateTime DataVydachi { get; set; }
}
[Serializable()]
[DesignerCategory("code")]
[XmlType(AnonymousType = true, Namespace = "urn://ru.permkrai.ecsp/mv/ecsp-sending-status-maloimushch")]
public partial class EcspSendingStatusMaloimushchLeechostvSemya {
public string PrimaryKeyEAIS { get; set; }
public string PrimaryKeyKontingent { get; set; }
public string Famillia { get; set; }
public string Imia { get; set; }
public string Otchestvo { get; set; }
[XmlElement(DataType = "date")]
public DateTime DataRozhdenia { get; set; }
public EcspSendingStatusMaloimushchLeechostvSemyaUdostDokument UdostDokument { get; set; }
public ulong Snils { get; set; }
public string RodstOtn { get; set; }
public string Propiska { get; set; }
}
[Serializable()]
[DesignerCategory("code")]
[XmlType(AnonymousType = true, Namespace = "urn://ru.permkrai.ecsp/mv/ecsp-sending-status-maloimushch")]
public partial class EcspSendingStatusMaloimushchLeechostvSemyaUdostDokument {
public string VidUdostDoc { get; set; }
public ushort Seriia { get; set; }
public uint Nomer { get; set; }
[XmlElement(DataType = "date")]
public DateTime DataVydachi { get; set; }
}
}
using Microsoft.EntityFrameworkCore;
using SocialMinistryDataExchange.Model.DB;
using SocialMinistryDataExchange.Model.Contingent.Center;
namespace SocialMinistryDataExchange.Model {
public interface IContingentContext {
......@@ -18,7 +18,6 @@ namespace SocialMinistryDataExchange.Model {
DbSet<ВидУдостоверяющегоДокумента> ВидУдостоверяющегоДокументаs { get; set; }
DbSet<ТипОбразовательнойПрограммы> ТипОбразовательнойПрограммыs { get; set; }
DbSet<ФормаОбучения> ФормаОбученияs { get; set; }
DbSet<ТипОбразовательнойОрганизации> ТипОбразовательнойОрганизацииs { get; set; }
}
......
......@@ -9,5 +9,7 @@ namespace SocialMinistryDataExchange.Model {
Task<SMDefenceDemandResponce> GetPersonDefenceDemandByID(string PersonID);
// возвращает статус зачисленности в учебное заведение
Task<SMPersonDataRequest> GetOcupationByPerson(string OcupationRequest);
// принимает XML статус нуждаемости личности
Task<string> PutDefenceStatus(string request);
}
}
......@@ -4,6 +4,9 @@ using System;
using System.Collections.Generic;
using System.Text.Json;
using Serilog;
using System.Xml.Serialization;
using SocialMinistryDataExchange.Model.EscpSD;
using System.IO;
namespace SocialMinistryDataExchange.Model {
public class SMRepository : ISMRepository {
......@@ -17,6 +20,13 @@ namespace SocialMinistryDataExchange.Model {
_logger = logger;
}
// принимает XML статус нуждаемости личности
public Task<string> PutDefenceStatus(string RequestXML) {
XmlSerializer xmlSerializer = new XmlSerializer(typeof(EcspSendingStatusMaloimushch));
var request = xmlSerializer.Deserialize(new StringReader(RequestXML));
return Task.FromResult(String.Empty);
}
// возвращает статус нуждаемости личности (для фронта)
public Task<SMDefenceDemandResponce> GetPersonDefenceDemandByID(string PersonID) {
var status = (from st in _contingentContext.СтатусыНуждаемостиs
......@@ -61,7 +71,7 @@ namespace SocialMinistryDataExchange.Model {
private void TryFillPersonStatus(SMPersonDataOccupationMessage Person) {
try {
var person_record = (from pd in _contingentContext.ДокументЛичностиs
where pd.СерияДокумента.Contains(Person.Person.PersonDocumentSeria) && pd.НомерДокумента.Contains(Person.Person.PersonDocumentNumber)
where pd.СерияДокумента.Contains(Person.Person.PersonDocument.PersonDocumentSeria) && pd.НомерДокумента.Contains(Person.Person.PersonDocument.PersonDocumentNumber)
&& pd.ЛичностьNavigation.Фамилия.Contains(Person.Person.PersonFamilyName) && pd.ЛичностьNavigation.Имя.Contains(Person.Person.PersonName)
&& ((pd.ЛичностьNavigation.БезОтчества == null || pd.ЛичностьNavigation.БезОтчества == false) & pd.ЛичностьNavigation.Отчество.Contains(Person.Person.PersonSurname))
&& pd.ЛичностьNavigation.ДатаРождения == Person.Person.PersonBirthday
......@@ -76,7 +86,7 @@ namespace SocialMinistryDataExchange.Model {
rowguid_eais = Person.Person.rowguid_eais
// СерияДокумента, НомерДокумента, КогдаВыданДокумент, ВидУдостоверяющегоДокумента,
// НаименованиеУдостоверяющегоДокумента, КодУдостоверяющегоДокумента
, СерияДокумента = Person.Person.PersonDocumentSeria, НомерДокумента = Person.Person.PersonDocumentNumber, КогдаВыданДокумент = pd.КогдаВыданДокумент, ВидУдостоверяющегоДокумента = pd.ВидУдостоверяющегоДокумента
, СерияДокумента = Person.Person.PersonDocument.PersonDocumentSeria, НомерДокумента = Person.Person.PersonDocument.PersonDocumentNumber, КогдаВыданДокумент = pd.КогдаВыданДокумент, ВидУдостоверяющегоДокумента = pd.ВидУдостоверяющегоДокумента
, НаименованиеУдостоверяющегоДокумента = pd.ВидУдостоверяющегоДокументаNavigation.Наименование, КодУдостоверяющегоДокумента = pd.ВидУдостоверяющегоДокументаNavigation.Код
// Личность (Guid), Имя, Отчество, БезОтчества, Фамилия
, Личность = pd.Личность, Имя = pd.ЛичностьNavigation.Имя, Отчество = pd.ЛичностьNavigation.Отчество, БезОтчества = pd.ЛичностьNavigation.БезОтчества == null ? false : true, Фамилия = pd.ЛичностьNavigation.Фамилия
......@@ -104,8 +114,8 @@ namespace SocialMinistryDataExchange.Model {
Person.Person.Error += "Personal information Error;";
_logger.Error($"Person '{{@Error}}': {{@Person}};", "TryFillPersonStatus: ", Person.Person);
}
if (person_record.СерияДокумента != Person.Person.PersonDocumentSeria || person_record.НомерДокумента != Person.Person.PersonDocumentNumber
|| person_record.КогдаВыданДокумент != Person.Person.PersonDocumentDate) {
if (person_record.СерияДокумента != Person.Person.PersonDocument.PersonDocumentSeria || person_record.НомерДокумента != Person.Person.PersonDocument.PersonDocumentNumber
|| person_record.КогдаВыданДокумент != Person.Person.PersonDocument.PersonDocumentDate) {
Person.Person.Error += "Personal document Error;";
_logger.Error($"Person '{{@Error}}': {{@Person}};", "TryFillPersonStatus: ", Person.Person);
}
......@@ -113,10 +123,10 @@ namespace SocialMinistryDataExchange.Model {
Person.Person.PersonName = person_record.Имя;
Person.Person.PersonSurname = person_record.Отчество;
Person.Person.PersonBirthday = person_record.ДатаРождения;
Person.Person.PersonDocumentSeria = person_record.СерияДокумента;
Person.Person.PersonDocumentNumber = person_record.НомерДокумента;
Person.Person.PersonDocumentDate = person_record.КогдаВыданДокумент;
Person.Person.PersonDocumentType = person_record.КодУдостоверяющегоДокумента == 12 || person_record.КодУдостоверяющегоДокумента == 13 || person_record.КодУдостоверяющегоДокумента == 21 ? 1
Person.Person.PersonDocument.PersonDocumentSeria = person_record.СерияДокумента;
Person.Person.PersonDocument.PersonDocumentNumber = person_record.НомерДокумента;
Person.Person.PersonDocument.PersonDocumentDate = person_record.КогдаВыданДокумент;
Person.Person.PersonDocument.PersonDocumentType = person_record.КодУдостоверяющегоДокумента == 12 || person_record.КодУдостоверяющегоДокумента == 13 || person_record.КодУдостоверяющегоДокумента == 21 ? 1
: person_record.КодУдостоверяющегоДокумента == 11 || person_record.КодУдостоверяющегоДокумента == 31 ? 2 : 99;
Person.Person.PersonSnils = String.IsNullOrEmpty(person_record.Снилс) ? Person.Person.PersonSnils : person_record.Снилс;
Person.Person.PersonAddress = String.IsNullOrEmpty(person_record.ТерриторияShortname) ? Person.Person.PersonAddress : person_record.ТерриторияShortname;
......@@ -192,14 +202,14 @@ namespace SocialMinistryDataExchange.Model {
SMData responce_record;
foreach (var doc in docs.MsgData) {
try {
if (doc.Person.PersonDocumentSeria is null || doc.Person.PersonDocumentNumber is null || doc.Person.PersonFamilyName is null || doc.Person.PersonName is null || doc.Person.PersonBirthday is null) {
if (doc.Person.PersonDocument.PersonDocumentSeria is null || doc.Person.PersonDocument.PersonDocumentNumber is null || doc.Person.PersonFamilyName is null || doc.Person.PersonName is null || doc.Person.PersonBirthday is null) {
throw new ArgumentNullException($"{nameof(doc.Person)}");
}
responce_record = new SMData();
var record = (from pd in _contingentContext.ДокументЛичностиs
where pd.СерияДокумента == doc.Person.PersonDocumentSeria && pd.НомерДокумента == doc.Person.PersonDocumentNumber
where pd.СерияДокумента == doc.Person.PersonDocument.PersonDocumentSeria && pd.НомерДокумента == doc.Person.PersonDocument.PersonDocumentNumber
&& pd.ЛичностьNavigation.Фамилия == doc.Person.PersonFamilyName && pd.ЛичностьNavigation.Имя == doc.Person.PersonName
&& (pd.ЛичностьNavigation.БезОтчества == false & pd.ЛичностьNavigation.Отчество == doc.Person.PersonSurname)
&& pd.ЛичностьNavigation.ДатаРождения == doc.Person.PersonBirthday
......@@ -213,7 +223,7 @@ namespace SocialMinistryDataExchange.Model {
select new SMResponceTemp {
rowguid_eais = doc.Person.rowguid_eais
// СерияДокумента, НомерДокумента, КогдаВыданДокумент, ВидУдостоверяющегоДокумента, НаименованиеУдостоверяющегоДокумента, КодУдостоверяющегоДокумента
, СерияДокумента = doc.Person.PersonDocumentSeria, НомерДокумента = doc.Person.PersonDocumentNumber, КогдаВыданДокумент = pd.КогдаВыданДокумент, ВидУдостоверяющегоДокумента = pd.ВидУдостоверяющегоДокумента, НаименованиеУдостоверяющегоДокумента = pd.ВидУдостоверяющегоДокументаNavigation.Наименование, КодУдостоверяющегоДокумента = pd.ВидУдостоверяющегоДокументаNavigation.Код
, СерияДокумента = doc.Person.PersonDocument.PersonDocumentSeria, НомерДокумента = doc.Person.PersonDocument.PersonDocumentNumber, КогдаВыданДокумент = pd.КогдаВыданДокумент, ВидУдостоверяющегоДокумента = pd.ВидУдостоверяющегоДокумента, НаименованиеУдостоверяющегоДокумента = pd.ВидУдостоверяющегоДокументаNavigation.Наименование, КодУдостоверяющегоДокумента = pd.ВидУдостоверяющегоДокументаNavigation.Код
// Личность (Guid), Имя, Отчество, БезОтчества, Фамилия
, Личность = pd.Личность, Имя = pd.ЛичностьNavigation.Имя, Отчество = pd.ЛичностьNavigation.Отчество, БезОтчества = pd.ЛичностьNavigation.БезОтчества, Фамилия = pd.ЛичностьNavigation.Фамилия
// ДатаРождения, ТерриторияФактическогоМестаЖительстваNew (нигде не заполнено - null), Снилс
......@@ -235,9 +245,9 @@ namespace SocialMinistryDataExchange.Model {
}
catch (Exception ex) {
_logger.Error($"{ex.TargetSite.Name}; {ex.Message}; {{@Person}}", doc.Person);
_logger.Information($"Creating empty Person for doc.seria={doc.Person.PersonDocumentSeria}; doc.number={doc.Person.PersonDocumentNumber}");
_logger.Information($"Creating empty Person for doc.seria={doc.Person.PersonDocument.PersonDocumentSeria}; doc.number={doc.Person.PersonDocument.PersonDocumentNumber}");
responce_record = FormatResponce(_contingentContext, new SMResponceTemp() { rowguid_eais = doc.Person.rowguid_eais, СерияДокумента = doc.Person.PersonDocumentSeria, НомерДокумента = doc.Person.PersonDocumentNumber });
responce_record = FormatResponce(_contingentContext, new SMResponceTemp() { rowguid_eais = doc.Person.rowguid_eais, СерияДокумента = doc.Person.PersonDocument.PersonDocumentSeria, НомерДокумента = doc.Person.PersonDocument.PersonDocumentNumber });
}
responce.Add(responce_record);
}
......
......@@ -32,14 +32,11 @@ namespace SocialMinistryDataExchange.Model {
public class Person {
public string rowguid_eais { get; set; }
public string? rowguid_contingent { get; set; }
public PersonDocument PersonDocument { get; set; }
public string PersonFamilyName { get; set; }
public string PersonName { get; set; }
public string? PersonSurname { get; set; }
public DateTime? PersonBirthday { get; set; }
public int? PersonDocumentType { get; set; }
public string PersonDocumentSeria { get; set; }
public string PersonDocumentNumber { get; set; }
public DateTime? PersonDocumentDate { get; set; }
public string? PersonSnils { get; set; }
public string? PersonAddress { get; set; }
public string? DependentPerson { get; set; }
......@@ -47,6 +44,12 @@ namespace SocialMinistryDataExchange.Model {
public string? Territory { get; set; }
public string? Error { get; set; }
}
public class PersonDocument {
public int? PersonDocumentType { get; set; }
public string PersonDocumentSeria { get; set; }
public string PersonDocumentNumber { get; set; }
public DateTime? PersonDocumentDate { get; set; }
}
// общий класс статуса зачисленности в учереждение образования
public class SMPersonOccupationStatus {
......
<?xml version="1.0" encoding="utf-8"?>
<EcspSendingStatusMaloimushch xmlns="urn://ru.permkrai.ecsp/mv/ecsp-sending-status-maloimushch">
<PrimaryKey>00000000-0000-0000-0000-000000000000</PrimaryKey>
<DateTime>2022-02-02</DateTime>
<OrganSZ>Орган СЗ</OrganSZ>
<ObshKolChlenovSem>2</ObshKolChlenovSem>
<LgotKat>Малоимущаяя льготная категория</LgotKat>
<SrednedushevoiDohod>123.00</SrednedushevoiDohod>
<ProzhitMinimum>150.00</ProzhitMinimum>
<SrokDeistviiaS>2022-02-01</SrokDeistviiaS>
<SrokDeistviiaDo>2022-03-01</SrokDeistviiaDo>
<Leechnost>
<PrimaryKeyEAIS>00000000-0000-0000-0000-000000000000</PrimaryKeyEAIS>
<PrimaryKeyKontingent>00000000-0000-0000-0000-000000000000</PrimaryKeyKontingent>
<Famillia>Семенов</Famillia>
<Imia>Семен</Imia>
<Otchestvo>Семенович</Otchestvo>
<DataRozhdenia>1987-05-04</DataRozhdenia>
<UdostDokument>
<VidUdostDoc>Паспорт РФ</VidUdostDoc>
<Seriia>1122</Seriia>
<Nomer>123456</Nomer>
<DataVydachi>2000-02-02</DataVydachi>
</UdostDokument>
<Snils>12132041276</Snils>
<Propiska>Прописка</Propiska>
</Leechnost>
<Semya>
<LeechostvSemya>
<PrimaryKeyEAIS>00000000-0000-0000-0000-000000000000</PrimaryKeyEAIS>
<PrimaryKeyKontingent>00000000-0000-0000-0000-000000000000</PrimaryKeyKontingent>
<Famillia>Семенов</Famillia>
<Imia>Семен</Imia>
<Otchestvo>Семенович</Otchestvo>
<DataRozhdenia>1987-05-04</DataRozhdenia>
<UdostDokument>
<VidUdostDoc>Паспорт РФ</VidUdostDoc>
<Seriia>1122</Seriia>
<Nomer>123456</Nomer>
<DataVydachi>2000-02-02</DataVydachi>
</UdostDokument>
<Snils>12132041276</Snils>
<RodstOtn>Семья</RodstOtn>
<Propiska>Прописка</Propiska>
</LeechostvSemya>
<LeechostvSemya>
<PrimaryKeyEAIS>00000000-0000-0000-0000-000000000000</PrimaryKeyEAIS>
<PrimaryKeyKontingent>00000000-0000-0000-0000-000000000000</PrimaryKeyKontingent>
<Famillia>Семенов</Famillia>
<Imia>Семен</Imia>
<Otchestvo>Семенович</Otchestvo>
<DataRozhdenia>1987-05-04</DataRozhdenia>
<UdostDokument>
<VidUdostDoc>Паспорт РФ</VidUdostDoc>
<Seriia>1122</Seriia>
<Nomer>123456</Nomer>
<DataVydachi>2000-02-02</DataVydachi>
</UdostDokument>
<Snils>12132041276</Snils>
<RodstOtn>Семья</RodstOtn>
<Propiska>Прописка</Propiska>
</LeechostvSemya>
</Semya>
</EcspSendingStatusMaloimushch>
\ No newline at end of file
{
"msgID": "string",
"msgDataTime": "2022-03-25T14:25:48.793Z",
"msgDataTime": "2022-03-29T09:06:02.535Z",
"msgPriority": "string",
"msgData": [
{
"person": {
"rowguid_eais": "string",
"rowguid_contingent": "string",
"personDocument": {
"personDocumentType": 0,
"personDocumentSeria": "string",
"personDocumentNumber": "string",
"personDocumentDate": "2022-03-29T09:06:02.535Z"
},
"personFamilyName": "string",
"personName": "string",
"personSurname": "string",
"personBirthday": "2022-03-25T14:25:48.793Z",
"personDocumentType": 0,
"personDocumentSeria": "string",
"personDocumentNumber": "string",
"personDocumentDate": "2022-03-25T14:25:48.793Z",
"personBirthday": "2022-03-29T09:06:02.535Z",
"personSnils": "string",
"personAddress": "string",
"dependentPerson": "string",
......@@ -24,7 +26,7 @@
},
"personOccupation": {
"status": "string",
"statusDate": "2022-03-25T14:25:48.793Z",
"statusDate": "2022-03-29T09:06:02.535Z",
"founderType": "string",
"organizationType": "string",
"educationProgram": "string",
......
<?xml version="1.0" encoding="utf-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="urn://ru.permkrai.ecsp/mv/ecsp-sending-status-maloimushch" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="EcspSendingStatusMaloimushch">
<xs:complexType>
<xs:sequence>
<xs:element name="PrimaryKey" type="xs:string" />
<xs:element name="DateTime" type="xs:date" />
<xs:element name="OrganSZ" type="xs:string" />
<xs:element name="ObshKolChlenovSem" type="xs:int" />
<xs:element name="LgotKat" type="xs:string" />
<xs:element name="SrednedushevoiDohod" type="xs:decimal" />
<xs:element name="ProzhitMinimum" type="xs:decimal" />
<xs:element name="SrokDeistviiaS" type="xs:date" />
<xs:element name="SrokDeistviiaDo" type="xs:date" />
<xs:element name="Leechnost">
<xs:complexType>
<xs:sequence>
<xs:element name="PrimaryKeyEAIS" type="xs:string" />
<xs:element name="PrimaryKeyKontingent" type="xs:string" />
<xs:element name="Famillia" type="xs:string" />
<xs:element name="Imia" type="xs:string" />
<xs:element name="Otchestvo" type="xs:string" />
<xs:element name="DataRozhdenia" type="xs:date" />
<xs:element name="UdostDokument">
<xs:complexType>
<xs:sequence>
<xs:element name="VidUdostDoc" type="xs:string" />
<xs:element name="Seriia" type="xs:string" />
<xs:element name="Nomer" type="xs:string" />
<xs:element name="DataVydachi" type="xs:date" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Snils" type="xs:string" />
<xs:element name="Propiska" type="xs:string" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Semya">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" name="LeechostvSemya">
<xs:complexType>
<xs:sequence>
<xs:element name="PrimaryKeyEAIS" type="xs:string" />
<xs:element name="PrimaryKeyKontingent" type="xs:string" />
<xs:element name="Famillia" type="xs:string" />
<xs:element name="Imia" type="xs:string" />
<xs:element name="Otchestvo" type="xs:string" />
<xs:element name="DataRozhdenia" type="xs:date" />
<xs:element name="UdostDokument">
<xs:complexType>
<xs:sequence>
<xs:element name="VidUdostDoc" type="xs:string" />
<xs:element name="Seriia" type="xs:string" />
<xs:element name="Nomer" type="xs:string" />
<xs:element name="DataVydachi" type="xs:date" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Snils" type="xs:string" />
<xs:element name="RodstOtn" type="xs:string" />
<xs:element name="Propiska" type="xs:string" />
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:schema>
\ No newline at end of file
......@@ -9,7 +9,7 @@ using Microsoft.OpenApi.Models;
using Serilog;
using Serilog.Events;
using SocialMinistryDataExchange.Model;
using SocialMinistryDataExchange.Model.DB.Center;
using SocialMinistryDataExchange.Model.Contingent.Center;
using System;
using System.IO;
......@@ -30,18 +30,18 @@ namespace SocialMinistryDataExchange {
.MinimumLevel.Override("Default", LogEventLevel.Information)
.Enrich.FromLogContext()
.WriteTo.File($@"{Directory.GetCurrentDirectory()}\Logs\{DateTime.Now.ToString("yyyy-MM-dd")}.log"
//, outputTemplate: "[{Timestamp:HH:mm:ss.fff}{SourceContext}] |{Level:u3}| {Message:lj}{NewLine}{Exception}")
, outputTemplate: "[{Timestamp:HH:mm:ss.fff}] |{Level:u3}| {Message:lj}{NewLine}{Exception}")
.CreateLogger();
.CreateLogger();
services.AddSingleton(Log.Logger);
services.AddControllers();
services.AddSwaggerGen(c => {
c.SwaggerDoc("v1", new OpenApiInfo { Title = "SocialMinistryDataExchange", Version = "v1" });
});
services.AddDbContext<Contingent_center_Context>(options => options.UseSqlServer(ConnectionString));
services.AddTransient<IContingentContext, Contingent_center_Context>();
services.AddTransient<ISMRepository, SMRepository>();
services.AddSingleton<Serilog.ILogger>(Log.Logger);
}
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
......@@ -53,9 +53,7 @@ namespace SocialMinistryDataExchange {
}
app.UseHttpsRedirection();
app.UseRouting();
app.UseAuthorization();
app.UseEndpoints(endpoints => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment