diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1b0971a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+bin/
+obj/
+*.user
+/Publish
+/packages
+.vs
+Logs/
+Upload
+dbsettings.Development.json
diff --git a/Ewide.NbzsZheliban/Entity/DataBase/PoliciesRegulations.cs b/Ewide.NbzsZheliban/Entity/DataBase/PoliciesRegulations.cs
new file mode 100644
index 0000000..74bdde0
--- /dev/null
+++ b/Ewide.NbzsZheliban/Entity/DataBase/PoliciesRegulations.cs
@@ -0,0 +1,183 @@
+ //----------PoliciesRegulations开始----------
+
+ using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+//using System.Data.Entity.ModelConfiguration;
+using Ewide.NbzsZheliban.Entity;
+using System.Runtime.Serialization;
+ namespace Ewide.NbzsZheliban.Entity
+ {
+ ///
+ /// 数据表实体类：PoliciesRegulations
+ ///
+ [Table("PoliciesRegulations")]
+ public partial class PoliciesRegulations: BaseEntity {
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Key]
+ [Column("ID")]
+ [DataMember]
+ public Guid ID {get;set;}
+ ///
+ /// 项目id 关联Projects表ID
+ ///
+
+ [Display(Name="项目id 关联Projects表ID")]
+ [Column("ProjectID")]
+ [DataMember]
+ public Guid? ProjectID {get;set;}
+ ///
+ /// 项目名称
+ ///
+
+ [Display(Name="项目名称")]
+ [Column("ProjectName")]
+ [DataMember]
+ public string ProjectName {get;set;}
+ ///
+ /// 所属区域ID
+ ///
+
+ [Display(Name="所属区域ID")]
+ [Column("AreaID")]
+ [DataMember]
+ public Guid? AreaID {get;set;}
+ ///
+ /// 所属区域
+ ///
+
+ [Display(Name="所属区域")]
+ [Column("Area")]
+ [DataMember]
+ public string Area {get;set;}
+ ///
+ /// 标题
+ ///
+
+ [Display(Name="标题")]
+ [Column("Title")]
+ [DataMember]
+ public string Title {get;set;}
+ ///
+ /// 征文内容
+ ///
+
+ [Display(Name="征文内容")]
+ [Column("Contents")]
+ [DataMember]
+ public string Contents {get;set;}
+ ///
+ /// 是否公开
+ ///
+
+ [Display(Name="是否公开")]
+ [Column("IsPublic")]
+ [DataMember]
+ public bool IsPublic {get;set;}
+ ///
+ /// 发布时间
+ ///
+
+ [Display(Name="发布时间")]
+ [Column("PublicTime")]
+ [DataMember]
+ public DateTime? PublicTime {get;set;}
+ ///
+ /// 使用截止时间
+ ///
+
+ [Display(Name="使用截止时间")]
+ [Column("PublicTimeEnd")]
+ [DataMember]
+ public DateTime? PublicTimeEnd {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("CreateUserName")]
+ [DataMember]
+ public string CreateUserName {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("UpdateTime")]
+ [DataMember]
+ public DateTime? UpdateTime {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("UpdateUserId")]
+ [DataMember]
+ public Guid? UpdateUserId {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("UpdateUserName")]
+ [DataMember]
+ public string UpdateUserName {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Remark")]
+ [DataMember]
+ public string Remark {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Files")]
+ [DataMember]
+ public string Files {get;set;}
+
+ }
+
+ /**
+ ///
+ /// 数据表实体类Map：PoliciesRegulations
+ ///
+ public class PoliciesRegulationsMap : EntityTypeConfiguration
+ {
+ public PoliciesRegulationsMap()
+ {
+ this.ToTable("PoliciesRegulations");
+ this.HasKey(t => t.ID);
+ this.Property(t => t.ProjectID).HasColumnName("ProjectID");
+ this.Property(t => t.ProjectName).HasColumnName("ProjectName");
+ this.Property(t => t.AreaID).HasColumnName("AreaID");
+ this.Property(t => t.Area).HasColumnName("Area");
+ this.Property(t => t.Title).HasColumnName("Title");
+ this.Property(t => t.Contents).HasColumnName("Contents");
+ this.Property(t => t.IsPublic).HasColumnName("IsPublic");
+ this.Property(t => t.PublicTime).HasColumnName("PublicTime");
+ this.Property(t => t.PublicTimeEnd).HasColumnName("PublicTimeEnd");
+ this.Property(t => t.CreateTime).HasColumnName("CreateTime");
+ this.Property(t => t.CreateUserId).HasColumnName("CreateUserId");
+ this.Property(t => t.CreateUserName).HasColumnName("CreateUserName");
+ this.Property(t => t.UpdateTime).HasColumnName("UpdateTime");
+ this.Property(t => t.UpdateUserId).HasColumnName("UpdateUserId");
+ this.Property(t => t.UpdateUserName).HasColumnName("UpdateUserName");
+ this.Property(t => t.Remark).HasColumnName("Remark");
+ this.Property(t => t.Files).HasColumnName("Files");
+ this.Property(t => t.Sort).HasColumnName("Sort").IsRequired();
+ }
+ }**/
+
+ }
+
+ //----------PoliciesRegulations结束----------
+
+
\ No newline at end of file
diff --git a/Ewide.NbzsZheliban/Entity/Extends/H5IndexPrjModel.cs b/Ewide.NbzsZheliban/Entity/Extends/H5IndexPrjModel.cs
index 1297f85..6d7d891 100644
--- a/Ewide.NbzsZheliban/Entity/Extends/H5IndexPrjModel.cs
+++ b/Ewide.NbzsZheliban/Entity/Extends/H5IndexPrjModel.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Runtime.CompilerServices;
using System.Text;
using System.Threading.Tasks;
@@ -33,6 +34,7 @@ namespace Ewide.NbzsZheliban.Entity.Extends
/// 项目信息
///
public List PrjList { get; set; }
+ public List PoliciesRegulationsList { get; set; }
}
public class H5IndexPrjModel
{
@@ -41,6 +43,8 @@ namespace Ewide.NbzsZheliban.Entity.Extends
/// 区域
///
public string Area { get; set; }
+ [Newtonsoft.Json.JsonIgnore]
+ public string AreaID { get; set; }
///
/// 征收部门
///
@@ -66,4 +70,12 @@ namespace Ewide.NbzsZheliban.Entity.Extends
///
public object BcxyList { get; set; }
}
+ public class PoliciesRegulation
+ {
+
+ public Guid ID { get; set; }
+ public string Title { get; set; }
+ public string Contents { get; set; }
+ public DateTime? PublicTime { get; set; }
+ }
}
diff --git a/Ewide.NbzsZheliban/Entity/SqlModelTpl.cs b/Ewide.NbzsZheliban/Entity/SqlModelTpl.cs
index 38c9b8b..d1fb2a2 100644
--- a/Ewide.NbzsZheliban/Entity/SqlModelTpl.cs
+++ b/Ewide.NbzsZheliban/Entity/SqlModelTpl.cs
@@ -12,6 +12,7 @@
+
diff --git a/Ewide.NbzsZheliban/Entity/SqlModelTpl.tt b/Ewide.NbzsZheliban/Entity/SqlModelTpl.tt
index b726008..05d73a4 100644
--- a/Ewide.NbzsZheliban/Entity/SqlModelTpl.tt
+++ b/Ewide.NbzsZheliban/Entity/SqlModelTpl.tt
@@ -16,7 +16,7 @@
string tableClass="";
//所有表名称
//string sqlGetTable = "SELECT Name FROM SysObjects Where XType='U' ORDER BY Name";
- DataTable dt = GetDataTable(new List { "Projects","InvestigateTable","NonResidentialInvestigateTable","InvestigateTable_Assessment","NonInvestigateTable_Assessment","NonResidentialAgreement","ResidentialAgreement" });
+ DataTable dt = GetDataTable(new List { "Projects","InvestigateTable","NonResidentialInvestigateTable","InvestigateTable_Assessment","NonInvestigateTable_Assessment","NonResidentialAgreement","ResidentialAgreement","PoliciesRegulations" });
//DataTable dtRelationTable = GetRelationTable();
//所有表信息
string selectQuery ="select syscolumns.name,systypes.name,syscolumns.length from syscolumns,systypes where syscolumns.xusertype=systypes.xusertype and syscolumns.id=object_id('@tableName')";
diff --git a/Ewide.NbzsZheliban/Service/DataService.cs b/Ewide.NbzsZheliban/Service/DataService.cs
index bc25036..7921da5 100644
--- a/Ewide.NbzsZheliban/Service/DataService.cs
+++ b/Ewide.NbzsZheliban/Service/DataService.cs
@@ -29,18 +29,8 @@ namespace Ewide.NbzsZheliban.Service
db = repository.Context;
_jsonSerializer = jsonSerializer;
}
- ///
- /// 被征收人关联的项目列表
- ///
- ///
- ///
- [HttpPost("/project/list")]
- [Microsoft.AspNetCore.Authorization.AllowAnonymous]
- public async Task PrjList([FromBody] JObject args)
+ private JObject GetInfoByTicket(string ticket)
{
- #region 票据
- var ticket = args.GetJsonValue("ticket", isThrowExp: true);
- //var ticket = Request.Query["ticket"];
if (!string.IsNullOrWhiteSpace(ticket))
{
var time = DateTime.Now.ToString("yyyyMMddHHmmss");
@@ -88,43 +78,72 @@ namespace Ewide.NbzsZheliban.Service
}
if (userinfoObj["result"].Value() != 0)
throw Oops.Oh($"ticket接口返回值有误,[{tickerRsltStr}]");
- var cardno = userinfoObj["idnum"].ToString();
- var username = userinfoObj["username"].ToString();
-
- #endregion
- //var cardno = args.GetJsonValue("cardno", isThrowExp: true);
- //住宅调查表
- var list_zz_dcb = await db.Ado.SqlQueryAsync("select ID dcbId,ProjectId PrjId from InvestigateTable b where b.ExpropriatedCardNo=@ExpropriatedCardNo", new List { new SugarParameter("ExpropriatedCardNo", cardno, System.Data.DbType.String) }.ToArray());
- //非住宅调查表
- var list_fzz_dcb = await db.Ado.SqlQueryAsync("select ID dcbId,ProjectId PrjId from NonResidentialInvestigateTable b where b.PropertyRightCardNo=@ExpropriatedCardNo", new List { new SugarParameter("ExpropriatedCardNo", cardno, System.Data.DbType.String) }.ToArray());
- //调查表集合
- var list_dcbs = list_zz_dcb.Concat(list_fzz_dcb);
- //项目列表
- var list_projects = await db.Ado.SqlQueryAsync("select a.ID Prjid,a.area,a.HouseAcquisitionDepartment as zsbm,a.CollectDecisionNo1 as year,(isnull(a.CollectDecisionNoHeadName,'')+'['+cast(a.CollectDecisionNo1 as varchar)+']'+ isnull(cast(a.CollectDecisionNo2 as varchar),'')+'号') zsjdh,dbo.get_current_state(a.ID) CurrentState from Projects a where ID in ('" + string.Join("','", list_dcbs.Select(p => p.PrjId)) + "') ");
- //分户评估
- var InvestigateTableID_param = "'" + string.Join("','", list_dcbs.Select(p => p.dcbId)) + "'";
- var list_fhpgs = await db.Ado.SqlQueryAsync("select e.ProjectId as PrjId ,d.AssessmentNo,e.HouseAddress,d.countValue from InvestigateTable_Assessment d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select e.ProjectId as PrjId ,AssessmentNo, e.HouseAddress, d.countValue from NonInvestigateTable_Assessment d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ) ;");
- //补偿协议
- var list_bcxys = await db.Ado.SqlQueryAsync("select isnull(d.CollectDecisionNoHeadName,'')+isnull(d.No1,'')+'-'+isnull(d.No2,'')+(case when (d.No3 is null or d.No3 = '') then '' else ('-'+d.No3) end ) XyNo,d.SwitchProductionWay,e.HouseAddress,d.SummationShouldCompensateMoney,e.ProjectId as PrjId from ResidentialAgreement d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select isnull(d.CollectDecisionNoHeadName, '') + isnull(d.No2, '') + '-' + isnull(d.No3, '') XyNo , d.SwitchProductionWay, e.HouseAddress, d.SummationShouldCompensateMoney, e.ProjectId as PrjId from NonResidentialAgreement d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ); ");
-
- list_projects.ForEach(p =>
- {
- p.FhpgList = list_fhpgs.Where(a => a.PrjId == p.PrjId);
- p.BcxyList = list_bcxys.Where(a => a.PrjId == p.PrjId);
- });
- H5IndexModel h5IndexModel = new()
- {
- PrjList = list_projects,
- IdCard = cardno,
- UserName = username
- };
- return h5IndexModel;
+ return userinfoObj;
}
else
{
throw Oops.Oh("无效访问");
}
}
+ private async Task GetInfoByCardNoAsync(string cardno, string username)
+ {
+ //var cardno = args.GetJsonValue("cardno", isThrowExp: true);
+ //住宅调查表
+ var list_zz_dcb = await db.Ado.SqlQueryAsync("select ID dcbId,ProjectId PrjId from InvestigateTable b where b.ExpropriatedCardNo=@ExpropriatedCardNo", new List { new SugarParameter("ExpropriatedCardNo", cardno, System.Data.DbType.String) }.ToArray());
+ //非住宅调查表
+ var list_fzz_dcb = await db.Ado.SqlQueryAsync("select ID dcbId,ProjectId PrjId from NonResidentialInvestigateTable b where b.PropertyRightCardNo=@ExpropriatedCardNo", new List { new SugarParameter("ExpropriatedCardNo", cardno, System.Data.DbType.String) }.ToArray());
+ //调查表集合
+ var list_dcbs = list_zz_dcb.Concat(list_fzz_dcb);
+ //项目列表
+ var list_projects = await db.Ado.SqlQueryAsync("select a.ID Prjid,a.area,a.AreaID,a.HouseAcquisitionDepartment as zsbm,a.CollectDecisionNo1 as year,(isnull(a.CollectDecisionNoHeadName,'')+'['+cast(a.CollectDecisionNo1 as varchar)+']'+ isnull(cast(a.CollectDecisionNo2 as varchar),'')+'号') zsjdh,dbo.get_current_state(a.ID) CurrentState from Projects a where ID in ('" + string.Join("','", list_dcbs.Select(p => p.PrjId)) + "') ");
+ //分户评估
+ var InvestigateTableID_param = "'" + string.Join("','", list_dcbs.Select(p => p.dcbId)) + "'";
+ var list_fhpgs = await db.Ado.SqlQueryAsync("select e.ProjectId as PrjId ,d.AssessmentNo,e.HouseAddress,d.countValue from InvestigateTable_Assessment d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select e.ProjectId as PrjId ,AssessmentNo, e.HouseAddress, d.countValue from NonInvestigateTable_Assessment d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ) ;");
+ //补偿协议
+ var list_bcxys = await db.Ado.SqlQueryAsync("select isnull(d.CollectDecisionNoHeadName,'')+isnull(d.No1,'')+'-'+isnull(d.No2,'')+(case when (d.No3 is null or d.No3 = '') then '' else ('-'+d.No3) end ) XyNo,d.SwitchProductionWay,e.HouseAddress,d.SummationShouldCompensateMoney,e.ProjectId as PrjId from ResidentialAgreement d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select isnull(d.CollectDecisionNoHeadName, '') + isnull(d.No2, '') + '-' + isnull(d.No3, '') XyNo , d.SwitchProductionWay, e.HouseAddress, d.SummationShouldCompensateMoney, e.ProjectId as PrjId from NonResidentialAgreement d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ); ");
+ //政策
+ var list_PoliciesRegulations = await db.Queryable().ToListAsync();
+ var listAreas = new List
+ {
+ Guid.Parse("B2A0291C-84C7-4D86-A6D5-CB9FCCF4A2D8")
+ };
+ list_projects.ForEach(p =>
+ {
+ p.FhpgList = list_fhpgs.Where(a => a.PrjId == p.PrjId);
+ p.BcxyList = list_bcxys.Where(a => a.PrjId == p.PrjId);
+ listAreas.Add(Guid.Parse(p.AreaID));
+ });
+ H5IndexModel h5IndexModel = new()
+ {
+ PrjList = list_projects,
+ IdCard = cardno,
+ UserName = username,
+ PoliciesRegulationsList = list_PoliciesRegulations.Where(a => listAreas.Contains(a.AreaID)).Select(b => new PoliciesRegulation
+ {
+ ID = b.ID,
+ Contents = b.Contents,
+ PublicTime = b.PublicTime,
+ Title = b.Title
+ }).ToList()
+ };
+ return h5IndexModel;
+ }
+ ///
+ /// 被征收人关联的项目列表
+ ///
+ ///
+ ///
+ [HttpPost("/project/list")]
+ [Microsoft.AspNetCore.Authorization.AllowAnonymous]
+ public async Task PrjList([FromBody] JObject args)
+ {
+ var ticket = args.GetJsonValue("ticket", isThrowExp: true);
+ //var ticket = Request.Query["ticket"];
+ var userinfoObj = GetInfoByTicket(ticket);
+ var cardno = userinfoObj["idnum"].ToString();
+ var username = userinfoObj["username"].ToString();
+ return await GetInfoByCardNoAsync(cardno, username);
+ }
///
/// 被征收人关联的项目列表
///
@@ -136,35 +155,7 @@ namespace Ewide.NbzsZheliban.Service
{
var cardno = "341203199206303411";
var username = "张三丰";
-
- //var cardno = args.GetJsonValue("cardno", isThrowExp: true);
- //住宅调查表
- var list_zz_dcb = await db.Ado.SqlQueryAsync("select ID dcbId,ProjectId PrjId from InvestigateTable b where b.ExpropriatedCardNo=@ExpropriatedCardNo", new List { new SugarParameter("ExpropriatedCardNo", cardno, System.Data.DbType.String) }.ToArray());
- //非住宅调查表
- var list_fzz_dcb = await db.Ado.SqlQueryAsync("select ID dcbId,ProjectId PrjId from NonResidentialInvestigateTable b where b.PropertyRightCardNo=@ExpropriatedCardNo", new List { new SugarParameter("ExpropriatedCardNo", cardno, System.Data.DbType.String) }.ToArray());
- //调查表集合
- var list_dcbs = list_zz_dcb.Concat(list_fzz_dcb);
- //项目列表
- var list_projects = await db.Ado.SqlQueryAsync("select a.ID Prjid,a.area,a.HouseAcquisitionDepartment as zsbm,a.CollectDecisionNo1 as year,(isnull(a.CollectDecisionNoHeadName,'')+'['+cast(a.CollectDecisionNo1 as varchar)+']'+ isnull(cast(a.CollectDecisionNo2 as varchar),'')+'号') zsjdh,dbo.get_current_state(a.ID) CurrentState from Projects a where ID in ('" + string.Join("','", list_dcbs.Select(p => p.PrjId)) + "') ");
- //分户评估
- var InvestigateTableID_param = "'" + string.Join("','", list_dcbs.Select(p => p.dcbId)) + "'";
- var list_fhpgs = await db.Ado.SqlQueryAsync("select e.ProjectId as PrjId ,d.AssessmentNo,e.HouseAddress,d.countValue from InvestigateTable_Assessment d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select e.ProjectId as PrjId ,AssessmentNo, e.HouseAddress, d.countValue from NonInvestigateTable_Assessment d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ) ;");
- //补偿协议
- var list_bcxys = await db.Ado.SqlQueryAsync("select isnull(d.CollectDecisionNoHeadName,'')+isnull(d.No1,'')+'-'+isnull(d.No2,'')+(case when (d.No3 is null or d.No3 = '') then '' else ('-'+d.No3) end ) XyNo,d.SwitchProductionWay,e.HouseAddress,d.SummationShouldCompensateMoney,e.ProjectId as PrjId from ResidentialAgreement d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select isnull(d.CollectDecisionNoHeadName, '') + isnull(d.No2, '') + '-' + isnull(d.No3, '') XyNo , d.SwitchProductionWay, e.HouseAddress, d.SummationShouldCompensateMoney, e.ProjectId as PrjId from NonResidentialAgreement d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ); ");
-
- list_projects.ForEach(p =>
- {
- p.FhpgList = list_fhpgs.Where(a => a.PrjId == p.PrjId);
- p.BcxyList = list_bcxys.Where(a => a.PrjId == p.PrjId);
- });
- H5IndexModel h5IndexModel = new()
- {
- PrjList = list_projects,
- IdCard = cardno,
- UserName = username
- };
- return h5IndexModel;
-
+ return await GetInfoByCardNoAsync(cardno, username);
}
}
}
diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll
index 7dc845b..0926e77 100644
Binary files a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll differ
diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.pdb b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.pdb
index 5c9cad6..350098d 100644
Binary files a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.pdb and b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.pdb differ
diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/ref/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Debug/net5.0/ref/Ewide.NbzsZheliban.dll
index 927c885..8536fba 100644
Binary files a/Ewide.NbzsZheliban/bin/Debug/net5.0/ref/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/bin/Debug/net5.0/ref/Ewide.NbzsZheliban.dll differ
diff --git a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll
index 4cb6a2f..03c8973 100644
Binary files a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll differ
diff --git a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.pdb b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.pdb
index a53f820..f587c77 100644
Binary files a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.pdb and b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.pdb differ
diff --git a/Ewide.NbzsZheliban/bin/Release/net5.0/ref/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Release/net5.0/ref/Ewide.NbzsZheliban.dll
index 38791a1..d0442de 100644
Binary files a/Ewide.NbzsZheliban/bin/Release/net5.0/ref/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/bin/Release/net5.0/ref/Ewide.NbzsZheliban.dll differ
diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.CoreCompileInputs.cache b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.CoreCompileInputs.cache
index 55ce93d..572017e 100644
--- a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.CoreCompileInputs.cache
+++ b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-fbae486d0767770514b6ba877c8b825b66bbda21
+f1f4caefb72a8ff498e1136f2c067bdcb196bbb2
diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll
index 7dc845b..0926e77 100644
Binary files a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll differ
diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.pdb b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.pdb
index 5c9cad6..350098d 100644
Binary files a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.pdb and b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.pdb differ
diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/ref/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Debug/net5.0/ref/Ewide.NbzsZheliban.dll
index 927c885..8536fba 100644
Binary files a/Ewide.NbzsZheliban/obj/Debug/net5.0/ref/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/obj/Debug/net5.0/ref/Ewide.NbzsZheliban.dll differ
diff --git a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache
index 6c08fce..53a4b19 100644
Binary files a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache and b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache differ
diff --git a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.CoreCompileInputs.cache b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.CoreCompileInputs.cache
index ddddfeb..6fd5419 100644
--- a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.CoreCompileInputs.cache
+++ b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-e152e943102a596d81738a7c8388c9d1012f3a29
+bb995a3e2bd3f9318c4170de209b003704c71518
diff --git a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll
index 4cb6a2f..03c8973 100644
Binary files a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll differ
diff --git a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.pdb b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.pdb
index a53f820..f587c77 100644
Binary files a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.pdb and b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.pdb differ
diff --git a/Ewide.NbzsZheliban/obj/Release/net5.0/ref/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Release/net5.0/ref/Ewide.NbzsZheliban.dll
index 38791a1..d0442de 100644
Binary files a/Ewide.NbzsZheliban/obj/Release/net5.0/ref/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/obj/Release/net5.0/ref/Ewide.NbzsZheliban.dll differ