diff --git a/Ewide.NbzsZheliban/Entity/DataBase/InvestigateTable_Assessment.cs b/Ewide.NbzsZheliban/Entity/DataBase/InvestigateTable_Assessment.cs index a96b31a..bc36562 100644 --- a/Ewide.NbzsZheliban/Entity/DataBase/InvestigateTable_Assessment.cs +++ b/Ewide.NbzsZheliban/Entity/DataBase/InvestigateTable_Assessment.cs @@ -175,6 +175,22 @@ using System.Runtime.Serialization; [DataMember] public string PublicUserName {get;set;} /// + /// 创建时间 + /// + + [Display(Name="创建时间")] + [Column("CreateTime")] + [DataMember] + public DateTime? CreateTime {get;set;} + /// + /// 创建人ID + /// + + [Display(Name="创建人ID")] + [Column("CreateUserId")] + [DataMember] + public Guid? CreateUserId {get;set;} + /// /// 创建人姓名 /// @@ -734,6 +750,14 @@ using System.Runtime.Serialization; [Column("Carrymode")] [DataMember] public string Carrymode {get;set;} + /// + /// 分户评估附件 + /// + + [Display(Name="分户评估附件")] + [Column("File")] + [DataMember] + public string File {get;set;} } @@ -838,6 +862,7 @@ using System.Runtime.Serialization; this.Property(t => t.IsLDF).HasColumnName("IsLDF"); this.Property(t => t.LandTransferMoneyFormula).HasColumnName("LandTransferMoneyFormula"); this.Property(t => t.Carrymode).HasColumnName("Carrymode"); + this.Property(t => t.File).HasColumnName("File"); } }**/ diff --git a/Ewide.NbzsZheliban/Entity/DataBase/NonInvestigateTable_Assessment.cs b/Ewide.NbzsZheliban/Entity/DataBase/NonInvestigateTable_Assessment.cs index c32cac0..d371f74 100644 --- a/Ewide.NbzsZheliban/Entity/DataBase/NonInvestigateTable_Assessment.cs +++ b/Ewide.NbzsZheliban/Entity/DataBase/NonInvestigateTable_Assessment.cs @@ -176,6 +176,22 @@ using System.Runtime.Serialization; public string PublicUserName {get;set;} /// /// 无描述 + /// + + [Display(Name="无描述")] + [Column("CreateTime")] + [DataMember] + public DateTime? CreateTime {get;set;} + /// + /// 无描述 + /// + + [Display(Name="无描述")] + [Column("CreateUserId")] + [DataMember] + public Guid? CreateUserId {get;set;} + /// + /// 无描述 /// [Display(Name="无描述")] @@ -270,6 +286,22 @@ using System.Runtime.Serialization; [Column("ValuationStatus")] [DataMember] public int ValuationStatus {get;set;} + /// + /// 无描述 + /// + + [Display(Name="无描述")] + [Column("PgPrice")] + [DataMember] + public decimal? PgPrice {get;set;} + /// + /// 分户评估附件 + /// + + [Display(Name="分户评估附件")] + [Column("File")] + [DataMember] + public string File {get;set;} } @@ -316,6 +348,8 @@ using System.Runtime.Serialization; this.Property(t => t.ExceedLand).HasColumnName("ExceedLand"); this.Property(t => t.ValuationMethod).HasColumnName("ValuationMethod").IsRequired(); this.Property(t => t.ValuationStatus).HasColumnName("ValuationStatus").IsRequired(); + this.Property(t => t.PgPrice).HasColumnName("PgPrice"); + this.Property(t => t.File).HasColumnName("File"); } }**/ diff --git a/Ewide.NbzsZheliban/Entity/DataBase/NonResidentialAgreement.cs b/Ewide.NbzsZheliban/Entity/DataBase/NonResidentialAgreement.cs index 8770367..4bfd15d 100644 --- a/Ewide.NbzsZheliban/Entity/DataBase/NonResidentialAgreement.cs +++ b/Ewide.NbzsZheliban/Entity/DataBase/NonResidentialAgreement.cs @@ -1048,6 +1048,22 @@ using System.Runtime.Serialization; public string TaxPersonRemark {get;set;} /// /// 无描述 + /// + + [Display(Name="无描述")] + [Column("CreateTime")] + [DataMember] + public DateTime? CreateTime {get;set;} + /// + /// 无描述 + /// + + [Display(Name="无描述")] + [Column("CreateUserId")] + [DataMember] + public Guid? CreateUserId {get;set;} + /// + /// 无描述 /// [Display(Name="无描述")] @@ -1782,6 +1798,22 @@ using System.Runtime.Serialization; [Column("IsCancelRecord")] [DataMember] public bool IsCancelRecord {get;set;} + /// + /// 无描述 + /// + + [Display(Name="无描述")] + [Column("XyFile")] + [DataMember] + public string XyFile {get;set;} + /// + /// 无描述 + /// + + [Display(Name="无描述")] + [Column("IsxyFile")] + [DataMember] + public int? IsxyFile {get;set;} } @@ -2017,6 +2049,8 @@ using System.Runtime.Serialization; this.Property(t => t.IfCQDH).HasColumnName("IfCQDH"); this.Property(t => t.Deductible).HasColumnName("Deductible").IsRequired(); this.Property(t => t.IsCancelRecord).HasColumnName("IsCancelRecord").IsRequired(); + this.Property(t => t.XyFile).HasColumnName("XyFile"); + this.Property(t => t.IsxyFile).HasColumnName("IsxyFile"); } }**/ diff --git a/Ewide.NbzsZheliban/Entity/DataBase/ResidentialAgreement.cs b/Ewide.NbzsZheliban/Entity/DataBase/ResidentialAgreement.cs index e0e71fd..04cb843 100644 --- a/Ewide.NbzsZheliban/Entity/DataBase/ResidentialAgreement.cs +++ b/Ewide.NbzsZheliban/Entity/DataBase/ResidentialAgreement.cs @@ -968,6 +968,22 @@ using System.Runtime.Serialization; public string TaxPersonRemark {get;set;} /// /// 无描述 + /// + + [Display(Name="无描述")] + [Column("CreateTime")] + [DataMember] + public DateTime? CreateTime {get;set;} + /// + /// 无描述 + /// + + [Display(Name="无描述")] + [Column("CreateUserId")] + [DataMember] + public Guid? CreateUserId {get;set;} + /// + /// 无描述 /// [Display(Name="无描述")] @@ -1774,6 +1790,22 @@ using System.Runtime.Serialization; [Column("CurrSubsidy")] [DataMember] public decimal? CurrSubsidy {get;set;} + /// + /// 协议打印文件 + /// + + [Display(Name="协议打印文件")] + [Column("XyFile")] + [DataMember] + public string XyFile {get;set;} + /// + /// 是否存在协议打印文件 + /// + + [Display(Name="是否存在协议打印文件")] + [Column("IsxyFile")] + [DataMember] + public int? IsxyFile {get;set;} } @@ -2008,6 +2040,8 @@ using System.Runtime.Serialization; this.Property(t => t.ActualPorpSwapSectionArea).HasColumnName("ActualPorpSwapSectionArea"); this.Property(t => t.ActualCurrSectionEval).HasColumnName("ActualCurrSectionEval"); this.Property(t => t.CurrSubsidy).HasColumnName("CurrSubsidy"); + this.Property(t => t.XyFile).HasColumnName("XyFile"); + this.Property(t => t.IsxyFile).HasColumnName("IsxyFile"); } }**/ diff --git a/Ewide.NbzsZheliban/Entity/Extends/H5IndexPrjModel.cs b/Ewide.NbzsZheliban/Entity/Extends/H5IndexPrjModel.cs index 830762f..8fa420e 100644 --- a/Ewide.NbzsZheliban/Entity/Extends/H5IndexPrjModel.cs +++ b/Ewide.NbzsZheliban/Entity/Extends/H5IndexPrjModel.cs @@ -14,19 +14,31 @@ namespace Ewide.NbzsZheliban.Entity.Extends } public class Fhpgs { + public string Id { get; set; } + [Newtonsoft.Json.JsonIgnore] + public string dcbId { get; set; } public string PrjId { get; set; } public string AssessmentNo { get; set; } public string HouseAddress { get; set; } public string countValue { get; set; } + public string CreateTime { get; set; } + public string CreateUserName { get; set; } + } public class Bcxy { + public string Id { get; set; } + [Newtonsoft.Json.JsonIgnore] + public string dcbId { get; set; } public string PrjId { get; set; } public string XyNo { get; set; } public string HouseAddress { get; set; } public string SummationShouldCompensateMoney { get; set; } public string SwitchProductionWay { get; set; } + public string countValue { get; set; } + public string SignTime { get; set; } + } public class H5IndexModel { @@ -66,11 +78,11 @@ namespace Ewide.NbzsZheliban.Entity.Extends /// /// 分户评估集合 /// - public object FhpgList { get; set; } + public List FhpgList { get; set; } /// /// 补偿协议集合 /// - public object BcxyList { get; set; } + public List BcxyList { get; set; } } public class PoliciesRegulations { diff --git a/Ewide.NbzsZheliban/Service/DataService.cs b/Ewide.NbzsZheliban/Service/DataService.cs index 5186d82..4eae559 100644 --- a/Ewide.NbzsZheliban/Service/DataService.cs +++ b/Ewide.NbzsZheliban/Service/DataService.cs @@ -6,11 +6,14 @@ using Furion; using Furion.DataEncryption; using Furion.FriendlyException; using Furion.JsonSerialization; +using Furion.UnifyResult; using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.StaticFiles; using Newtonsoft.Json.Linq; using SqlSugar; using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -113,35 +116,34 @@ namespace Ewide.NbzsZheliban.Service 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_fhpgs = await db.Ado.SqlQueryAsync("select d.id,e.ProjectId as PrjId ,d.AssessmentNo,e.HouseAddress,d.countValue,e.id dcbId,d.CreateTime,d.CreateUserName from InvestigateTable_Assessment d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select d.id,e.ProjectId as PrjId ,AssessmentNo, e.HouseAddress, d.countValue,e.id dcbId,d.CreateTime,d.CreateUserName 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") - }; + var list_bcxys = await db.Ado.SqlQueryAsync("select d.id,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,e.id dcbId,d.SignTime from ResidentialAgreement d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select d.id,isnull(d.CollectDecisionNoHeadName, '') + isnull(d.No2, '') + '-' + isnull(d.No3, '') XyNo , d.SwitchProductionWay, e.HouseAddress, d.SummationShouldCompensateMoney, e.ProjectId as PrjId,e.id dcbId,d.SignTime from NonResidentialAgreement d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ); "); + 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); + p.FhpgList = list_fhpgs.Where(a => a.PrjId == p.PrjId).ToList(); + var bcxy = list_bcxys.Where(a => a.PrjId == p.PrjId).ToList(); + bcxy.ForEach(a => a.countValue = list_fhpgs.Where(b => b.dcbId == a.dcbId).First().countValue); + p.BcxyList = bcxy; listAreas.Add(Guid.Parse(p.AreaID)); }); - var listPr = list_PoliciesRegulations.Where(a => listAreas.Contains(a.AreaID)).Select(b => new PoliciesRegulation + //政策 + var list_PoliciesRegulations = await db.Queryable().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(); + }).ToListAsync(); + H5IndexModel h5IndexModel = new() { PrjList = list_projects, IdCard = cardno, UserName = username, - PoliciesRegulationsLists = new Entity.Extends.PoliciesRegulations { List = listPr, TotalCount = listPr.Count } + PoliciesRegulationsLists = new Entity.Extends.PoliciesRegulations { List = list_PoliciesRegulations, TotalCount = list_PoliciesRegulations.Count } }; return h5IndexModel; } @@ -196,5 +198,138 @@ namespace Ewide.NbzsZheliban.Service }).FirstAsync(); return entity; } + + /// + /// 协议详细 + /// + /// + /// + [HttpPost("/agreement/info")] + [Microsoft.AspNetCore.Authorization.AllowAnonymous] + public IActionResult AgreementInfo([FromBody] JObject args) + { + var ticket = args.GetJsonValue("ticket", isThrowExp: true); + var id = args.GetJsonGuidValue("id", isThrowExp: true); + JObject userInfoObj = GetInfoByTicket(ticket); + var XyFile = ""; + //住宅 + var entity_zz = db.Queryable().Where(p => p.ID == id).Select(p => new { p.ID, p.XyFile }).First(); + if (entity_zz != null) + { + XyFile = entity_zz.XyFile; + } + //非住宅 + else + { + var entity_fzz = db.Queryable().Where(p => p.ID == id).Select(p => new { p.ID, p.XyFile }).First(); + if (entity_fzz != null) + { + XyFile = entity_fzz.XyFile; + } + else + throw Oops.Oh("ID错误"); + } + if (string.IsNullOrEmpty(XyFile)) + throw Oops.Oh("未上传附件"); + var filePath = App.Configuration["nbzs_file_path"] + XyFile; + return new FileStreamResult(new FileStream(filePath, FileMode.Open), "application/octet-stream") { FileDownloadName = new FileInfo(filePath).Name }; + } + /// + /// 分布评估详细 + /// + /// + /// + [HttpPost("/house_estimate/info")] + [Microsoft.AspNetCore.Authorization.AllowAnonymous] + public async Task HouseEstimateInfo([FromBody] JObject args) + { + var ticket = args.GetJsonValue("ticket", isThrowExp: true); + var id = args.GetJsonGuidValue("id", isThrowExp: true); + JObject userInfoObj = GetInfoByTicket(ticket); + var entity_zz = db.Queryable().Where(p => p.ID == id).First(); + if (entity_zz != null) + { + if (entity_zz.ValuationMethod == 0) + { + return null; + } + else + throw Oops.Oh(199, "请使用文件接口"); + } + else + { + var entity_fzz = db.Queryable().Where(p => p.ID == id).First(); + if (entity_fzz != null) + { + if (entity_fzz.ValuationMethod == 0) + { + return null; + } + else + throw Oops.Oh(199, "请使用文件接口"); + } + else + throw Oops.Oh("ID错误"); + + } + } + /// + /// 分布评估详细 + /// + /// + /// + [HttpPost("/house_estimate/file")] + [Microsoft.AspNetCore.Authorization.AllowAnonymous] + public IActionResult HouseEstimateInfoFile([FromBody] JObject args) + { + var ticket = args.GetJsonValue("ticket", isThrowExp: true); + var id = args.GetJsonGuidValue("id", isThrowExp: true); + JObject userInfoObj = GetInfoByTicket(ticket); + var entity_zz = db.Queryable().Where(p => p.ID == id).First(); + if (entity_zz != null) + { + switch (entity_zz.ValuationMethod) + { + //pdf上传 + case 1: + case 2: + if (!string.IsNullOrEmpty(entity_zz.File)) + { + var filePath = App.Configuration["nbzs_file_path"] + entity_zz.File; + return new FileStreamResult(new FileStream(filePath, FileMode.Open), "application/octet-stream") { FileDownloadName = new FileInfo(filePath).Name }; + } + else + throw Oops.Oh("未上传文件"); + //金额录入 + default: + throw Oops.Oh("无文件"); + } + } + else + { + var entity_fzz = db.Queryable().Where(p => p.ID == id).First(); + if (entity_fzz != null) + { + switch (entity_fzz.ValuationMethod) + { + //pdf上传 + case 1: + if (!string.IsNullOrEmpty(entity_fzz.File)) + { + var filePath = App.Configuration["nbzs_file_path"] + entity_fzz.File; + return new FileStreamResult(new FileStream(filePath, FileMode.Open), "application/octet-stream") { FileDownloadName = new FileInfo(filePath).Name }; + } + else + throw Oops.Oh("未上传文件"); + //金额录入 + default: + throw Oops.Oh("无文件"); + } + } + else + throw Oops.Oh("ID错误"); + } + throw Oops.Oh("出错了"); + } } } diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.Core.dll b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.Core.dll index f38d739..26e398e 100644 Binary files a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.Core.dll and b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.Core.dll differ diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.Core.pdb b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.Core.pdb index d02cbf6..adb3134 100644 Binary files a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.Core.pdb and b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.Core.pdb differ diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.Core.xml b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.Core.xml index 2ea8b12..7d7358c 100644 --- a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.Core.xml +++ b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.Core.xml @@ -2750,14 +2750,15 @@ 规范化RESTful风格返回值 - + 异常返回值 + - + 处理输出状态码 @@ -2766,14 +2767,14 @@ - + 成功返回值 - + 验证失败返回值 diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll index 5b0753e..a153e27 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 851e40c..f30c14e 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/Furion.Extras.DatabaseAccessor.Dapper.dll b/Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.Extras.DatabaseAccessor.Dapper.dll index 90d8f14..f601154 100644 Binary files a/Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.Extras.DatabaseAccessor.Dapper.dll and b/Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.Extras.DatabaseAccessor.Dapper.dll differ diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.Extras.DatabaseAccessor.Dapper.pdb b/Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.Extras.DatabaseAccessor.Dapper.pdb index 8cb960f..6ab824d 100644 Binary files a/Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.Extras.DatabaseAccessor.Dapper.pdb and b/Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.Extras.DatabaseAccessor.Dapper.pdb differ diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.Extras.DatabaseAccessor.Dapper.xml b/Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.Extras.DatabaseAccessor.Dapper.xml index 1b896ef..f5ce73b 100644 --- a/Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.Extras.DatabaseAccessor.Dapper.xml +++ b/Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.Extras.DatabaseAccessor.Dapper.xml @@ -72,7 +72,7 @@ - 非泛型 SqlSugar 仓储 + 非泛型 Dapper 仓储 @@ -181,7 +181,7 @@ - SqlSugar 仓储实现类 + Dapper 仓储实现类 @@ -338,7 +338,7 @@ - 非泛型 SqlSugar 仓储 + 非泛型 Dapper 仓储 @@ -430,7 +430,7 @@ - SqlSugar 仓储接口定义 + Dapper 仓储接口定义 diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.dll b/Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.dll index 0fbc9b8..204f31f 100644 Binary files a/Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.dll and b/Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.dll differ diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.pdb b/Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.pdb index 7421e3f..dc5f595 100644 Binary files a/Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.pdb and b/Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.pdb differ diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.xml b/Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.xml index 64ed089..894b439 100644 --- a/Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.xml +++ b/Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.xml @@ -1230,12 +1230,12 @@ 是否打印数据库连接信息 - + 线程安全的数据库上下文集合 - + 登记错误的数据库上下文 @@ -21046,6 +21046,15 @@ String.Format 参数 异常实例 + + + 抛出字符串异常 + + + 异常消息 + String.Format 参数 + 异常实例 + 抛出字符串异常 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 0363373..0ca52f1 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.Core.dll b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.Core.dll index 7a1899c..7a9b9c1 100644 Binary files a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.Core.dll and b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.Core.dll differ diff --git a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.Core.pdb b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.Core.pdb index a98aab5..dd12aef 100644 Binary files a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.Core.pdb and b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.Core.pdb differ diff --git a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.Core.xml b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.Core.xml index 2ea8b12..7d7358c 100644 --- a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.Core.xml +++ b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.Core.xml @@ -2750,14 +2750,15 @@ 规范化RESTful风格返回值 - + 异常返回值 + - + 处理输出状态码 @@ -2766,14 +2767,14 @@ - + 成功返回值 - + 验证失败返回值 diff --git a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll index af9c49b..f4a9c5f 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 da340f9..edd1542 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/Furion.Extras.DatabaseAccessor.Dapper.dll b/Ewide.NbzsZheliban/bin/Release/net5.0/Furion.Extras.DatabaseAccessor.Dapper.dll index 49ea37f..af2844f 100644 Binary files a/Ewide.NbzsZheliban/bin/Release/net5.0/Furion.Extras.DatabaseAccessor.Dapper.dll and b/Ewide.NbzsZheliban/bin/Release/net5.0/Furion.Extras.DatabaseAccessor.Dapper.dll differ diff --git a/Ewide.NbzsZheliban/bin/Release/net5.0/Furion.Extras.DatabaseAccessor.Dapper.pdb b/Ewide.NbzsZheliban/bin/Release/net5.0/Furion.Extras.DatabaseAccessor.Dapper.pdb index 5c31d8b..9c03f83 100644 Binary files a/Ewide.NbzsZheliban/bin/Release/net5.0/Furion.Extras.DatabaseAccessor.Dapper.pdb and b/Ewide.NbzsZheliban/bin/Release/net5.0/Furion.Extras.DatabaseAccessor.Dapper.pdb differ diff --git a/Ewide.NbzsZheliban/bin/Release/net5.0/Furion.Extras.DatabaseAccessor.Dapper.xml b/Ewide.NbzsZheliban/bin/Release/net5.0/Furion.Extras.DatabaseAccessor.Dapper.xml index 1b896ef..f5ce73b 100644 --- a/Ewide.NbzsZheliban/bin/Release/net5.0/Furion.Extras.DatabaseAccessor.Dapper.xml +++ b/Ewide.NbzsZheliban/bin/Release/net5.0/Furion.Extras.DatabaseAccessor.Dapper.xml @@ -72,7 +72,7 @@ - 非泛型 SqlSugar 仓储 + 非泛型 Dapper 仓储 @@ -181,7 +181,7 @@ - SqlSugar 仓储实现类 + Dapper 仓储实现类 @@ -338,7 +338,7 @@ - 非泛型 SqlSugar 仓储 + 非泛型 Dapper 仓储 @@ -430,7 +430,7 @@ - SqlSugar 仓储接口定义 + Dapper 仓储接口定义 diff --git a/Ewide.NbzsZheliban/bin/Release/net5.0/Furion.dll b/Ewide.NbzsZheliban/bin/Release/net5.0/Furion.dll index 50e6d0e..e7d8852 100644 Binary files a/Ewide.NbzsZheliban/bin/Release/net5.0/Furion.dll and b/Ewide.NbzsZheliban/bin/Release/net5.0/Furion.dll differ diff --git a/Ewide.NbzsZheliban/bin/Release/net5.0/Furion.pdb b/Ewide.NbzsZheliban/bin/Release/net5.0/Furion.pdb index f00f008..613034c 100644 Binary files a/Ewide.NbzsZheliban/bin/Release/net5.0/Furion.pdb and b/Ewide.NbzsZheliban/bin/Release/net5.0/Furion.pdb differ diff --git a/Ewide.NbzsZheliban/bin/Release/net5.0/Furion.xml b/Ewide.NbzsZheliban/bin/Release/net5.0/Furion.xml index 64ed089..894b439 100644 --- a/Ewide.NbzsZheliban/bin/Release/net5.0/Furion.xml +++ b/Ewide.NbzsZheliban/bin/Release/net5.0/Furion.xml @@ -1230,12 +1230,12 @@ 是否打印数据库连接信息 - + 线程安全的数据库上下文集合 - + 登记错误的数据库上下文 @@ -21046,6 +21046,15 @@ String.Format 参数 异常实例 + + + 抛出字符串异常 + + + 异常消息 + String.Format 参数 + 异常实例 + 抛出字符串异常 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 11f3829..67c5fb7 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 d2fe1b4..f5e894a 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.dll b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll index 5b0753e..a153e27 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 851e40c..f30c14e 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 0363373..0ca52f1 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 2259fc7..39420ca 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.dll b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll index af9c49b..f4a9c5f 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 da340f9..edd1542 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 11f3829..67c5fb7 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/README.md b/README.md index 4cb6415..229b0aa 100644 --- a/README.md +++ b/README.md @@ -27,9 +27,9 @@ git clone --recursive http://118.178.224.202:3000/ewide/zsxt_nbzs_h5.git 回调: app: -[https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=fwzs] +https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=fwzs PC: -[https://puser.zjzwfw.gov.cn/sso/newusp.do?action=ssoLogin&servicecode=fwzs] +https://puser.zjzwfw.gov.cn/sso/newusp.do?action=ssoLogin&servicecode=fwzs https://puser.zjzwfw.gov.cn/sso/newusp.do?action=ssoLogin&servicecode=fwzs&goto=http://183.136.157.9:7099/#/index diff --git a/framework b/framework index 33e731e..f2f0a02 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 33e731e6a86e48ae501fcb576eec7994b93622b4 +Subproject commit f2f0a02ee995acb5b6b62cc2a94245827b0cee89