add 协议明细接口

Ewide.NbzsZheliban/Entity/DataBase/InvestigateTable_Assessment.cs

@@ -175,6 +175,22 @@ using System.Runtime.Serialization;
 				[DataMember]  
 			    public string PublicUserName  {get;set;}   
                                 /// <summary>
+                /// 创建时间
+                /// </summary>    
+				
+				[Display(Name="创建时间")]   
+								[Column("CreateTime")]   
+				[DataMember]  
+			    public DateTime? CreateTime  {get;set;}   
+                                /// <summary>
+                /// 创建人ID
+                /// </summary>    
+				
+				[Display(Name="创建人ID")]   
+								[Column("CreateUserId")]   
+				[DataMember]  
+			    public Guid? CreateUserId  {get;set;}   
+                                /// <summary>
                 /// 创建人姓名
                 /// </summary>    
 				
@@ -734,6 +750,14 @@ using System.Runtime.Serialization;
 								[Column("Carrymode")]   
 				[DataMember]  
 			    public string Carrymode  {get;set;}   
+                                /// <summary>
+                /// 分户评估附件
+                /// </summary>    
+				
+				[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");
 										}
 			}**/
 

Ewide.NbzsZheliban/Entity/DataBase/NonInvestigateTable_Assessment.cs

@@ -176,6 +176,22 @@ using System.Runtime.Serialization;
 			    public string PublicUserName  {get;set;}   
                                 /// <summary>
                 /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("CreateTime")]   
+				[DataMember]  
+			    public DateTime? CreateTime  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("CreateUserId")]   
+				[DataMember]  
+			    public Guid? CreateUserId  {get;set;}   
+                                /// <summary>
+                /// 无描述
                 /// </summary>    
 				
 				[Display(Name="无描述")]   
@@ -270,6 +286,22 @@ using System.Runtime.Serialization;
 								[Column("ValuationStatus")]   
 				[DataMember]  
 			    public int ValuationStatus  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("PgPrice")]   
+				[DataMember]  
+			    public decimal? PgPrice  {get;set;}   
+                                /// <summary>
+                /// 分户评估附件
+                /// </summary>    
+				
+				[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");
 										}
 			}**/
 

Ewide.NbzsZheliban/Entity/DataBase/NonResidentialAgreement.cs

@@ -1048,6 +1048,22 @@ using System.Runtime.Serialization;
 			    public string TaxPersonRemark  {get;set;}   
                                 /// <summary>
                 /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("CreateTime")]   
+				[DataMember]  
+			    public DateTime? CreateTime  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("CreateUserId")]   
+				[DataMember]  
+			    public Guid? CreateUserId  {get;set;}   
+                                /// <summary>
+                /// 无描述
                 /// </summary>    
 				
 				[Display(Name="无描述")]   
@@ -1782,6 +1798,22 @@ using System.Runtime.Serialization;
 								[Column("IsCancelRecord")]   
 				[DataMember]  
 			    public bool IsCancelRecord  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("XyFile")]   
+				[DataMember]  
+			    public string XyFile  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[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");
 										}
 			}**/
 

Ewide.NbzsZheliban/Entity/DataBase/ResidentialAgreement.cs

@@ -968,6 +968,22 @@ using System.Runtime.Serialization;
 			    public string TaxPersonRemark  {get;set;}   
                                 /// <summary>
                 /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("CreateTime")]   
+				[DataMember]  
+			    public DateTime? CreateTime  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("CreateUserId")]   
+				[DataMember]  
+			    public Guid? CreateUserId  {get;set;}   
+                                /// <summary>
+                /// 无描述
                 /// </summary>    
 				
 				[Display(Name="无描述")]   
@@ -1774,6 +1790,22 @@ using System.Runtime.Serialization;
 								[Column("CurrSubsidy")]   
 				[DataMember]  
 			    public decimal? CurrSubsidy  {get;set;}   
