diff --git a/Ewide.NbzsZheliban/Entity/DataBase/zjzwfwTickets.cs b/Ewide.NbzsZheliban/Entity/DataBase/zjzwfwTickets.cs new file mode 100644 index 0000000..edecbe6 --- /dev/null +++ b/Ewide.NbzsZheliban/Entity/DataBase/zjzwfwTickets.cs @@ -0,0 +1,98 @@ + //----------zjzwfwTickets开始---------- + + 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 + { + /// + /// 数据表实体类：zjzwfwTickets + /// + [Table("zjzwfwTickets")] + public partial class zjzwfwTickets: BaseEntity { + /// + /// 无描述 + /// + + [Display(Name="无描述")] + [Column("ID")] + [DataMember] + public string ID {get;set;} + /// + /// 无描述 + /// + + [Display(Name="无描述")] + [Column("Ticket")] + [DataMember] + public string Ticket {get;set;} + /// + /// 姓名 + /// + + [Display(Name="姓名")] + [Column("UserName")] + [DataMember] + public string UserName {get;set;} + /// + /// 身份证号码 + /// + + [Display(Name="身份证号码")] + [Column("IdCardNo")] + [DataMember] + public string IdCardNo {get;set;} + /// + /// 创建时间 + /// + + [Display(Name="创建时间")] + [Column("CreateTime")] + [DataMember] + public DateTime? CreateTime {get;set;} + /// + /// 到期时间 默认1小时到期 + /// + + [Display(Name="到期时间 默认1小时到期")] + [Column("ExpireTime")] + [DataMember] + public DateTime? ExpireTime {get;set;} + /// + /// 原始文本 + /// + + [Display(Name="原始文本")] + [Column("OriginalResponse")] + [DataMember] + public string OriginalResponse {get;set;} + + } + + /** + /// + /// 数据表实体类Map：zjzwfwTickets + /// + public class zjzwfwTicketsMap : EntityTypeConfiguration + { + public zjzwfwTicketsMap() + { + this.ToTable("zjzwfwTickets"); + this.Property(t => t.ID).HasColumnName("ID").IsRequired(); + this.Property(t => t.Ticket).HasColumnName("Ticket"); + this.Property(t => t.UserName).HasColumnName("UserName"); + this.Property(t => t.IdCardNo).HasColumnName("IdCardNo"); + this.Property(t => t.CreateTime).HasColumnName("CreateTime"); + this.Property(t => t.ExpireTime).HasColumnName("ExpireTime"); + this.Property(t => t.OriginalResponse).HasColumnName("OriginalResponse"); + } + }**/ + + } + + //----------zjzwfwTickets结束---------- + + \ No newline at end of file diff --git a/Ewide.NbzsZheliban/Entity/Extends/H5IndexPrjModel.cs b/Ewide.NbzsZheliban/Entity/Extends/H5IndexPrjModel.cs index 6d7d891..99d9dfa 100644 --- a/Ewide.NbzsZheliban/Entity/Extends/H5IndexPrjModel.cs +++ b/Ewide.NbzsZheliban/Entity/Extends/H5IndexPrjModel.cs @@ -34,7 +34,7 @@ namespace Ewide.NbzsZheliban.Entity.Extends /// 项目信息 /// public List PrjList { get; set; } - public List PoliciesRegulationsList { get; set; } + public PoliciesRegulations PoliciesRegulationsLists { get; set; } } public class H5IndexPrjModel { @@ -70,6 +70,11 @@ namespace Ewide.NbzsZheliban.Entity.Extends /// public object BcxyList { get; set; } } + public class PoliciesRegulations + { + public int TotalCount { get; set; } + public List List { get; set; } + } public class PoliciesRegulation { @@ -77,5 +82,6 @@ namespace Ewide.NbzsZheliban.Entity.Extends public string Title { get; set; } public string Contents { get; set; } public DateTime? PublicTime { get; set; } + public string Area { get; set; } } } diff --git a/Ewide.NbzsZheliban/Entity/SqlModelTpl.cs b/Ewide.NbzsZheliban/Entity/SqlModelTpl.cs index d1fb2a2..aa5333b 100644 --- a/Ewide.NbzsZheliban/Entity/SqlModelTpl.cs +++ b/Ewide.NbzsZheliban/Entity/SqlModelTpl.cs @@ -13,6 +13,7 @@ + diff --git a/Ewide.NbzsZheliban/Entity/SqlModelTpl.tt b/Ewide.NbzsZheliban/Entity/SqlModelTpl.tt index 05d73a4..8c64ca1 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","PoliciesRegulations" }); + DataTable dt = GetDataTable(new List { "Projects","InvestigateTable","NonResidentialInvestigateTable","InvestigateTable_Assessment","NonInvestigateTable_Assessment","NonResidentialAgreement","ResidentialAgreement","PoliciesRegulations","zjzwfwTickets" }); //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')"; @@ -52,7 +52,8 @@ using System.Runtime.Serialization; public partial class <#= tableClass #><# if(objType=="U"){#>: BaseEntity<#}else{#>: BaseEntity<#}#> { <# - List listBaseColumn = new List{"Id","UNID","CreateTime","CreateUserId","LastUpdateTime","IsDeleted","Sort"}; + //List listBaseColumn = new List{"Id","UNID","CreateTime","CreateUserId","LastUpdateTime","IsDeleted","Sort"}; + List listBaseColumn = new List{}; foreach (DataRow dr in datacloumn.Rows) { string columnName=GetFormColumnName(dr["columnname"].ToString(),tableClass); diff --git a/Ewide.NbzsZheliban/Service/DataService.cs b/Ewide.NbzsZheliban/Service/DataService.cs index 7921da5..8487be5 100644 --- a/Ewide.NbzsZheliban/Service/DataService.cs +++ b/Ewide.NbzsZheliban/Service/DataService.cs @@ -78,6 +78,18 @@ namespace Ewide.NbzsZheliban.Service } if (userinfoObj["result"].Value() != 0) throw Oops.Oh($"ticket接口返回值有误,[{tickerRsltStr}]"); + var temp1 = db.Insertable(new zjzwfwTickets + { + ID = Guid.NewGuid().ToString(), + Ticket = ticket, + IdCardNo = userinfoObj["idnum"].ToString(), + UserName = userinfoObj["username"].ToString(), + ExpireTime = DateTime.Now.AddHours(1), + CreateTime = DateTime.Now, + OriginalResponse = userinfoRsltStr + }).ExecuteCommand(); + if (temp1 <= 0) + throw Oops.Oh("出现异常,请联系管理员"); return userinfoObj; } else @@ -102,7 +114,7 @@ namespace Ewide.NbzsZheliban.Service //补偿协议 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 list_PoliciesRegulations = await db.Queryable().ToListAsync(); var listAreas = new List { Guid.Parse("B2A0291C-84C7-4D86-A6D5-CB9FCCF4A2D8") @@ -113,18 +125,20 @@ namespace Ewide.NbzsZheliban.Service p.BcxyList = list_bcxys.Where(a => a.PrjId == p.PrjId); listAreas.Add(Guid.Parse(p.AreaID)); }); + var listPr = list_PoliciesRegulations.Where(a => listAreas.Contains(a.AreaID)).Select(b => new PoliciesRegulation + { + ID = b.ID, + Contents = b.Contents, + PublicTime = b.PublicTime, + Title = b.Title, + Area = b.Area + }).ToList(); 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() + PoliciesRegulationsLists = new Entity.Extends.PoliciesRegulations { List = listPr, TotalCount = listPr.Count } }; return h5IndexModel; } diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll index 0926e77..d8b41d2 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 350098d..c340f48 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 8536fba..167af8a 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 03c8973..0a4cf21 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 f587c77..3eaa9eb 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 d0442de..d97df49 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.AssemblyReference.cache b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache index f5e894a..5ee2ff5 100644 Binary files a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache and b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache 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 572017e..5666873 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 @@ -f1f4caefb72a8ff498e1136f2c067bdcb196bbb2 +84fd37caa0c16ac3725555de4dc9cd62ba901214 diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll index 0926e77..d8b41d2 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 350098d..c340f48 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 8536fba..167af8a 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 53a4b19..22ee909 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 6fd5419..0cfd1aa 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 @@ -bb995a3e2bd3f9318c4170de209b003704c71518 +45a45ab57f43f74b631fd62aae6c40b3682e1ac4 diff --git a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll index 03c8973..0a4cf21 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 f587c77..3eaa9eb 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 d0442de..d97df49 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