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/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 1297f85..99d9dfa 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 PoliciesRegulations PoliciesRegulationsLists { 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,18 @@ 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 + { + + public Guid ID { get; set; } + 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 38c9b8b..aa5333b 100644 --- a/Ewide.NbzsZheliban/Entity/SqlModelTpl.cs +++ b/Ewide.NbzsZheliban/Entity/SqlModelTpl.cs @@ -12,6 +12,8 @@ + + diff --git a/Ewide.NbzsZheliban/Entity/SqlModelTpl.tt b/Ewide.NbzsZheliban/Entity/SqlModelTpl.tt index b726008..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" }); + 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 bc25036..8487be5 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,86 @@ 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 => + var temp1 = db.Insertable(new zjzwfwTickets { - 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; + 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 { 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)); + }); + 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, + PoliciesRegulationsLists = new Entity.Extends.PoliciesRegulations { List = listPr, TotalCount = listPr.Count } + }; + 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 +169,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..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 5c9cad6..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 927c885..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 4cb6a2f..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 a53f820..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 38791a1..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 55ce93d..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 @@ -fbae486d0767770514b6ba877c8b825b66bbda21 +84fd37caa0c16ac3725555de4dc9cd62ba901214 diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll index 7dc845b..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 5c9cad6..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 927c885..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 6c08fce..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 ddddfeb..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 @@ -e152e943102a596d81738a7c8388c9d1012f3a29 +45a45ab57f43f74b631fd62aae6c40b3682e1ac4 diff --git a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll index 4cb6a2f..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 a53f820..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 38791a1..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 diff --git a/FrontCode2/sunshine_levy/index.html b/FrontCode2/sunshine_levy/index.html index 6321977..3054231 100644 --- a/FrontCode2/sunshine_levy/index.html +++ b/FrontCode2/sunshine_levy/index.html @@ -12,6 +12,48 @@
+ \ No newline at end of file diff --git a/FrontCode2/sunshine_levy/src/views/index.vue b/FrontCode2/sunshine_levy/src/views/index.vue index 0b5f981..761b8d5 100644 --- a/FrontCode2/sunshine_levy/src/views/index.vue +++ b/FrontCode2/sunshine_levy/src/views/index.vue @@ -7,28 +7,19 @@
- + 被征收人姓名： {{ data.userName }}
- + 身份证号码： {{ data.idCard }}
- +
- +
- + {{ item.name }}
- + {{ item.currentState }}
@@ -107,19 +89,18 @@ class="projectCenterImg" /> 征收决定号： - {{ + + {{ item.zsjdh - }} + }} +
- + 分户评估结果
-
+
评估报告编号： - - {{ assess.assessmentNo }} + {{ assess.assessmentNo }} +
+
+ 被征收房屋地址： + + {{ + assess.houseAddress + }}
-
- 被征收房屋地址： - {{ - assess.houseAddress - }} -
评估总金额： - ¥{{ assess.countValue }} + ¥{{ assess.countValue }}
- + 补偿协议
-
+
协议编号： {{ protocol.xyNo }}
- 被征收房屋地址： - {{ + 被征收房屋地址： + + {{ protocol.houseAddress - }} + }} +
补偿方式： - {{ + + {{ protocol.switchProductionWay - }} + }} +
合计补偿资金： - ¥{{ protocol.summationShouldCompensateMoney }} + ¥{{ protocol.summationShouldCompensateMoney }}
@@ -203,15 +172,15 @@
- +
征收政策
- 共{{ total }}条 + 共{{ data.policiesRegulationsLists.totalCount }}条