+                                /// <summary>
+                /// 协议打印文件
+                /// </summary>    
+				
+				[Display(Name="协议打印文件")]   
+								[Column("XyFile")]   
+				[DataMember]  
+			    public string XyFile  {get;set;}   
+                                /// <summary>
+                /// 是否存在协议打印文件
+                /// </summary>    
+				
+				[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");
 										}
 			}**/
 

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
         /// <summary>
         /// 分户评估集合
         /// </summary>
-        public object FhpgList { get; set; }
+        public List<Fhpgs> FhpgList { get; set; }
         /// <summary>
         /// 补偿协议集合
         /// </summary>
-        public object BcxyList { get; set; }
+        public List<Bcxy> BcxyList { get; set; }
     }
     public class PoliciesRegulations
     {

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<H5IndexPrjModel>("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<Fhpgs>("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<Fhpgs>("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<Bcxy>("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_bcxys = await db.Ado.SqlQueryAsync<Bcxy>("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?> { Guid.Parse("B2A0291C-84C7-4D86-A6D5-CB9FCCF4A2D8") };
-            var list_PoliciesRegulations = await db.Queryable<Entity.PoliciesRegulations>().ToListAsync();
-            var listAreas = new List<Guid?>
-                {
-                    Guid.Parse("B2A0291C-84C7-4D86-A6D5-CB9FCCF4A2D8")
-                };
             list_projects.ForEach(p =>
             {
-                p.FhpgList = list_fhpgs.Where(a => a.PrjId == p.PrjId);
+                p.FhpgList = list_fhpgs.Where(a => a.PrjId == p.PrjId).ToList();
-                p.BcxyList = list_bcxys.Where(a => a.PrjId == p.PrjId);
+                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<Entity.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();
+            }).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;
         }
+
+        /// <summary>
+        /// 协议详细
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        [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<Entity.ResidentialAgreement>().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<Entity.NonResidentialAgreement>().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 };
+        }
+        /// <summary>
+        /// 分布评估详细
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        [HttpPost("/house_estimate/info")]
+        [Microsoft.AspNetCore.Authorization.AllowAnonymous]
+        public async Task<dynamic> 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<Entity.InvestigateTable_Assessment>().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<Entity.NonInvestigateTable_Assessment>().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错误");
+
+            }
+        }
+        /// <summary>
+        /// 分布评估详细
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        [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<Entity.InvestigateTable_Assessment>().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<Entity.NonInvestigateTable_Assessment>().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("出错了");
+        }
     }
 }

Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.Core.xml

@@ -2750,14 +2750,15 @@
             规范化RESTful风格返回值
             </summary>
         </member>
-        <member name="M:Ewide.Core.RestfulResultProvider.OnException(Microsoft.AspNetCore.Mvc.Filters.ExceptionContext)">
+        <member name="M:Ewide.Core.RestfulResultProvider.OnException(Microsoft.AspNetCore.Mvc.Filters.ExceptionContext,Furion.UnifyResult.Internal.ExceptionMetadata)">
             <summary>
             异常返回值
             </summary>
             <param name="context"></param>
+            <param name="metadata"></param>
             <returns></returns>
         </member>
-        <member name="M:Ewide.Core.RestfulResultProvider.OnResponseStatusCodes(Microsoft.AspNetCore.Http.HttpContext,System.Int32,Furion.UnifyResult.UnifyResultStatusCodesOptions)">
+        <member name="M:Ewide.Core.RestfulResultProvider.OnResponseStatusCodes(Microsoft.AspNetCore.Http.HttpContext,System.Int32,Furion.UnifyResult.UnifyResultSettingsOptions)">
             <summary>
             处理输出状态码
             </summary>
@@ -2766,14 +2767,14 @@
             <param name="options"></param>
             <returns></returns>
         </member>
-        <member name="M:Ewide.Core.RestfulResultProvider.OnSucceeded(Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext)">
+        <member name="M:Ewide.Core.RestfulResultProvider.OnSucceeded(Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext,System.Object)">
             <summary>
             成功返回值
             </summary>
             <param name="context"></param>
             <returns></returns>
         </member>
-        <member name="M:Ewide.Core.RestfulResultProvider.OnValidateFailed(Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext,Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary,System.Collections.Generic.IEnumerable{Furion.DataValidation.ValidateFailedModel},System.String)">
+        <member name="M:Ewide.Core.RestfulResultProvider.OnValidateFailed(Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext,Furion.DataValidation.ValidationMetadata)">
             <summary>
             验证失败返回值
             </summary>

Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.Extras.DatabaseAccessor.Dapper.xml

@@ -72,7 +72,7 @@
         </member>
         <member name="T:Dapper.DapperRepository">
             <summary>
-            非泛型 SqlSugar 仓储
+            非泛型 Dapper 仓储
             </summary>
         </member>
         <member name="F:Dapper.DapperRepository._db">
@@ -181,7 +181,7 @@
         </member>
         <member name="T:Dapper.DapperRepository`1">
             <summary>
-            SqlSugar 仓储实现类
+            Dapper 仓储实现类
             </summary>
             <typeparam name="TEntity"></typeparam>
         </member>
@@ -338,7 +338,7 @@
         </member>
         <member name="T:Dapper.IDapperRepository">
             <summary>
-            非泛型 SqlSugar 仓储
+            非泛型 Dapper 仓储
             </summary>
         </member>
         <member name="P:Dapper.IDapperRepository.Context">
@@ -430,7 +430,7 @@
         </member>
         <member name="T:Dapper.IDapperRepository`1">
             <summary>
-            SqlSugar 仓储接口定义
+            Dapper 仓储接口定义
             </summary>
             <typeparam name="TEntity"></typeparam>
         </member>

Ewide.NbzsZheliban/bin/Debug/net5.0/Furion.xml

@@ -1230,12 +1230,12 @@
             是否打印数据库连接信息
             </summary>
         </member>
-        <member name="F:Furion.DatabaseAccessor.DbContextPool.dbContexts">
+        <member name="F:Furion.DatabaseAccessor.DbContextPool._dbContexts">
             <summary>
             线程安全的数据库上下文集合
             </summary>
         </member>
-        <member name="F:Furion.DatabaseAccessor.DbContextPool.failedDbContexts">
+        <member name="F:Furion.DatabaseAccessor.DbContextPool._failedDbContexts">
             <summary>
             登记错误的数据库上下文
             </summary>
@@ -21046,6 +21046,15 @@
             <param name="args">String.Format 参数</param>
             <returns>异常实例</returns>
         </member>
+        <member name="M:Furion.FriendlyException.Oops.Oh(System.Object,System.String)">
+            <summary>
+            抛出字符串异常
+            </summary>
+            <param name="errorCode"></param>
+            <param name="errorMessage">异常消息</param>
+            <param name="args">String.Format 参数</param>
+            <returns>异常实例</returns>
+        </member>
         <member name="M:Furion.FriendlyException.Oops.Oh(System.String,System.Type,System.Object[])">
             <summary>
             抛出字符串异常

Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.Core.xml

@@ -2750,14 +2750,15 @@
             规范化RESTful风格返回值
             </summary>
         </member>
-        <member name="M:Ewide.Core.RestfulResultProvider.OnException(Microsoft.AspNetCore.Mvc.Filters.ExceptionContext)">
+        <member name="M:Ewide.Core.RestfulResultProvider.OnException(Microsoft.AspNetCore.Mvc.Filters.ExceptionContext,Furion.UnifyResult.Internal.ExceptionMetadata)">
             <summary>
             异常返回值
             </summary>
             <param name="context"></param>
+            <param name="metadata"></param>
             <returns></returns>
         </member>
-        <member name="M:Ewide.Core.RestfulResultProvider.OnResponseStatusCodes(Microsoft.AspNetCore.Http.HttpContext,System.Int32,Furion.UnifyResult.UnifyResultStatusCodesOptions)">
+        <member name="M:Ewide.Core.RestfulResultProvider.OnResponseStatusCodes(Microsoft.AspNetCore.Http.HttpContext,System.Int32,Furion.UnifyResult.UnifyResultSettingsOptions)">
             <summary>
             处理输出状态码
             </summary>
@@ -2766,14 +2767,14 @@
             <param name="options"></param>
             <returns></returns>
         </member>
-        <member name="M:Ewide.Core.RestfulResultProvider.OnSucceeded(Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext)">
+        <member name="M:Ewide.Core.RestfulResultProvider.OnSucceeded(Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext,System.Object)">
             <summary>
             成功返回值
             </summary>
             <param name="context"></param>
             <returns></returns>
         </member>
-        <member name="M:Ewide.Core.RestfulResultProvider.OnValidateFailed(Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext,Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary,System.Collections.Generic.IEnumerable{Furion.DataValidation.ValidateFailedModel},System.String)">
+        <member name="M:Ewide.Core.RestfulResultProvider.OnValidateFailed(Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext,Furion.DataValidation.ValidationMetadata)">
             <summary>
             验证失败返回值
             </summary>

Ewide.NbzsZheliban/bin/Release/net5.0/Furion.Extras.DatabaseAccessor.Dapper.xml

@@ -72,7 +72,7 @@
         </member>
         <member name="T:Dapper.DapperRepository">
             <summary>
-            非泛型 SqlSugar 仓储
+            非泛型 Dapper 仓储
             </summary>
         </member>
         <member name="F:Dapper.DapperRepository._db">
@@ -181,7 +181,7 @@
         </member>
         <member name="T:Dapper.DapperRepository`1">
             <summary>
-            SqlSugar 仓储实现类
+            Dapper 仓储实现类
             </summary>
             <typeparam name="TEntity"></typeparam>
         </member>
@@ -338,7 +338,7 @@
         </member>
         <member name="T:Dapper.IDapperRepository">
             <summary>
-            非泛型 SqlSugar 仓储
+            非泛型 Dapper 仓储
             </summary>
         </member>
         <member name="P:Dapper.IDapperRepository.Context">
@@ -430,7 +430,7 @@
         </member>
         <member name="T:Dapper.IDapperRepository`1">
             <summary>
-            SqlSugar 仓储接口定义
+            Dapper 仓储接口定义
             </summary>
             <typeparam name="TEntity"></typeparam>
         </member>

Ewide.NbzsZheliban/bin/Release/net5.0/Furion.xml

@@ -1230,12 +1230,12 @@
             是否打印数据库连接信息
             </summary>
         </member>
-        <member name="F:Furion.DatabaseAccessor.DbContextPool.dbContexts">
+        <member name="F:Furion.DatabaseAccessor.DbContextPool._dbContexts">
             <summary>
             线程安全的数据库上下文集合
             </summary>
         </member>
-        <member name="F:Furion.DatabaseAccessor.DbContextPool.failedDbContexts">
+        <member name="F:Furion.DatabaseAccessor.DbContextPool._failedDbContexts">
             <summary>
             登记错误的数据库上下文
             </summary>
@@ -21046,6 +21046,15 @@
             <param name="args">String.Format 参数</param>
             <returns>异常实例</returns>
         </member>
+        <member name="M:Furion.FriendlyException.Oops.Oh(System.Object,System.String)">
+            <summary>
+            抛出字符串异常
+            </summary>
+            <param name="errorCode"></param>
+            <param name="errorMessage">异常消息</param>
+            <param name="args">String.Format 参数</param>
+            <returns>异常实例</returns>
+        </member>
         <member name="M:Furion.FriendlyException.Oops.Oh(System.String,System.Type,System.Object[])">
             <summary>
             抛出字符串异常

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