Merge branch 'master' of http://118.178.224.202:3000/ewide/zsxt_nbzs_h5

Ewide.Nbzs.BackWorkerService/Ewide.Nbzs.BackWorkerService.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk.Worker">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <UserSecretsId>dotnet-Ewide.Nbzs.BackWorkerService-5E150AE7-682D-42D1-AF3F-1C9CA78CDAD8</UserSecretsId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Ewide.Nbzs.Entity\Ewide.Nbzs.Entity.csproj" />
+    <ProjectReference Include="..\framework\Api\Furion\framework\Furion.Extras.DatabaseAccessor.SqlSugar\Furion.Extras.DatabaseAccessor.SqlSugar.csproj" />
+    <ProjectReference Include="..\framework\Api\Furion\framework\Furion\Furion.csproj" />
+  </ItemGroup>
+</Project>

Ewide.Nbzs.BackWorkerService/Program.cs

@@ -0,0 +1,28 @@
+using Furion;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Ewide.Nbzs.BackWorkerService
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            CreateHostBuilder(args).Build().Run();
+        }
+
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+            .Inject()
+                .ConfigureServices((hostContext, services) =>
+                {
+                    services.AddHostedService<Worker>();
+                });
+    }
+}

Ewide.Nbzs.BackWorkerService/Properties/launchSettings.json

@@ -0,0 +1,11 @@
+{
+  "profiles": {
+    "Ewide.Nbzs.BackWorkerService": {
+      "commandName": "Project",
+      "dotnetRunMessages": "true",
+      "environmentVariables": {
+        "DOTNET_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}

Ewide.Nbzs.BackWorkerService/Worker.cs

@@ -0,0 +1,60 @@
+using Furion;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Ewide.Nbzs.BackWorkerService
+{
+    public class Worker : BackgroundService
+    {
+        public SqlSugarClient db;
+        private readonly ILogger<Worker> _logger;
+
+        public Worker(ILogger<Worker> logger)
+        {
+            _logger = logger;
+            List<ConnectionConfig> connectConfigList = new()
+            {
+                new ConnectionConfig
+                {
+                    ConnectionString = App.Configuration["SqlServerConnectionString:DefaultConnection"],
+                    DbType = DbType.SqlServer,
+                    IsAutoCloseConnection = true,
+                    InitKeyType = InitKeyType.Attribute,
+                    ConfigId = "0"
+                }
+            };
+            db = new SqlSugarClient(connectConfigList);
+        }
+
+        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+        {
+            while (!stoppingToken.IsCancellationRequested)
+            {
+                ExecProcess();
+                //var asd = db.Queryable<Ewide.NbzsZheliban.Entity.zjzwfwTickets>().ToList();
+                var asd = db.Queryable<Ewide.NbzsZheliban.Entity.InvestigateTable>().ToList();
+                _logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
+                await Task.Delay(1000, stoppingToken);
+            }
+        }
+        /// <summary>
+        /// Ö´ÐÐÈÎÎñ ÿÃë
+        /// </summary>
+        private void ExecProcess()
+        {
+            Thread.Sleep(3000);
+        }
+
+        private void ExecPushProcess()
+        {
+
+
+        }
+    }
+}

Ewide.Nbzs.BackWorkerService/appsettings.Development.json

@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}

Ewide.Nbzs.BackWorkerService/appsettings.json

@@ -0,0 +1,15 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "Product_Conn": {
+    "DefaultConnection": "data source=118.178.224.202;initial catalog=Nbcqb2;persist security info=True;user id=KYSQLSERVERADMIN;password=KYDBLogin20161103...;MultipleActiveResultSets=True;App=EntityFramework"
+  },
+  "Zlb_Conn": {
+    "DefaultConnection": "data source=118.178.224.202;initial catalog=NbzsZlb;persist security info=True;user id=KYSQLSERVERADMIN;password=KYDBLogin20161103...;MultipleActiveResultSets=True;App=EntityFramework"
+  }
+}

Ewide.Nbzs.Entity/Base/BaseEntity.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.NbzsZheliban.Entity
+{
+    /// <summary>
+    /// 基础实体类
+    /// </summary>
+    [DataContract]
+    public abstract partial class BaseEntity
+    {
+        //public BaseEntity()
+        //{
+        //    //CreateTime = DateTime.Now;
+        //    //LastUpdateTime = DateTime.Now;
+        //    //IsDeleted = 0;
+        //}
+        ////[NotUpdateField]
+        //[Display(Name = "Id")]
+        //[Column("Id")]
+        //[DataMember]
+        //public long Id { get; set; }
+
+    }
+}

Ewide.Nbzs.Entity/Base/RespModel.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.NbzsZheliban.Entity.Base
+{
+    [Serializable, System.Runtime.Serialization.DataContract]
+    public class RespModel
+    {
+        /// <summary>
+        /// 是否成功
+        /// </summary>
+        [System.Runtime.Serialization.DataMember]
+        public bool issuccess { get; set; }
+        /// <summary>
+        /// 错误码
+        /// </summary>
+        [System.Runtime.Serialization.DataMember]
+        public string errorcode { get; set; }
+        [System.Runtime.Serialization.DataMember]
+        public string message { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [System.Runtime.Serialization.DataMember]
+        public object data { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [System.Runtime.Serialization.DataMember]
+        public int allcount { get; set; }
+        /// <summary>
+        /// 附加对象
+        /// </summary>
+        [System.Runtime.Serialization.DataMember]
+        public object addition { get; set; }
+
+        /// <summary>
+        /// 消耗时间,单位毫秒
+        /// </summary>
+        [System.Runtime.Serialization.DataMember]
+        public long consume_time { get; set; }
+    }
+}

Ewide.Nbzs.Entity/DataBase/InvestigateTable.cs

@@ -0,0 +1,954 @@
+	//----------InvestigateTable开始----------
+    
+	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
+	{	
+        /// <summary>
+        /// 数据表实体类：InvestigateTable 
+        /// </summary>
+		[Table("InvestigateTable")]
+        public partial class InvestigateTable: BaseEntity        {    
+		                    /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+				[Key]
+								[Column("ID")]   
+				[DataMember]  
+			    public Guid ID  {get;set;}   
+                                /// <summary>
+                /// 调查表编号
+                /// </summary>    
+				
+				[Display(Name="调查表编号")]   
+								[Column("No")]   
+				[DataMember]  
+			    public string No  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("ProjectName")]   
+				[DataMember]  
+			    public string ProjectName  {get;set;}   
+                                /// <summary>
+                /// 项目ID
+                /// </summary>    
+				
+				[Display(Name="项目ID")]   
+								[Column("ProjectId")]   
+				[DataMember]  
+			    public Guid ProjectId  {get;set;}   
+                                /// <summary>
+                /// 被征收人姓名
+                /// </summary>    
+				
+				[Display(Name="被征收人姓名")]   
+								[Column("ExpropriatedName")]   
+				[DataMember]  
+			    public string ExpropriatedName  {get;set;}   
+                                /// <summary>
+                /// 被征收人性质ID 关联数据字典表ID
+                /// </summary>    
+				
+				[Display(Name="被征收人性质ID 关联数据字典表ID")]   
+								[Column("ExpropriatedNatureID")]   
+				[DataMember]  
+			    public Guid? ExpropriatedNatureID  {get;set;}   
+                                /// <summary>
+                /// 被征收人性质 被征收人还是承租人
+                /// </summary>    
+				
+				[Display(Name="被征收人性质 被征收人还是承租人")]   
+								[Column("ExpropriatedNature")]   
+				[DataMember]  
+			    public string ExpropriatedNature  {get;set;}   
+                                /// <summary>
+                /// 被征收人身份证
+                /// </summary>    
+				
+				[Display(Name="被征收人身份证")]   
+								[Column("ExpropriatedCardNo")]   
+				[DataMember]  
+			    public string ExpropriatedCardNo  {get;set;}   
+                                /// <summary>
+                /// 被征收人联系电话
+                /// </summary>    
+				
+				[Display(Name="被征收人联系电话")]   
+								[Column("ExpropriatedPhone")]   
+				[DataMember]  
+			    public string ExpropriatedPhone  {get;set;}   
+                                /// <summary>
+                /// 产权性质ID
+                /// </summary>    
+				
+				[Display(Name="产权性质ID")]   
+								[Column("NatureOfPropertyID")]   
+				[DataMember]  
+			    public string NatureOfPropertyID  {get;set;}   
+                                /// <summary>
+                /// 产权性质
+                /// </summary>    
+				
+				[Display(Name="产权性质")]   
+								[Column("NatureOfProperty")]   
+				[DataMember]  
+			    public string NatureOfProperty  {get;set;}   
+                                /// <summary>
+                /// 结构ID 字典表ID,可能有多个 逗号分隔
+                /// </summary>    
+				
+				[Display(Name="结构ID 字典表ID,可能有多个 逗号分隔")]   
+								[Column("StructureID")]   
+				[DataMember]  
+			    public string StructureID  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("LandAcquisitionBCWillingness")]   
+				[DataMember]  
+			    public string LandAcquisitionBCWillingness  {get;set;}   
+                                /// <summary>
+                /// 结构,可能有多个 逗号分隔
+                /// </summary>    
+				
+				[Display(Name="结构,可能有多个 逗号分隔")]   
+								[Column("StructureID_text")]   
+				[DataMember]  
+			    public string StructureID_text  {get;set;}   
+                                /// <summary>
+                /// 产权人
+                /// </summary>    
+				
+				[Display(Name="产权人")]   
+								[Column("PropertyRightPrson")]   
+				[DataMember]  
+			    public string PropertyRightPrson  {get;set;}   
+                                /// <summary>
+                /// 产权人电话
+                /// </summary>    
+				
+				[Display(Name="产权人电话")]   
+								[Column("PropertyRightPrsonPhone")]   
+				[DataMember]  
+			    public string PropertyRightPrsonPhone  {get;set;}   
+                                /// <summary>
+                /// 产权人身份证，证件号码
+                /// </summary>    
+				
+				[Display(Name="产权人身份证，证件号码")]   
+								[Column("PropertyRightPrsonCardNo")]   
+				[DataMember]  
+			    public string PropertyRightPrsonCardNo  {get;set;}   
+                                /// <summary>
+                /// 用户编号1
+                /// </summary>    
+				
+				[Display(Name="用户编号1")]   
+								[Column("No1")]   
+				[DataMember]  
+			    public string No1  {get;set;}   
+                                /// <summary>
+                /// 用户编号2
+                /// </summary>    
+				
+				[Display(Name="用户编号2")]   
+								[Column("No2")]   
+				[DataMember]  
+			    public string No2  {get;set;}   
+                                /// <summary>
+                /// 承租人
+                /// </summary>    
+				
+				[Display(Name="承租人")]   
+								[Column("Lessee")]   
+				[DataMember]  
+			    public string Lessee  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("LesseePhone")]   
+				[DataMember]  
+			    public string LesseePhone  {get;set;}   
+                                /// <summary>
+                /// 承租人证件号码
+                /// </summary>    
+				
+				[Display(Name="承租人证件号码")]   
+								[Column("LesseeCardNo")]   
+				[DataMember]  
+			    public string LesseeCardNo  {get;set;}   
+                                /// <summary>
+                /// 被征收房屋地址
+                /// </summary>    
+				
+				[Display(Name="被征收房屋地址")]   
+								[Column("HouseAddress")]   
+				[DataMember]  
+			    public string HouseAddress  {get;set;}   
+                                /// <summary>
+                /// 街道
+                /// </summary>    
+				
+				[Display(Name="街道")]   
+								[Column("Street")]   
+				[DataMember]  
+			    public string Street  {get;set;}   
+                                /// <summary>
+                /// 丘号
+                /// </summary>    
+				
+				[Display(Name="丘号")]   
+								[Column("LandNo")]   
+				[DataMember]  
+			    public string LandNo  {get;set;}   
+                                /// <summary>
+                /// 产权证号
+                /// </summary>    
+				
+				[Display(Name="产权证号")]   
+								[Column("PropertyRightCardNo")]   
+				[DataMember]  
+			    public string PropertyRightCardNo  {get;set;}   
+                                /// <summary>
+                /// 权证建筑面积
+                /// </summary>    
+				
+				[Display(Name="权证建筑面积")]   
+								[Column("BuildingArea")]   
+				[DataMember]  
+			    public decimal? BuildingArea  {get;set;}   
+                                /// <summary>
+                /// 使用面积
+                /// </summary>    
+				
+				[Display(Name="使用面积")]   
+								[Column("UseArea")]   
+				[DataMember]  
+			    public decimal? UseArea  {get;set;}   
+                                /// <summary>
+                /// 核定建筑面积
+                /// </summary>    
+				
+				[Display(Name="核定建筑面积")]   
+								[Column("ApprovedArea")]   
+				[DataMember]  
+			    public decimal? ApprovedArea  {get;set;}   
+                                /// <summary>
+                /// 所在层
+                /// </summary>    
+				
+				[Display(Name="所在层")]   
+								[Column("InLayer")]   
+				[DataMember]  
+			    public decimal? InLayer  {get;set;}   
+                                /// <summary>
+                /// 总层数
+                /// </summary>    
+				
+				[Display(Name="总层数")]   
+								[Column("AllLayer")]   
+				[DataMember]  
+			    public decimal? AllLayer  {get;set;}   
+                                /// <summary>
+                /// 房屋用途
+                /// </summary>    
+				
+				[Display(Name="房屋用途")]   
+								[Column("HouseUse")]   
+				[DataMember]  
+			    public string HouseUse  {get;set;}   
+                                /// <summary>
+                /// 自行车房面积
+                /// </summary>    
+				
+				[Display(Name="自行车房面积")]   
+								[Column("BiicyclesArea")]   
+				[DataMember]  
+			    public decimal? BiicyclesArea  {get;set;}   
+                                /// <summary>
+                /// 房屋产权性质
+                /// </summary>    
+				
+				[Display(Name="房屋产权性质")]   
+								[Column("HouseNatureOfProperty")]   
+				[DataMember]  
+			    public string HouseNatureOfProperty  {get;set;}   
+                                /// <summary>
+                /// 使用情况ID 关联字典表ID
+                /// </summary>    
+				
+				[Display(Name="使用情况ID 关联字典表ID")]   
+								[Column("UsageID")]   
+				[DataMember]  
+			    public Guid? UsageID  {get;set;}   
+                                /// <summary>
+                /// 使用情况
+                /// </summary>    
+				
+				[Display(Name="使用情况")]   
+								[Column("UsageSituation")]   
+				[DataMember]  
+			    public string UsageSituation  {get;set;}   
+                                /// <summary>
+                /// 人口
+                /// </summary>    
+				
+				[Display(Name="人口")]   
+								[Column("Population")]   
+				[DataMember]  
+			    public int? Population  {get;set;}   
+                                /// <summary>
+                /// 备注
+                /// </summary>    
+				
+				[Display(Name="备注")]   
+								[Column("Remark")]   
+				[DataMember]  
+			    public string Remark  {get;set;}   
+                                /// <summary>
+                /// 房号
+                /// </summary>    
+				
+				[Display(Name="房号")]   
+								[Column("HouseNo")]   
+				[DataMember]  
+			    public string HouseNo  {get;set;}   
+                                /// <summary>
+                /// 土地证号
+                /// </summary>    
+				
+				[Display(Name="土地证号")]   
+								[Column("LandCardNo")]   
+				[DataMember]  
+			    public string LandCardNo  {get;set;}   
+                                /// <summary>
+                /// 土地证面积
+                /// </summary>    
+				
+				[Display(Name="土地证面积")]   
+								[Column("LandCardArea")]   
+				[DataMember]  
+			    public decimal? LandCardArea  {get;set;}   
+                                /// <summary>
+                /// 土地用途
+                /// </summary>    
+				
+				[Display(Name="土地用途")]   
+								[Column("LandUse")]   
+				[DataMember]  
+			    public string LandUse  {get;set;}   
+                                /// <summary>
+                /// 土地取得方式
+                /// </summary>    
+				
+				[Display(Name="土地取得方式")]   
+								[Column("LandWay")]   
+				[DataMember]  
+			    public string LandWay  {get;set;}   
+                                /// <summary>
+                /// 未登记-坐落
+                /// </summary>    
+				
+				[Display(Name="未登记-坐落")]   
+								[Column("UnReg_Address")]   
+				[DataMember]  
+			    public string UnReg_Address  {get;set;}   
+                                /// <summary>
+                /// 未登记-建筑面积
+                /// </summary>    
+				
+				[Display(Name="未登记-建筑面积")]   
+								[Column("UnReg_BuildArea")]   
+				[DataMember]  
+			    public decimal? UnReg_BuildArea  {get;set;}   
+                                /// <summary>
+                /// 未登记-建造年份
+                /// </summary>    
+				
+				[Display(Name="未登记-建造年份")]   
+								[Column("UnReg_BuildYear")]   
+				[DataMember]  
+			    public string UnReg_BuildYear  {get;set;}   
+                                /// <summary>
+                /// 未登记-实际用途
+                /// </summary>    
+				
+				[Display(Name="未登记-实际用途")]   
+								[Column("UnReg_PracticalUse")]   
+				[DataMember]  
+			    public string UnReg_PracticalUse  {get;set;}   
+                                /// <summary>
+                /// 未登记-合法面积
+                /// </summary>    
+				
+				[Display(Name="未登记-合法面积")]   
+								[Column("UnReg_LegalArea")]   
+				[DataMember]  
+			    public decimal? UnReg_LegalArea  {get;set;}   
+                                /// <summary>
+                /// 建造年份
+                /// </summary>    
+				
+				[Display(Name="建造年份")]   
+								[Column("BuildYear")]   
+				[DataMember]  
+			    public DateTime? BuildYear  {get;set;}   
+                                /// <summary>
+                /// 底层情况
+                /// </summary>    
+				
+				[Display(Name="底层情况")]   
+								[Column("Underlying")]   
+				[DataMember]  
+			    public string Underlying  {get;set;}   
+                                /// <summary>
+                /// 车房类别
+                /// </summary>    
+				
+				[Display(Name="车房类别")]   
+								[Column("CarHouseType")]   
+				[DataMember]  
+			    public string CarHouseType  {get;set;}   
+                                /// <summary>
+                /// 车房面积
+                /// </summary>    
+				
+				[Display(Name="车房面积")]   
+								[Column("CarHouseArea")]   
+				[DataMember]  
+			    public decimal? CarHouseArea  {get;set;}   
+                                /// <summary>
+                /// 房屋征收相关文书送达地址
+                /// </summary>    
+				
+				[Display(Name="房屋征收相关文书送达地址")]   
+								[Column("DocumentToAddress")]   
+				[DataMember]  
+			    public string DocumentToAddress  {get;set;}   
+                                /// <summary>
+                /// 收件联系人
+                /// </summary>    
+				
+				[Display(Name="收件联系人")]   
+								[Column("ReceiveContactPerson")]   
+				[DataMember]  
+			    public string ReceiveContactPerson  {get;set;}   
+                                /// <summary>
+                /// 收件联系手机
+                /// </summary>    
+				
+				[Display(Name="收件联系手机")]   
+								[Column("ReceiveContactPhone")]   
+				[DataMember]  
+			    public string ReceiveContactPhone  {get;set;}   
+                                /// <summary>
+                /// 征收意愿
+                /// </summary>    
+				
+				[Display(Name="征收意愿")]   
+								[Column("LandAcquisitionWillingness")]   
+				[DataMember]  
+			    public string LandAcquisitionWillingness  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("Razon")]   
+				[DataMember]  
+			    public string Razon  {get;set;}   
+                                /// <summary>
+                /// 安置意向
+                /// </summary>    
+				
+				[Display(Name="安置意向")]   
+								[Column("SettlementIntention")]   
+				[DataMember]  
+			    public string SettlementIntention  {get;set;}   
+                                /// <summary>
+                /// 调查人ID
+                /// </summary>    
+				
+				[Display(Name="调查人ID")]   
+								[Column("InvestigateUserId")]   
+				[DataMember]  
+			    public Guid? InvestigateUserId  {get;set;}   
+                                /// <summary>
+                /// 调查人
+                /// </summary>    
+				
+				[Display(Name="调查人")]   
+								[Column("InvestigateUserName")]   
+				[DataMember]  
+			    public string InvestigateUserName  {get;set;}   
+                                /// <summary>
+                /// 调查时间
+                /// </summary>    
+				
+				[Display(Name="调查时间")]   
+								[Column("InvestigateDate")]   
+				[DataMember]  
+			    public DateTime? InvestigateDate  {get;set;}   
+                                /// <summary>
+                /// 登记人ID
+                /// </summary>    
+				
+				[Display(Name="登记人ID")]   
+								[Column("RegisterUserId")]   
+				[DataMember]  
+			    public Guid? RegisterUserId  {get;set;}   
+                                /// <summary>
+                /// 登记人
+                /// </summary>    
+				
+				[Display(Name="登记人")]   
+								[Column("RegisterUserName")]   
+				[DataMember]  
+			    public string RegisterUserName  {get;set;}   
+                                /// <summary>
+                /// 登记日期
+                /// </summary>    
+				
+				[Display(Name="登记日期")]   
+								[Column("RegisterDate")]   
+				[DataMember]  
+			    public DateTime? RegisterDate  {get;set;}   
+                                /// <summary>
+                /// 修改人员ID
+                /// </summary>    
+				
+				[Display(Name="修改人员ID")]   
+								[Column("UpdateUserId")]   
+				[DataMember]  
+			    public Guid? UpdateUserId  {get;set;}   
+                                /// <summary>
+                /// 修改人员
+                /// </summary>    
+				
+				[Display(Name="修改人员")]   
+								[Column("UpdateUserName")]   
+				[DataMember]  
+			    public string UpdateUserName  {get;set;}   
+                                /// <summary>
+                /// 修改日期
+                /// </summary>    
+				
+				[Display(Name="修改日期")]   
+								[Column("UpdateDate")]   
+				[DataMember]  
+			    public DateTime? UpdateDate  {get;set;}   
+                                /// <summary>
+                /// 附房使用面积
+                /// </summary>    
+				
+				[Display(Name="附房使用面积")]   
+								[Column("AttachedHouseUseArea")]   
+				[DataMember]  
+			    public decimal? AttachedHouseUseArea  {get;set;}   
+                                /// <summary>
+                /// 是否在重点规划控制区内
+                /// </summary>    
+				
+				[Display(Name="是否在重点规划控制区内")]   
+								[Column("IsInTheKeyPlanControlAreas")]   
+				[DataMember]  
+			    public int? IsInTheKeyPlanControlAreas  {get;set;}   
+                                /// <summary>
+                /// 实际居住地
+                /// </summary>    
+				
+				[Display(Name="实际居住地")]   
+								[Column("ActualSettlement")]   
+				[DataMember]  
+			    public string ActualSettlement  {get;set;}   
+                                /// <summary>
+                /// 业主（产权人）签字
+                /// </summary>    
+				
+				[Display(Name="业主（产权人）签字")]   
+								[Column("PropertyRightPrsonSign")]   
+				[DataMember]  
+			    public string PropertyRightPrsonSign  {get;set;}   
+                                /// <summary>
+                /// 业主（产权人）签字时间
+                /// </summary>    
+				
+				[Display(Name="业主（产权人）签字时间")]   
+								[Column("PropertyRightPrsonSignDate")]   
+				[DataMember]  
+			    public DateTime? PropertyRightPrsonSignDate  {get;set;}   
+                                /// <summary>
+                /// 发布到公开系统时间
+                /// </summary>    
+				
+				[Display(Name="发布到公开系统时间")]   
+								[Column("ReleaseToOpenSysDate")]   
+				[DataMember]  
+			    public DateTime? ReleaseToOpenSysDate  {get;set;}   
+                                /// <summary>
+                /// 发布到公开系统人员ID
+                /// </summary>    
+				
+				[Display(Name="发布到公开系统人员ID")]   
+								[Column("ReleaseToOpenSysUserId")]   
+				[DataMember]  
+			    public Guid? ReleaseToOpenSysUserId  {get;set;}   
+                                /// <summary>
+                /// 调查表附件
+                /// </summary>    
+				
+				[Display(Name="调查表附件")]   
+								[Column("Files")]   
+				[DataMember]  
+			    public string Files  {get;set;}   
+                                /// <summary>
+                /// 危旧房区块ID关联ProjectsBlock表ID
+                /// </summary>    
+				
+				[Display(Name="危旧房区块ID关联ProjectsBlock表ID")]   
+								[Column("WJF_BlockID")]   
+				[DataMember]  
+			    public Guid? WJF_BlockID  {get;set;}   
+                                /// <summary>
+                /// 危旧房区块名称
+                /// </summary>    
+				
+				[Display(Name="危旧房区块名称")]   
+								[Column("WJF_Block")]   
+				[DataMember]  
+			    public string WJF_Block  {get;set;}   
+                                /// <summary>
+                /// 是否发布到公开系统
+                /// </summary>    
+				
+				[Display(Name="是否发布到公开系统")]   
+								[Column("IsReleaseToOpenSys")]   
+				[DataMember]  
+			    public bool IsReleaseToOpenSys  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("Sfqy")]   
+				[DataMember]  
+			    public int Sfqy  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("IsOpen")]   
+				[DataMember]  
+			    public int IsOpen  {get;set;}   
+                                /// <summary>
+                /// 被征收人证件号码类别
+                /// </summary>    
+				
+				[Display(Name="被征收人证件号码类别")]   
+								[Column("CardLB")]   
+				[DataMember]  
+			    public string CardLB  {get;set;}   
+                                /// <summary>
+                /// 土地核定面积
+                /// </summary>    
+				
+				[Display(Name="土地核定面积")]   
+								[Column("LandFinalArea")]   
+				[DataMember]  
+			    public decimal? LandFinalArea  {get;set;}   
+                                /// <summary>
+                /// 承租人证件类型
+                /// </summary>    
+				
+				[Display(Name="承租人证件类型")]   
+								[Column("LesseeLB")]   
+				[DataMember]  
+			    public string LesseeLB  {get;set;}   
+                                /// <summary>
+                /// 阁楼面积
+                /// </summary>    
+				
+				[Display(Name="阁楼面积")]   
+								[Column("AtticArea")]   
+				[DataMember]  
+			    public decimal? AtticArea  {get;set;}   
+                                /// <summary>
+                /// 附属用房面积
+                /// </summary>    
+				
+				[Display(Name="附属用房面积")]   
+								[Column("AttachedArea")]   
+				[DataMember]  
+			    public decimal? AttachedArea  {get;set;}   
+                                /// <summary>
+                /// 红线内无证面积
+                /// </summary>    
+				
+				[Display(Name="红线内无证面积")]   
+								[Column("RedLine_In")]   
+				[DataMember]  
+			    public decimal? RedLine_In  {get;set;}   
+                                /// <summary>
+                /// 红线外无证面积
+                /// </summary>    
+				
+				[Display(Name="红线外无证面积")]   
+								[Column("RedLine_Out")]   
+				[DataMember]  
+			    public decimal? RedLine_Out  {get;set;}   
+                                /// <summary>
+                /// 住改非面积
+                /// </summary>    
+				
+				[Display(Name="住改非面积")]   
+								[Column("NoHouseArea")]   
+				[DataMember]  
+			    public decimal? NoHouseArea  {get;set;}   
+                                /// <summary>
+                /// 营业执照号
+                /// </summary>    
+				
+				[Display(Name="营业执照号")]   
+								[Column("BusinessCode")]   
+				[DataMember]  
+			    public string BusinessCode  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("Sfth")]   
+				[DataMember]  
+			    public string Sfth  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("Thbh")]   
+				[DataMember]  
+			    public string Thbh  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("ThGuid")]   
+				[DataMember]  
+			    public string ThGuid  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("SFTJ")]   
+				[DataMember]  
+			    public int SFTJ  {get;set;}   
+                                /// <summary>
+                /// 出租出借私房产权人
+                /// </summary>    
+				
+				[Display(Name="出租出借私房产权人")]   
+								[Column("PropertyUser1")]   
+				[DataMember]  
+			    public string PropertyUser1  {get;set;}   
+                                /// <summary>
+                /// 出租出借私房承租人
+                /// </summary>    
+				
+				[Display(Name="出租出借私房承租人")]   
+								[Column("Lessee1")]   
+				[DataMember]  
+			    public string Lessee1  {get;set;}   
+                                /// <summary>
+                /// 金额是否计算比例
+                /// </summary>    
+				
+				[Display(Name="金额是否计算比例")]   
+								[Column("MoneyIfCalute")]   
+				[DataMember]  
+			    public int MoneyIfCalute  {get;set;}   
+                                /// <summary>
+                /// 储藏室
+                /// </summary>    
+				
+				[Display(Name="储藏室")]   
+								[Column("StoreroomArea")]   
+				[DataMember]  
+			    public decimal? StoreroomArea  {get;set;}   
+                                /// <summary>
+                /// 地段
+                /// </summary>    
+				
+				[Display(Name="地段")]   
+								[Column("Section")]   
+				[DataMember]  
+			    public string Section  {get;set;}   
+                                /// <summary>
+                /// 朝向
+                /// </summary>    
+				
+				[Display(Name="朝向")]   
+								[Column("Orientation")]   
+				[DataMember]  
+			    public string Orientation  {get;set;}   
+                                /// <summary>
+                /// 房屋部位
+                /// </summary>    
+				
+				[Display(Name="房屋部位")]   
+								[Column("HousePosition")]   
+				[DataMember]  
+			    public string HousePosition  {get;set;}   
+                                /// <summary>
+                /// 批次号
+                /// </summary>    
+				
+				[Display(Name="批次号")]   
+								[Column("BatchNumber")]   
+				[DataMember]  
+			    public string BatchNumber  {get;set;}   
+                                /// <summary>
+                /// 分组ID
+                /// </summary>    
+				
+				[Display(Name="分组ID")]   
+								[Column("GroupID")]   
+				[DataMember]  
+			    public Guid? GroupID  {get;set;}   
+                 
+		  }
+
+		  /**
+            /// <summary>
+            /// 数据表实体类Map：InvestigateTable 
+            /// </summary>
+            public class InvestigateTableMap : EntityTypeConfiguration<InvestigateTable>
+			{
+                public InvestigateTableMap()
+                {
+					this.ToTable("InvestigateTable");
+												this.HasKey(t => t.ID);
+													 this.Property(t => t.No).HasColumnName("No");
+													 this.Property(t => t.ProjectName).HasColumnName("ProjectName");
+													 this.Property(t => t.ProjectId).HasColumnName("ProjectId").IsRequired();
+													 this.Property(t => t.ExpropriatedName).HasColumnName("ExpropriatedName").IsRequired();
+													 this.Property(t => t.ExpropriatedNatureID).HasColumnName("ExpropriatedNatureID");
+													 this.Property(t => t.ExpropriatedNature).HasColumnName("ExpropriatedNature");
+													 this.Property(t => t.ExpropriatedCardNo).HasColumnName("ExpropriatedCardNo");
+													 this.Property(t => t.ExpropriatedPhone).HasColumnName("ExpropriatedPhone");
+													 this.Property(t => t.NatureOfPropertyID).HasColumnName("NatureOfPropertyID");
+													 this.Property(t => t.NatureOfProperty).HasColumnName("NatureOfProperty");
+													 this.Property(t => t.StructureID).HasColumnName("StructureID");
+													 this.Property(t => t.LandAcquisitionBCWillingness).HasColumnName("LandAcquisitionBCWillingness");
+													 this.Property(t => t.StructureID_text).HasColumnName("StructureID_text");
+													 this.Property(t => t.PropertyRightPrson).HasColumnName("PropertyRightPrson");
+													 this.Property(t => t.PropertyRightPrsonPhone).HasColumnName("PropertyRightPrsonPhone");
+													 this.Property(t => t.PropertyRightPrsonCardNo).HasColumnName("PropertyRightPrsonCardNo");
+													 this.Property(t => t.No1).HasColumnName("No1");
+													 this.Property(t => t.No2).HasColumnName("No2");
+													 this.Property(t => t.Lessee).HasColumnName("Lessee");
+													 this.Property(t => t.LesseePhone).HasColumnName("LesseePhone");
+													 this.Property(t => t.LesseeCardNo).HasColumnName("LesseeCardNo");
+													 this.Property(t => t.HouseAddress).HasColumnName("HouseAddress");
+													 this.Property(t => t.Street).HasColumnName("Street");
+													 this.Property(t => t.LandNo).HasColumnName("LandNo");
+													 this.Property(t => t.PropertyRightCardNo).HasColumnName("PropertyRightCardNo");
+													 this.Property(t => t.BuildingArea).HasColumnName("BuildingArea");
+													 this.Property(t => t.UseArea).HasColumnName("UseArea");
+													 this.Property(t => t.ApprovedArea).HasColumnName("ApprovedArea");
+													 this.Property(t => t.InLayer).HasColumnName("InLayer");
+													 this.Property(t => t.AllLayer).HasColumnName("AllLayer");
+													 this.Property(t => t.HouseUse).HasColumnName("HouseUse");
+													 this.Property(t => t.BiicyclesArea).HasColumnName("BiicyclesArea");
+													 this.Property(t => t.HouseNatureOfProperty).HasColumnName("HouseNatureOfProperty");
+													 this.Property(t => t.UsageID).HasColumnName("UsageID");
+													 this.Property(t => t.UsageSituation).HasColumnName("UsageSituation");
+													 this.Property(t => t.Population).HasColumnName("Population");
+													 this.Property(t => t.Remark).HasColumnName("Remark");
+													 this.Property(t => t.HouseNo).HasColumnName("HouseNo");
+													 this.Property(t => t.LandCardNo).HasColumnName("LandCardNo");
+													 this.Property(t => t.LandCardArea).HasColumnName("LandCardArea");
+													 this.Property(t => t.LandUse).HasColumnName("LandUse");
+													 this.Property(t => t.LandWay).HasColumnName("LandWay");
+													 this.Property(t => t.UnReg_Address).HasColumnName("UnReg_Address");
+													 this.Property(t => t.UnReg_BuildArea).HasColumnName("UnReg_BuildArea");
+													 this.Property(t => t.UnReg_BuildYear).HasColumnName("UnReg_BuildYear");
+													 this.Property(t => t.UnReg_PracticalUse).HasColumnName("UnReg_PracticalUse");
+													 this.Property(t => t.UnReg_LegalArea).HasColumnName("UnReg_LegalArea");
+													 this.Property(t => t.BuildYear).HasColumnName("BuildYear");
+													 this.Property(t => t.Underlying).HasColumnName("Underlying");
+													 this.Property(t => t.CarHouseType).HasColumnName("CarHouseType");
+													 this.Property(t => t.CarHouseArea).HasColumnName("CarHouseArea");
+													 this.Property(t => t.DocumentToAddress).HasColumnName("DocumentToAddress");
+													 this.Property(t => t.ReceiveContactPerson).HasColumnName("ReceiveContactPerson");
+													 this.Property(t => t.ReceiveContactPhone).HasColumnName("ReceiveContactPhone");
+													 this.Property(t => t.LandAcquisitionWillingness).HasColumnName("LandAcquisitionWillingness");
+													 this.Property(t => t.Razon).HasColumnName("Razon");
+													 this.Property(t => t.SettlementIntention).HasColumnName("SettlementIntention");
+													 this.Property(t => t.InvestigateUserId).HasColumnName("InvestigateUserId");
+													 this.Property(t => t.InvestigateUserName).HasColumnName("InvestigateUserName");
+													 this.Property(t => t.InvestigateDate).HasColumnName("InvestigateDate");
+													 this.Property(t => t.RegisterUserId).HasColumnName("RegisterUserId");
+													 this.Property(t => t.RegisterUserName).HasColumnName("RegisterUserName");
+													 this.Property(t => t.RegisterDate).HasColumnName("RegisterDate");
+													 this.Property(t => t.UpdateUserId).HasColumnName("UpdateUserId");
+													 this.Property(t => t.UpdateUserName).HasColumnName("UpdateUserName");
+													 this.Property(t => t.UpdateDate).HasColumnName("UpdateDate");
+													 this.Property(t => t.AttachedHouseUseArea).HasColumnName("AttachedHouseUseArea");
+													 this.Property(t => t.IsInTheKeyPlanControlAreas).HasColumnName("IsInTheKeyPlanControlAreas");
+													 this.Property(t => t.ActualSettlement).HasColumnName("ActualSettlement");
+													 this.Property(t => t.PropertyRightPrsonSign).HasColumnName("PropertyRightPrsonSign");
+													 this.Property(t => t.PropertyRightPrsonSignDate).HasColumnName("PropertyRightPrsonSignDate");
+													 this.Property(t => t.ReleaseToOpenSysDate).HasColumnName("ReleaseToOpenSysDate");
+													 this.Property(t => t.ReleaseToOpenSysUserId).HasColumnName("ReleaseToOpenSysUserId");
+													 this.Property(t => t.Files).HasColumnName("Files");
+													 this.Property(t => t.WJF_BlockID).HasColumnName("WJF_BlockID");
+													 this.Property(t => t.WJF_Block).HasColumnName("WJF_Block");
+													 this.Property(t => t.IsReleaseToOpenSys).HasColumnName("IsReleaseToOpenSys").IsRequired();
+													 this.Property(t => t.Sfqy).HasColumnName("Sfqy").IsRequired();
+													 this.Property(t => t.IsOpen).HasColumnName("IsOpen").IsRequired();
+													 this.Property(t => t.CardLB).HasColumnName("CardLB");
+													 this.Property(t => t.LandFinalArea).HasColumnName("LandFinalArea");
+													 this.Property(t => t.LesseeLB).HasColumnName("LesseeLB");
+													 this.Property(t => t.AtticArea).HasColumnName("AtticArea");
+													 this.Property(t => t.AttachedArea).HasColumnName("AttachedArea");
+													 this.Property(t => t.RedLine_In).HasColumnName("RedLine_In");
+													 this.Property(t => t.RedLine_Out).HasColumnName("RedLine_Out");
+													 this.Property(t => t.NoHouseArea).HasColumnName("NoHouseArea");
+													 this.Property(t => t.BusinessCode).HasColumnName("BusinessCode");
+													 this.Property(t => t.Sfth).HasColumnName("Sfth");
+													 this.Property(t => t.Thbh).HasColumnName("Thbh");
+													 this.Property(t => t.ThGuid).HasColumnName("ThGuid");
+													 this.Property(t => t.SFTJ).HasColumnName("SFTJ").IsRequired();
+													 this.Property(t => t.PropertyUser1).HasColumnName("PropertyUser1");
+													 this.Property(t => t.Lessee1).HasColumnName("Lessee1");
+													 this.Property(t => t.MoneyIfCalute).HasColumnName("MoneyIfCalute").IsRequired();
+													 this.Property(t => t.StoreroomArea).HasColumnName("StoreroomArea");
+													 this.Property(t => t.Section).HasColumnName("Section");
+													 this.Property(t => t.Orientation).HasColumnName("Orientation");
+													 this.Property(t => t.HousePosition).HasColumnName("HousePosition");
+													 this.Property(t => t.BatchNumber).HasColumnName("BatchNumber");
+													 this.Property(t => t.GroupID).HasColumnName("GroupID");
+										}
+			}**/
+
+	}
+
+	//----------InvestigateTable结束----------
+
+	

Ewide.Nbzs.Entity/DataBase/InvestigateTable_Assessment.cs

@@ -0,0 +1,873 @@
+	//----------InvestigateTable_Assessment开始----------
+    
+	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
+	{	
+        /// <summary>
+        /// 数据表实体类：InvestigateTable_Assessment 
+        /// </summary>
+		[Table("InvestigateTable_Assessment")]
+        public partial class InvestigateTable_Assessment: BaseEntity        {    
+		                    /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+				[Key]
+								[Column("ID")]   
+				[DataMember]  
+			    public Guid ID  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("ProjectId")]   
+				[DataMember]  
+			    public Guid? ProjectId  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("ProjectName")]   
+				[DataMember]  
+			    public string ProjectName  {get;set;}   
+                                /// <summary>
+                /// 调查表ID
+                /// </summary>    
+				
+				[Display(Name="调查表ID")]   
+								[Column("InvestigateTableID")]   
+				[DataMember]  
+			    public Guid InvestigateTableID  {get;set;}   
+                                /// <summary>
+                /// 评估金额
+                /// </summary>    
+				
+				[Display(Name="评估金额")]   
+								[Column("HousingAssessmentValue")]   
+				[DataMember]  
+			    public decimal? HousingAssessmentValue  {get;set;}   
+                                /// <summary>
+                /// 装修评估金额小计
+                /// </summary>    
+				
+				[Display(Name="装修评估金额小计")]   
+								[Column("DecorateAssessedValue")]   
+				[DataMember]  
+			    public decimal? DecorateAssessedValue  {get;set;}   
+                                /// <summary>
+                /// 附属物评估金额小计
+                /// </summary>    
+				
+				[Display(Name="附属物评估金额小计")]   
+								[Column("AttachedAssessedValue")]   
+				[DataMember]  
+			    public decimal? AttachedAssessedValue  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("countValue")]   
+				[DataMember]  
+			    public decimal? countValue  {get;set;}   
+                                /// <summary>
+                /// 评估人员
+                /// </summary>    
+				
+				[Display(Name="评估人员")]   
+								[Column("EstimatorsUserId")]   
+				[DataMember]  
+			    public Guid? EstimatorsUserId  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("AssessmentNo")]   
+				[DataMember]  
+			    public string AssessmentNo  {get;set;}   
+                                /// <summary>
+                /// 评估时间
+                /// </summary>    
+				
+				[Display(Name="评估时间")]   
+								[Column("EstimatorsDate")]   
+				[DataMember]  
+			    public DateTime? EstimatorsDate  {get;set;}   
+                                /// <summary>
+                /// 是否最终
+                /// </summary>    
+				
+				[Display(Name="是否最终")]   
+								[Column("IsFinal")]   
+				[DataMember]  
+			    public int IsFinal  {get;set;}   
+                                /// <summary>
+                /// 是否备案
+                /// </summary>    
+				
+				[Display(Name="是否备案")]   
+								[Column("IsInRecord")]   
+				[DataMember]  
+			    public int? IsInRecord  {get;set;}   
+                                /// <summary>
+                /// 备案时间
+                /// </summary>    
+				
+				[Display(Name="备案时间")]   
+								[Column("InRecordTime")]   
+				[DataMember]  
+			    public DateTime? InRecordTime  {get;set;}   
+                                /// <summary>
+                /// 备案人ID
+                /// </summary>    
+				
+				[Display(Name="备案人ID")]   
+								[Column("InRecordUserId")]   
+				[DataMember]  
+			    public Guid? InRecordUserId  {get;set;}   
+                                /// <summary>
+                /// 备案人
+                /// </summary>    
+				
+				[Display(Name="备案人")]   
+								[Column("InRecordUserName")]   
+				[DataMember]  
+			    public string InRecordUserName  {get;set;}   
+                                /// <summary>
+                /// 是否公开/是否公示
+                /// </summary>    
+				
+				[Display(Name="是否公开/是否公示")]   
+								[Column("IsPublic")]   
+				[DataMember]  
+			    public int? IsPublic  {get;set;}   
+                                /// <summary>
+                /// 公开时间/公示时间
+                /// </summary>    
+				
+				[Display(Name="公开时间/公示时间")]   
+								[Column("PublicTime")]   
+				[DataMember]  
+			    public DateTime? PublicTime  {get;set;}   
+                                /// <summary>
+                /// 公开人ID
+                /// </summary>    
+				
+				[Display(Name="公开人ID")]   
+								[Column("PublicUserId")]   
+				[DataMember]  
+			    public Guid? PublicUserId  {get;set;}   
+                                /// <summary>
+                /// 公开人
+                /// </summary>    
+				
+				[Display(Name="公开人")]   
+								[Column("PublicUserName")]   
+				[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>    
+				
+				[Display(Name="创建人姓名")]   
+								[Column("CreateUserName")]   
+				[DataMember]  
+			    public string CreateUserName  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("UpdateTime")]   
+				[DataMember]  
+			    public DateTime? UpdateTime  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("UpdateUserId")]   
+				[DataMember]  
+			    public Guid? UpdateUserId  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("UpdateUserName")]   
+				[DataMember]  
+			    public string UpdateUserName  {get;set;}   
+                                /// <summary>
+                /// 备注
+                /// </summary>    
+				
+				[Display(Name="备注")]   
+								[Column("Remark")]   
+				[DataMember]  
+			    public string Remark  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("Files")]   
+				[DataMember]  
+			    public string Files  {get;set;}   
+                                /// <summary>
+                /// 被征收人
+                /// </summary>    
+				
+				[Display(Name="被征收人")]   
+								[Column("Bzsr")]   
+				[DataMember]  
+			    public string Bzsr  {get;set;}   
+                                /// <summary>
+                /// 房屋坐落
+                /// </summary>    
+				
+				[Display(Name="房屋坐落")]   
+								[Column("Fwzl")]   
+				[DataMember]  
+			    public string Fwzl  {get;set;}   
+                                /// <summary>
+                /// 建筑面积
+                /// </summary>    
+				
+				[Display(Name="建筑面积")]   
+								[Column("Jzmj")]   
+				[DataMember]  
+			    public string Jzmj  {get;set;}   
+                                /// <summary>
+                /// 土地面积
+                /// </summary>    
+				
+				[Display(Name="土地面积")]   
+								[Column("Tdmj")]   
+				[DataMember]  
+			    public string Tdmj  {get;set;}   
+                                /// <summary>
+                /// 阁楼补偿费
+                /// </summary>    
+				
+				[Display(Name="阁楼补偿费")]   
+								[Column("AtticAssessedValue")]   
+				[DataMember]  
+			    public decimal? AtticAssessedValue  {get;set;}   
+                                /// <summary>
+                /// 超容积率土地补偿费
+                /// </summary>    
+				
+				[Display(Name="超容积率土地补偿费")]   
+								[Column("ExceedLandMoney")]   
+				[DataMember]  
+			    public decimal? ExceedLandMoney  {get;set;}   
+                                /// <summary>
+                /// 超容积率土地
+                /// </summary>    
+				
+				[Display(Name="超容积率土地")]   
+								[Column("ExceedLand")]   
+				[DataMember]  
+			    public decimal? ExceedLand  {get;set;}   
+                                /// <summary>
+                /// 编号
+                /// </summary>    
+				
+				[Display(Name="编号")]   
+								[Column("No")]   
+				[DataMember]  
+			    public string No  {get;set;}   
+                                /// <summary>
+                /// 建筑面积
+                /// </summary>    
+				
+				[Display(Name="建筑面积")]   
+								[Column("BuildingArea")]   
+				[DataMember]  
+			    public decimal? BuildingArea  {get;set;}   
+                                /// <summary>
+                /// 土地面积
+                /// </summary>    
+				
+				[Display(Name="土地面积")]   
+								[Column("LandArea")]   
+				[DataMember]  
+			    public decimal? LandArea  {get;set;}   
+                                /// <summary>
+                /// 房屋部位
+                /// </summary>    
+				
+				[Display(Name="房屋部位")]   
+								[Column("HousePosition")]   
+				[DataMember]  
+			    public string HousePosition  {get;set;}   
+                                /// <summary>
+                /// 价值时点
+                /// </summary>    
+				
+				[Display(Name="价值时点")]   
+								[Column("MoneyPoint")]   
+				[DataMember]  
+			    public DateTime? MoneyPoint  {get;set;}   
+                                /// <summary>
+                /// 所在层(如果是连续层次1-3)
+                /// </summary>    
+				
+				[Display(Name="所在层(如果是连续层次1-3)")]   
+								[Column("InLayer")]   
+				[DataMember]  
+			    public string InLayer  {get;set;}   
+                                /// <summary>
+                /// 总层数
+                /// </summary>    
+				
+				[Display(Name="总层数")]   
+								[Column("AllLayer")]   
+				[DataMember]  
+			    public decimal? AllLayer  {get;set;}   
+                                /// <summary>
+                /// 是否顶层阁楼：0否，1是
+                /// </summary>    
+				
+				[Display(Name="是否顶层阁楼：0否，1是")]   
+								[Column("IfHaveAttic")]   
+				[DataMember]  
+			    public int? IfHaveAttic  {get;set;}   
+                                /// <summary>
+                /// 朝向
+                /// </summary>    
+				
+				[Display(Name="朝向")]   
+								[Column("Orientation")]   
+				[DataMember]  
+			    public string Orientation  {get;set;}   
+                                /// <summary>
+                /// 结构等级ID
+                /// </summary>    
+				
+				[Display(Name="结构等级ID")]   
+								[Column("StructureID")]   
+				[DataMember]  
+			    public string StructureID  {get;set;}   
+                                /// <summary>
+                /// 结构等级
+                /// </summary>    
+				
+				[Display(Name="结构等级")]   
+								[Column("StructureID_text")]   
+				[DataMember]  
+			    public string StructureID_text  {get;set;}   
+                                /// <summary>
+                /// 建造日期
+                /// </summary>    
+				
+				[Display(Name="建造日期")]   
+								[Column("BuildYear")]   
+				[DataMember]  
+			    public DateTime? BuildYear  {get;set;}   
+                                /// <summary>
+                /// 建成年份
+                /// </summary>    
+				
+				[Display(Name="建成年份")]   
+								[Column("CompletedYear")]   
+				[DataMember]  
+			    public string CompletedYear  {get;set;}   
+                                /// <summary>
+                /// 底层情况
+                /// </summary>    
+				
+				[Display(Name="底层情况")]   
+								[Column("Underlying")]   
+				[DataMember]  
+			    public string Underlying  {get;set;}   
+                                /// <summary>
+                /// 地段
+                /// </summary>    
+				
+				[Display(Name="地段")]   
+								[Column("Section")]   
+				[DataMember]  
+			    public string Section  {get;set;}   
+                                /// <summary>
+                /// 土地性质
+                /// </summary>    
+				
+				[Display(Name="土地性质")]   
+								[Column("LandWay")]   
+				[DataMember]  
+			    public string LandWay  {get;set;}   
+                                /// <summary>
+                /// 独用天井使用面积
+                /// </summary>    
+				
+				[Display(Name="独用天井使用面积")]   
+								[Column("CourtyardArea")]   
+				[DataMember]  
+			    public decimal? CourtyardArea  {get;set;}   
+                                /// <summary>
+                /// 独用晒台使用面积
+                /// </summary>    
+				
+				[Display(Name="独用晒台使用面积")]   
+								[Column("ShaitaiArea")]   
+				[DataMember]  
+			    public decimal? ShaitaiArea  {get;set;}   
+                                /// <summary>
+                /// 围墙类别
+                /// </summary>    
+				
+				[Display(Name="围墙类别")]   
+								[Column("WallType")]   
+				[DataMember]  
+			    public string WallType  {get;set;}   
+                                /// <summary>
+                /// 围墙面积
+                /// </summary>    
+				
+				[Display(Name="围墙面积")]   
+								[Column("WallArea")]   
+				[DataMember]  
+			    public decimal? WallArea  {get;set;}   
+                                /// <summary>
+                /// 车房类别
+                /// </summary>    
+				
+				[Display(Name="车房类别")]   
+								[Column("GarageType")]   
+				[DataMember]  
+			    public string GarageType  {get;set;}   
+                                /// <summary>
+                /// 车房房号
+                /// </summary>    
+				
+				[Display(Name="车房房号")]   
+								[Column("GarageNo")]   
+				[DataMember]  
+			    public string GarageNo  {get;set;}   
+                                /// <summary>
+                /// 车房面积
+                /// </summary>    
+				
+				[Display(Name="车房面积")]   
+								[Column("GarageArea")]   
+				[DataMember]  
+			    public decimal? GarageArea  {get;set;}   
+                                /// <summary>
+                /// 评估比准价
+                /// </summary>    
+				
+				[Display(Name="评估比准价")]   
+								[Column("PG_UnitMoney")]   
+				[DataMember]  
+			    public decimal? PG_UnitMoney  {get;set;}   
+                                /// <summary>
+                /// 结构修正系数
+                /// </summary>    
+				
+				[Display(Name="结构修正系数")]   
+								[Column("StructureRatio")]   
+				[DataMember]  
+			    public decimal? StructureRatio  {get;set;}   
+                                /// <summary>
+                /// 使用年限调整系数
+                /// </summary>    
+				
+				[Display(Name="使用年限调整系数")]   
+								[Column("YearRatio")]   
+				[DataMember]  
+			    public decimal? YearRatio  {get;set;}   
+                                /// <summary>
+                /// 朝向差价率
+                /// </summary>    
+				
+				[Display(Name="朝向差价率")]   
+								[Column("OrientationRatio")]   
+				[DataMember]  
+			    public decimal? OrientationRatio  {get;set;}   
+                                /// <summary>
+                /// 层次差价率
+                /// </summary>    
+				
+				[Display(Name="层次差价率")]   
+								[Column("LayerRatio")]   
+				[DataMember]  
+			    public decimal? LayerRatio  {get;set;}   
+                                /// <summary>
+                /// 层高修正系数
+                /// </summary>    
+				
+				[Display(Name="层高修正系数")]   
+								[Column("LayerHighRatio")]   
+				[DataMember]  
+			    public decimal? LayerHighRatio  {get;set;}   
+                                /// <summary>
+                /// 容积率修正系数
+                /// </summary>    
+				
+				[Display(Name="容积率修正系数")]   
+								[Column("VolumeRatio")]   
+				[DataMember]  
+			    public decimal? VolumeRatio  {get;set;}   
+                                /// <summary>
+                /// 装修面积小计
+                /// </summary>    
+				
+				[Display(Name="装修面积小计")]   
+								[Column("DecorateArea")]   
+				[DataMember]  
+			    public decimal? DecorateArea  {get;set;}   
+                                /// <summary>
+                /// 土地补偿金额
+                /// </summary>    
+				
+				[Display(Name="土地补偿金额")]   
+								[Column("LandCompensationMoney")]   
+				[DataMember]  
+			    public decimal? LandCompensationMoney  {get;set;}   
+                                /// <summary>
+                /// 土地出让金
+                /// </summary>    
+				
+				[Display(Name="土地出让金")]   
+								[Column("LandTransferMoney")]   
+				[DataMember]  
+			    public decimal? LandTransferMoney  {get;set;}   
+                                /// <summary>
+                /// 备注
+                /// </summary>    
+				
+				[Display(Name="备注")]   
+								[Column("Note")]   
+				[DataMember]  
+			    public string Note  {get;set;}   
+                                /// <summary>
+                /// 装修评估类型类型：0按面积装修评估 | 1分部分项装修
+                /// </summary>    
+				
+				[Display(Name="装修评估类型类型：0按面积装修评估 | 1分部分项装修")]   
+								[Column("DecorationType")]   
+				[DataMember]  
+			    public int DecorationType  {get;set;}   
+                                /// <summary>
+                /// 附属物评估类型：0通用附属物评估 | 1其他附属物评估
+                /// </summary>    
+				
+				[Display(Name="附属物评估类型：0通用附属物评估 | 1其他附属物评估")]   
+								[Column("AttachedType")]   
+				[DataMember]  
+			    public int AttachedType  {get;set;}   
+                                /// <summary>
+                /// 地价调整
+                /// </summary>    
+				
+				[Display(Name="地价调整")]   
+								[Column("AdjustLandMoney")]   
+				[DataMember]  
+			    public decimal? AdjustLandMoney  {get;set;}   
+                                /// <summary>
+                /// 金额选择：0超容积率土地评估金额 | 1土地出让金 | 2地价调整
+                /// </summary>    
+				
+				[Display(Name="金额选择：0超容积率土地评估金额 | 1土地出让金 | 2地价调整")]   
+								[Column("MoneyChoose")]   
+				[DataMember]  
+			    public string MoneyChoose  {get;set;}   
+                                /// <summary>
+                /// 评估方法：0-直接金额录入 1-普通报告录入 2-自定义报告录入
+                /// </summary>    
+				
+				[Display(Name="评估方法：0-直接金额录入 1-普通报告录入 2-自定义报告录入")]   
+								[Column("ValuationMethod")]   
+				[DataMember]  
+			    public int ValuationMethod  {get;set;}   
+                                /// <summary>
+                /// 评估项目状态：0-未使用 1-初审 2-二审 3-终审 4-终审通过
+                /// </summary>    
+				
+				[Display(Name="评估项目状态：0-未使用 1-初审 2-二审 3-终审 4-终审通过")]   
+								[Column("ValuationStatus")]   
+				[DataMember]  
+			    public int ValuationStatus  {get;set;}   
+                                /// <summary>
+                /// 通过终审后的打印次数
+                /// </summary>    
+				
+				[Display(Name="通过终审后的打印次数")]   
+								[Column("PrintTimes")]   
+				[DataMember]  
+			    public int? PrintTimes  {get;set;}   
+                                /// <summary>
+                /// 底层无自行车房的普通住宅房屋层次差价率
+                /// </summary>    
+				
+				[Display(Name="底层无自行车房的普通住宅房屋层次差价率")]   
+								[Column("NoData")]   
+				[DataMember]  
+			    public string NoData  {get;set;}   
+                                /// <summary>
+                /// 底层为自行车房的普通住宅房屋层次差价率
+                /// </summary>    
+				
+				[Display(Name="底层为自行车房的普通住宅房屋层次差价率")]   
+								[Column("BicycleData")]   
+				[DataMember]  
+			    public string BicycleData  {get;set;}   
+                                /// <summary>
+                /// 住宅房屋朝向差价率
+                /// </summary>    
+				
+				[Display(Name="住宅房屋朝向差价率")]   
+								[Column("OrientationRadioData")]   
+				[DataMember]  
+			    public string OrientationRadioData  {get;set;}   
+                                /// <summary>
+                /// 住宅房屋结构等级修正系数
+                /// </summary>    
+				
+				[Display(Name="住宅房屋结构等级修正系数")]   
+								[Column("StructureData")]   
+				[DataMember]  
+			    public string StructureData  {get;set;}   
+                                /// <summary>
+                /// 主要附属物评估标准
+                /// </summary>    
+				
+				[Display(Name="主要附属物评估标准")]   
+								[Column("AppendagesData")]   
+				[DataMember]  
+			    public string AppendagesData  {get;set;}   
+                                /// <summary>
+                /// 中高层住宅房屋层次差价率
+                /// </summary>    
+				
+				[Display(Name="中高层住宅房屋层次差价率")]   
+								[Column("MiddleHighData")]   
+				[DataMember]  
+			    public string MiddleHighData  {get;set;}   
+                                /// <summary>
+                /// 房屋部位：0不显示；1显示
+                /// </summary>    
+				
+				[Display(Name="房屋部位：0不显示；1显示")]   
+								[Column("HouseLocaion")]   
+				[DataMember]  
+			    public int? HouseLocaion  {get;set;}   
+                                /// <summary>
+                /// 评估自定义概况：0不显示；1显示
+                /// </summary>    
+				
+				[Display(Name="评估自定义概况：0不显示；1显示")]   
+								[Column("Survey")]   
+				[DataMember]  
+			    public int? Survey  {get;set;}   
+                                /// <summary>
+                /// 主要附属物：0不显示；1显示
+                /// </summary>    
+				
+				[Display(Name="主要附属物：0不显示；1显示")]   
+								[Column("ImportantFsw")]   
+				[DataMember]  
+			    public int? ImportantFsw  {get;set;}   
+                                /// <summary>
+                /// 附属物：0不显示；1显示
+                /// </summary>    
+				
+				[Display(Name="附属物：0不显示；1显示")]   
+								[Column("Attached")]   
+				[DataMember]  
+			    public int? Attached  {get;set;}   
+                                /// <summary>
+                /// 未登记建筑评估：0不显示；1显示
+                /// </summary>    
+				
+				[Display(Name="未登记建筑评估：0不显示；1显示")]   
+								[Column("Other")]   
+				[DataMember]  
+			    public int? Other  {get;set;}   
+                                /// <summary>
+                /// 其他因素修正系数
+                /// </summary>    
+				
+				[Display(Name="其他因素修正系数")]   
+								[Column("OtherRatio")]   
+				[DataMember]  
+			    public decimal? OtherRatio  {get;set;}   
+                                /// <summary>
+                /// 补缴土地出让金
+                /// </summary>    
+				
+				[Display(Name="补缴土地出让金")]   
+								[Column("PaymentLandTransferMoney")]   
+				[DataMember]  
+			    public decimal? PaymentLandTransferMoney  {get;set;}   
+                                /// <summary>
+                /// 是否落地房
+                /// </summary>    
+				
+				[Display(Name="是否落地房")]   
+								[Column("IsLDF")]   
+				[DataMember]  
+			    public string IsLDF  {get;set;}   
+                                /// <summary>
+                /// 土地出让金计算公式
+                /// </summary>    
+				
+				[Display(Name="土地出让金计算公式")]   
+								[Column("LandTransferMoneyFormula")]   
+				[DataMember]  
+			    public string LandTransferMoneyFormula  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("Carrymode")]   
+				[DataMember]  
+			    public string Carrymode  {get;set;}   
+                                /// <summary>
+                /// 分户评估附件
+                /// </summary>    
+				
+				[Display(Name="分户评估附件")]   
+								[Column("AssementFile")]   
+				[DataMember]  
+			    public string AssementFile  {get;set;}   
+                 
+		  }
+
+		  /**
+            /// <summary>
+            /// 数据表实体类Map：InvestigateTable_Assessment 
+            /// </summary>
+            public class InvestigateTable_AssessmentMap : EntityTypeConfiguration<InvestigateTable_Assessment>
+			{
+                public InvestigateTable_AssessmentMap()
+                {
+					this.ToTable("InvestigateTable_Assessment");
+												this.HasKey(t => t.ID);
+													 this.Property(t => t.ProjectId).HasColumnName("ProjectId");
+													 this.Property(t => t.ProjectName).HasColumnName("ProjectName");
+													 this.Property(t => t.InvestigateTableID).HasColumnName("InvestigateTableID").IsRequired();
+													 this.Property(t => t.HousingAssessmentValue).HasColumnName("HousingAssessmentValue");
+													 this.Property(t => t.DecorateAssessedValue).HasColumnName("DecorateAssessedValue");
+													 this.Property(t => t.AttachedAssessedValue).HasColumnName("AttachedAssessedValue");
+													 this.Property(t => t.countValue).HasColumnName("countValue");
+													 this.Property(t => t.EstimatorsUserId).HasColumnName("EstimatorsUserId");
+													 this.Property(t => t.AssessmentNo).HasColumnName("AssessmentNo");
+													 this.Property(t => t.EstimatorsDate).HasColumnName("EstimatorsDate");
+													 this.Property(t => t.IsFinal).HasColumnName("IsFinal").IsRequired();
+													 this.Property(t => t.IsInRecord).HasColumnName("IsInRecord");
+													 this.Property(t => t.InRecordTime).HasColumnName("InRecordTime");
+													 this.Property(t => t.InRecordUserId).HasColumnName("InRecordUserId");
+													 this.Property(t => t.InRecordUserName).HasColumnName("InRecordUserName");
+													 this.Property(t => t.IsPublic).HasColumnName("IsPublic");
+													 this.Property(t => t.PublicTime).HasColumnName("PublicTime");
+													 this.Property(t => t.PublicUserId).HasColumnName("PublicUserId");
+													 this.Property(t => t.PublicUserName).HasColumnName("PublicUserName");
+													 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.Bzsr).HasColumnName("Bzsr");
+													 this.Property(t => t.Fwzl).HasColumnName("Fwzl");
+													 this.Property(t => t.Jzmj).HasColumnName("Jzmj");
+													 this.Property(t => t.Tdmj).HasColumnName("Tdmj");
+													 this.Property(t => t.AtticAssessedValue).HasColumnName("AtticAssessedValue");
+													 this.Property(t => t.ExceedLandMoney).HasColumnName("ExceedLandMoney");
+													 this.Property(t => t.ExceedLand).HasColumnName("ExceedLand");
+													 this.Property(t => t.No).HasColumnName("No");
+													 this.Property(t => t.BuildingArea).HasColumnName("BuildingArea");
+													 this.Property(t => t.LandArea).HasColumnName("LandArea");
+													 this.Property(t => t.HousePosition).HasColumnName("HousePosition");
+													 this.Property(t => t.MoneyPoint).HasColumnName("MoneyPoint");
+													 this.Property(t => t.InLayer).HasColumnName("InLayer");
+													 this.Property(t => t.AllLayer).HasColumnName("AllLayer");
+													 this.Property(t => t.IfHaveAttic).HasColumnName("IfHaveAttic");
+													 this.Property(t => t.Orientation).HasColumnName("Orientation");
+													 this.Property(t => t.StructureID).HasColumnName("StructureID");
+													 this.Property(t => t.StructureID_text).HasColumnName("StructureID_text");
+													 this.Property(t => t.BuildYear).HasColumnName("BuildYear");
+													 this.Property(t => t.CompletedYear).HasColumnName("CompletedYear");
+													 this.Property(t => t.Underlying).HasColumnName("Underlying");
+													 this.Property(t => t.Section).HasColumnName("Section");
+													 this.Property(t => t.LandWay).HasColumnName("LandWay");
+													 this.Property(t => t.CourtyardArea).HasColumnName("CourtyardArea");
+													 this.Property(t => t.ShaitaiArea).HasColumnName("ShaitaiArea");
+													 this.Property(t => t.WallType).HasColumnName("WallType");
+													 this.Property(t => t.WallArea).HasColumnName("WallArea");
+													 this.Property(t => t.GarageType).HasColumnName("GarageType");
+													 this.Property(t => t.GarageNo).HasColumnName("GarageNo");
+													 this.Property(t => t.GarageArea).HasColumnName("GarageArea");
+													 this.Property(t => t.PG_UnitMoney).HasColumnName("PG_UnitMoney");
+													 this.Property(t => t.StructureRatio).HasColumnName("StructureRatio");
+													 this.Property(t => t.YearRatio).HasColumnName("YearRatio");
+													 this.Property(t => t.OrientationRatio).HasColumnName("OrientationRatio");
+													 this.Property(t => t.LayerRatio).HasColumnName("LayerRatio");
+													 this.Property(t => t.LayerHighRatio).HasColumnName("LayerHighRatio");
+													 this.Property(t => t.VolumeRatio).HasColumnName("VolumeRatio");
+													 this.Property(t => t.DecorateArea).HasColumnName("DecorateArea");
+													 this.Property(t => t.LandCompensationMoney).HasColumnName("LandCompensationMoney");
+													 this.Property(t => t.LandTransferMoney).HasColumnName("LandTransferMoney");
+													 this.Property(t => t.Note).HasColumnName("Note");
+													 this.Property(t => t.DecorationType).HasColumnName("DecorationType").IsRequired();
+													 this.Property(t => t.AttachedType).HasColumnName("AttachedType").IsRequired();
+													 this.Property(t => t.AdjustLandMoney).HasColumnName("AdjustLandMoney");
+													 this.Property(t => t.MoneyChoose).HasColumnName("MoneyChoose");
+													 this.Property(t => t.ValuationMethod).HasColumnName("ValuationMethod").IsRequired();
+													 this.Property(t => t.ValuationStatus).HasColumnName("ValuationStatus").IsRequired();
+													 this.Property(t => t.PrintTimes).HasColumnName("PrintTimes");
+													 this.Property(t => t.NoData).HasColumnName("NoData");
+													 this.Property(t => t.BicycleData).HasColumnName("BicycleData");
+													 this.Property(t => t.OrientationRadioData).HasColumnName("OrientationRadioData");
+													 this.Property(t => t.StructureData).HasColumnName("StructureData");
+													 this.Property(t => t.AppendagesData).HasColumnName("AppendagesData");
+													 this.Property(t => t.MiddleHighData).HasColumnName("MiddleHighData");
+													 this.Property(t => t.HouseLocaion).HasColumnName("HouseLocaion");
+													 this.Property(t => t.Survey).HasColumnName("Survey");
+													 this.Property(t => t.ImportantFsw).HasColumnName("ImportantFsw");
+													 this.Property(t => t.Attached).HasColumnName("Attached");
+													 this.Property(t => t.Other).HasColumnName("Other");
+													 this.Property(t => t.OtherRatio).HasColumnName("OtherRatio");
+													 this.Property(t => t.PaymentLandTransferMoney).HasColumnName("PaymentLandTransferMoney");
+													 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.AssementFile).HasColumnName("AssementFile");
+										}
+			}**/
+
+	}
+
+	//----------InvestigateTable_Assessment结束----------
+
+	

Ewide.Nbzs.Entity/DataBase/NonInvestigateTable_Assessment.cs

@@ -0,0 +1,360 @@
+	//----------NonInvestigateTable_Assessment开始----------
+    
+	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
+	{	
+        /// <summary>
+        /// 数据表实体类：NonInvestigateTable_Assessment 
+        /// </summary>
+		[Table("NonInvestigateTable_Assessment")]
+        public partial class NonInvestigateTable_Assessment: BaseEntity        {    
+		                    /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+				[Key]
+								[Column("ID")]   
+				[DataMember]  
+			    public Guid ID  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("ProjectId")]   
+				[DataMember]  
+			    public Guid? ProjectId  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("ProjectName")]   
+				[DataMember]  
+			    public string ProjectName  {get;set;}   
+                                /// <summary>
+                /// 非住宅调查表ID
+                /// </summary>    
+				
+				[Display(Name="非住宅调查表ID")]   
+								[Column("NonInvestigateTableID")]   
+				[DataMember]  
+			    public Guid NonInvestigateTableID  {get;set;}   
+                                /// <summary>
+                /// 房屋评估价值
+                /// </summary>    
+				
+				[Display(Name="房屋评估价值")]   
+								[Column("HousingAssessmentValue")]   
+				[DataMember]  
+			    public decimal? HousingAssessmentValue  {get;set;}   
+                                /// <summary>
+                /// 装修评估价值
+                /// </summary>    
+				
+				[Display(Name="装修评估价值")]   
+								[Column("DecorateAssessedValue")]   
+				[DataMember]  
+			    public decimal? DecorateAssessedValue  {get;set;}   
+                                /// <summary>
+                /// 附属物评估价值
+                /// </summary>    
+				
+				[Display(Name="附属物评估价值")]   
+								[Column("AttachedAssessedValue")]   
+				[DataMember]  
+			    public decimal? AttachedAssessedValue  {get;set;}   
+                                /// <summary>
+                /// 总价
+                /// </summary>    
+				
+				[Display(Name="总价")]   
+								[Column("countValue")]   
+				[DataMember]  
+			    public decimal? countValue  {get;set;}   
+                                /// <summary>
+                /// 评估人员
+                /// </summary>    
+				
+				[Display(Name="评估人员")]   
+								[Column("EstimatorsUserId")]   
+				[DataMember]  
+			    public Guid? EstimatorsUserId  {get;set;}   
+                                /// <summary>
+                /// 评估报告编号
+                /// </summary>    
+				
+				[Display(Name="评估报告编号")]   
+								[Column("AssessmentNo")]   
+				[DataMember]  
+			    public string AssessmentNo  {get;set;}   
+                                /// <summary>
+                /// 评估时间
+                /// </summary>    
+				
+				[Display(Name="评估时间")]   
+								[Column("EstimatorsDate")]   
+				[DataMember]  
+			    public DateTime? EstimatorsDate  {get;set;}   
+                                /// <summary>
+                /// 是否最终
+                /// </summary>    
+				
+				[Display(Name="是否最终")]   
+								[Column("IsFinal")]   
+				[DataMember]  
+			    public int IsFinal  {get;set;}   
+                                /// <summary>
+                /// 是否备案
+                /// </summary>    
+				
+				[Display(Name="是否备案")]   
+								[Column("IsInRecord")]   
+				[DataMember]  
+			    public int? IsInRecord  {get;set;}   
+                                /// <summary>
+                /// 备案时间
+                /// </summary>    
+				
+				[Display(Name="备案时间")]   
+								[Column("InRecordTime")]   
+				[DataMember]  
+			    public DateTime? InRecordTime  {get;set;}   
+                                /// <summary>
+                /// 备案人ID
+                /// </summary>    
+				
+				[Display(Name="备案人ID")]   
+								[Column("InRecordUserId")]   
+				[DataMember]  
+			    public Guid? InRecordUserId  {get;set;}   
+                                /// <summary>
+                /// 备案人
+                /// </summary>    
+				
+				[Display(Name="备案人")]   
+								[Column("InRecordUserName")]   
+				[DataMember]  
+			    public string InRecordUserName  {get;set;}   
+                                /// <summary>
+                /// 是否公开，是否公示
+                /// </summary>    
+				
+				[Display(Name="是否公开，是否公示")]   
+								[Column("IsPublic")]   
+				[DataMember]  
+			    public int? IsPublic  {get;set;}   
+                                /// <summary>
+                /// 公开时间，公示时间
+                /// </summary>    
+				
+				[Display(Name="公开时间，公示时间")]   
+								[Column("PublicTime")]   
+				[DataMember]  
+			    public DateTime? PublicTime  {get;set;}   
+                                /// <summary>
+                /// 公开人ID
+                /// </summary>    
+				
+				[Display(Name="公开人ID")]   
+								[Column("PublicUserId")]   
+				[DataMember]  
+			    public Guid? PublicUserId  {get;set;}   
+                                /// <summary>
+                /// 公开人
+                /// </summary>    
+				
+				[Display(Name="公开人")]   
+								[Column("PublicUserName")]   
+				[DataMember]  
+			    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="无描述")]   
+								[Column("CreateUserName")]   
+				[DataMember]  
+			    public string CreateUserName  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("UpdateTime")]   
+				[DataMember]  
+			    public DateTime? UpdateTime  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("UpdateUserId")]   
+				[DataMember]  
+			    public Guid? UpdateUserId  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("UpdateUserName")]   
+				[DataMember]  
+			    public string UpdateUserName  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("Remark")]   
+				[DataMember]  
+			    public string Remark  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("Files")]   
+				[DataMember]  
+			    public string Files  {get;set;}   
+                                /// <summary>
+                /// 房屋类型名字
+                /// </summary>    
+				
+				[Display(Name="房屋类型名字")]   
+								[Column("HousingTypeName")]   
+				[DataMember]  
+			    public string HousingTypeName  {get;set;}   
+                                /// <summary>
+                /// 房屋类型价值
+                /// </summary>    
+				
+				[Display(Name="房屋类型价值")]   
+								[Column("HousingTypeValue")]   
+				[DataMember]  
+			    public string HousingTypeValue  {get;set;}   
+                                /// <summary>
+                /// 超容积率土地补偿费
+                /// </summary>    
+				
+				[Display(Name="超容积率土地补偿费")]   
+								[Column("ExceedLandMoney")]   
+				[DataMember]  
+			    public decimal? ExceedLandMoney  {get;set;}   
+                                /// <summary>
+                /// 超容积率土地
+                /// </summary>    
+				
+				[Display(Name="超容积率土地")]   
+								[Column("ExceedLand")]   
+				[DataMember]  
+			    public decimal? ExceedLand  {get;set;}   
+                                /// <summary>
+                /// 评估方法：0-直接金额录入 1-普通报告录入
+                /// </summary>    
+				
+				[Display(Name="评估方法：0-直接金额录入 1-普通报告录入")]   
+								[Column("ValuationMethod")]   
+				[DataMember]  
+			    public int ValuationMethod  {get;set;}   
+                                /// <summary>
+                /// 评估项目状态：0-未使用 1-初审 2-二审 3-终审
+                /// </summary>    
+				
+				[Display(Name="评估项目状态：0-未使用 1-初审 2-二审 3-终审")]   
+								[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("AssementFile")]   
+				[DataMember]  
+			    public string AssementFile  {get;set;}   
+                 
+		  }
+
+		  /**
+            /// <summary>
+            /// 数据表实体类Map：NonInvestigateTable_Assessment 
+            /// </summary>
+            public class NonInvestigateTable_AssessmentMap : EntityTypeConfiguration<NonInvestigateTable_Assessment>
+			{
+                public NonInvestigateTable_AssessmentMap()
+                {
+					this.ToTable("NonInvestigateTable_Assessment");
+												this.HasKey(t => t.ID);
+													 this.Property(t => t.ProjectId).HasColumnName("ProjectId");
+													 this.Property(t => t.ProjectName).HasColumnName("ProjectName");
+													 this.Property(t => t.NonInvestigateTableID).HasColumnName("NonInvestigateTableID").IsRequired();
+													 this.Property(t => t.HousingAssessmentValue).HasColumnName("HousingAssessmentValue");
+													 this.Property(t => t.DecorateAssessedValue).HasColumnName("DecorateAssessedValue");
+													 this.Property(t => t.AttachedAssessedValue).HasColumnName("AttachedAssessedValue");
+													 this.Property(t => t.countValue).HasColumnName("countValue");
+													 this.Property(t => t.EstimatorsUserId).HasColumnName("EstimatorsUserId");
+													 this.Property(t => t.AssessmentNo).HasColumnName("AssessmentNo");
+													 this.Property(t => t.EstimatorsDate).HasColumnName("EstimatorsDate");
+													 this.Property(t => t.IsFinal).HasColumnName("IsFinal").IsRequired();
+													 this.Property(t => t.IsInRecord).HasColumnName("IsInRecord");
+													 this.Property(t => t.InRecordTime).HasColumnName("InRecordTime");
+													 this.Property(t => t.InRecordUserId).HasColumnName("InRecordUserId");
+													 this.Property(t => t.InRecordUserName).HasColumnName("InRecordUserName");
+													 this.Property(t => t.IsPublic).HasColumnName("IsPublic");
+													 this.Property(t => t.PublicTime).HasColumnName("PublicTime");
+													 this.Property(t => t.PublicUserId).HasColumnName("PublicUserId");
+													 this.Property(t => t.PublicUserName).HasColumnName("PublicUserName");
+													 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.HousingTypeName).HasColumnName("HousingTypeName");
+													 this.Property(t => t.HousingTypeValue).HasColumnName("HousingTypeValue");
+													 this.Property(t => t.ExceedLandMoney).HasColumnName("ExceedLandMoney");
+													 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.AssementFile).HasColumnName("AssementFile");
+										}
+			}**/
+
+	}
+
+	//----------NonInvestigateTable_Assessment结束----------
+
+	

Ewide.Nbzs.Entity/DataBase/NonResidentialInvestigateTable.cs

@@ -0,0 +1,819 @@
+	//----------NonResidentialInvestigateTable开始----------
+    
+	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
+	{	
+        /// <summary>
+        /// 数据表实体类：NonResidentialInvestigateTable 
+        /// </summary>
+		[Table("NonResidentialInvestigateTable")]
+        public partial class NonResidentialInvestigateTable: BaseEntity        {    
+		                    /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+				[Key]
+								[Column("ID")]   
+				[DataMember]  
+			    public Guid ID  {get;set;}   
+                                /// <summary>
+                /// 非住宅调查表编号
+                /// </summary>    
+				
+				[Display(Name="非住宅调查表编号")]   
+								[Column("No")]   
+				[DataMember]  
+			    public string No  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("ProjectId")]   
+				[DataMember]  
+			    public Guid ProjectId  {get;set;}   
+                                /// <summary>
+                /// 项目名称
+                /// </summary>    
+				
+				[Display(Name="项目名称")]   
+								[Column("ProjectName")]   
+				[DataMember]  
+			    public string ProjectName  {get;set;}   
+                                /// <summary>
+                /// 产权人
+                /// </summary>    
+				
+				[Display(Name="产权人")]   
+								[Column("PropertyRightPrson")]   
+				[DataMember]  
+			    public string PropertyRightPrson  {get;set;}   
+                                /// <summary>
+                /// 身份证，证件号码
+                /// </summary>    
+				
+				[Display(Name="身份证，证件号码")]   
+								[Column("PropertyRightPrsonCardNo")]   
+				[DataMember]  
+			    public string PropertyRightPrsonCardNo  {get;set;}   
+                                /// <summary>
+                /// 法定代表人
+                /// </summary>    
+				
+				[Display(Name="法定代表人")]   
+								[Column("TheLegalRepresentative")]   
+				[DataMember]  
+			    public string TheLegalRepresentative  {get;set;}   
+                                /// <summary>
+                /// 法定代表人联系电话
+                /// </summary>    
+				
+				[Display(Name="法定代表人联系电话")]   
+								[Column("TheLegalRepresentativePhone")]   
+				[DataMember]  
+			    public string TheLegalRepresentativePhone  {get;set;}   
+                                /// <summary>
+                /// 承租人
+                /// </summary>    
+				
+				[Display(Name="承租人")]   
+								[Column("Lessee")]   
+				[DataMember]  
+			    public string Lessee  {get;set;}   
+                                /// <summary>
+                /// 承租人证件号码
+                /// </summary>    
+				
+				[Display(Name="承租人证件号码")]   
+								[Column("LesseeCardNo")]   
+				[DataMember]  
+			    public string LesseeCardNo  {get;set;}   
+                                /// <summary>
+                /// 联系电话
+                /// </summary>    
+				
+				[Display(Name="联系电话")]   
+								[Column("Phone")]   
+				[DataMember]  
+			    public string Phone  {get;set;}   
+                                /// <summary>
+                /// 营业执照号
+                /// </summary>    
+				
+				[Display(Name="营业执照号")]   
+								[Column("BusinessLicenseNo")]   
+				[DataMember]  
+			    public string BusinessLicenseNo  {get;set;}   
+                                /// <summary>
+                /// 房屋坐落
+                /// </summary>    
+				
+				[Display(Name="房屋坐落")]   
+								[Column("HouseAddress")]   
+				[DataMember]  
+			    public string HouseAddress  {get;set;}   
+                                /// <summary>
+                /// 产权性质ID
+                /// </summary>    
+				
+				[Display(Name="产权性质ID")]   
+								[Column("NatureOfPropertyID")]   
+				[DataMember]  
+			    public string NatureOfPropertyID  {get;set;}   
+                                /// <summary>
+                /// 产权性质
+                /// </summary>    
+				
+				[Display(Name="产权性质")]   
+								[Column("NatureOfProperty")]   
+				[DataMember]  
+			    public string NatureOfProperty  {get;set;}   
+                                /// <summary>
+                /// 权证建筑面积
+                /// </summary>    
+				
+				[Display(Name="权证建筑面积")]   
+								[Column("BuildingArea")]   
+				[DataMember]  
+			    public decimal? BuildingArea  {get;set;}   
+                                /// <summary>
+                /// 使用情况ID 关联字典表ID
+                /// </summary>    
+				
+				[Display(Name="使用情况ID 关联字典表ID")]   
+								[Column("UsageID")]   
+				[DataMember]  
+			    public Guid? UsageID  {get;set;}   
+                                /// <summary>
+                /// 使用状况
+                /// </summary>    
+				
+				[Display(Name="使用状况")]   
+								[Column("UsageSituation")]   
+				[DataMember]  
+			    public string UsageSituation  {get;set;}   
+                                /// <summary>
+                /// 土地证号
+                /// </summary>    
+				
+				[Display(Name="土地证号")]   
+								[Column("LandCardNo")]   
+				[DataMember]  
+			    public string LandCardNo  {get;set;}   
+                                /// <summary>
+                /// 土地证记载面积
+                /// </summary>    
+				
+				[Display(Name="土地证记载面积")]   
+								[Column("LandCardArea")]   
+				[DataMember]  
+			    public decimal? LandCardArea  {get;set;}   
+                                /// <summary>
+                /// 土地证记载用途/房屋用途
+                /// </summary>    
+				
+				[Display(Name="土地证记载用途/房屋用途")]   
+								[Column("LandCardUse")]   
+				[DataMember]  
+			    public string LandCardUse  {get;set;}   
+                                /// <summary>
+                /// 土地取得方式
+                /// </summary>    
+				
+				[Display(Name="土地取得方式")]   
+								[Column("LandAchieveWay")]   
+				[DataMember]  
+			    public string LandAchieveWay  {get;set;}   
+                                /// <summary>
+                /// 商业-房号
+                /// </summary>    
+				
+				[Display(Name="商业-房号")]   
+								[Column("BusinessHouseNo")]   
+				[DataMember]  
+			    public string BusinessHouseNo  {get;set;}   
+                                /// <summary>
+                /// 商业-结构等级
+                /// </summary>    
+				
+				[Display(Name="商业-结构等级")]   
+								[Column("BusinessStructureLevel")]   
+				[DataMember]  
+			    public string BusinessStructureLevel  {get;set;}   
+                                /// <summary>
+                /// 商业-建筑面积
+                /// </summary>    
+				
+				[Display(Name="商业-建筑面积")]   
+								[Column("BusinessBuildArea")]   
+				[DataMember]  
+			    public decimal? BusinessBuildArea  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("LandAcquisitionBCWillingness")]   
+				[DataMember]  
+			    public string LandAcquisitionBCWillingness  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("Razon")]   
+				[DataMember]  
+			    public string Razon  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("LandAcquisitionWillingness")]   
+				[DataMember]  
+			    public string LandAcquisitionWillingness  {get;set;}   
+                                /// <summary>
+                /// 办公-房号
+                /// </summary>    
+				
+				[Display(Name="办公-房号")]   
+								[Column("OfficeHouseNo")]   
+				[DataMember]  
+			    public string OfficeHouseNo  {get;set;}   
+                                /// <summary>
+                /// 放工-结构等级
+                /// </summary>    
+				
+				[Display(Name="放工-结构等级")]   
+								[Column("OfficeStructureLevel")]   
+				[DataMember]  
+			    public string OfficeStructureLevel  {get;set;}   
+                                /// <summary>
+                /// 办公-建筑面积
+                /// </summary>    
+				
+				[Display(Name="办公-建筑面积")]   
+								[Column("OfficeBuildArea")]   
+				[DataMember]  
+			    public decimal? OfficeBuildArea  {get;set;}   
+                                /// <summary>
+                /// 工业-房号
+                /// </summary>    
+				
+				[Display(Name="工业-房号")]   
+								[Column("IndustrialHouseNo")]   
+				[DataMember]  
+			    public string IndustrialHouseNo  {get;set;}   
+                                /// <summary>
+                /// 工业-结构等级
+                /// </summary>    
+				
+				[Display(Name="工业-结构等级")]   
+								[Column("IndustrialStructureLevel")]   
+				[DataMember]  
+			    public string IndustrialStructureLevel  {get;set;}   
+                                /// <summary>
+                /// 工业-建筑面积
+                /// </summary>    
+				
+				[Display(Name="工业-建筑面积")]   
+								[Column("IndustrialBuildArea")]   
+				[DataMember]  
+			    public decimal? IndustrialBuildArea  {get;set;}   
+                                /// <summary>
+                /// 仓储-房号
+                /// </summary>    
+				
+				[Display(Name="仓储-房号")]   
+								[Column("StorageHouseNo")]   
+				[DataMember]  
+			    public string StorageHouseNo  {get;set;}   
+                                /// <summary>
+                /// 仓储-结构等级
+                /// </summary>    
+				
+				[Display(Name="仓储-结构等级")]   
+								[Column("StorageStructureLevel")]   
+				[DataMember]  
+			    public string StorageStructureLevel  {get;set;}   
+                                /// <summary>
+                /// 仓储-建筑面积
+                /// </summary>    
+				
+				[Display(Name="仓储-建筑面积")]   
+								[Column("StorageBuildArea")]   
+				[DataMember]  
+			    public decimal? StorageBuildArea  {get;set;}   
+                                /// <summary>
+                /// 房屋用途中其他的名称
+                /// </summary>    
+				
+				[Display(Name="房屋用途中其他的名称")]   
+								[Column("OtherName")]   
+				[DataMember]  
+			    public string OtherName  {get;set;}   
+                                /// <summary>
+                /// 其他-房号
+                /// </summary>    
+				
+				[Display(Name="其他-房号")]   
+								[Column("OtherHouseNo")]   
+				[DataMember]  
+			    public string OtherHouseNo  {get;set;}   
+                                /// <summary>
+                /// 其他-结构等级
+                /// </summary>    
+				
+				[Display(Name="其他-结构等级")]   
+								[Column("OtherStructureLevel")]   
+				[DataMember]  
+			    public string OtherStructureLevel  {get;set;}   
+                                /// <summary>
+                /// 其他-建筑面积
+                /// </summary>    
+				
+				[Display(Name="其他-建筑面积")]   
+								[Column("OtherBuildArea")]   
+				[DataMember]  
+			    public decimal? OtherBuildArea  {get;set;}   
+                                /// <summary>
+                /// 未登记-坐落
+                /// </summary>    
+				
+				[Display(Name="未登记-坐落")]   
+								[Column("UnReg_Address")]   
+				[DataMember]  
+			    public string UnReg_Address  {get;set;}   
+                                /// <summary>
+                /// 未登记-建筑面积
+                /// </summary>    
+				
+				[Display(Name="未登记-建筑面积")]   
+								[Column("UnReg_BuildArea")]   
+				[DataMember]  
+			    public string UnReg_BuildArea  {get;set;}   
+                                /// <summary>
+                /// 未登记-建造年份
+                /// </summary>    
+				
+				[Display(Name="未登记-建造年份")]   
+								[Column("UnReg_BuildYear")]   
+				[DataMember]  
+			    public string UnReg_BuildYear  {get;set;}   
+                                /// <summary>
+                /// 未登记-实际用途
+                /// </summary>    
+				
+				[Display(Name="未登记-实际用途")]   
+								[Column("UnReg_PracticalUse")]   
+				[DataMember]  
+			    public string UnReg_PracticalUse  {get;set;}   
+                                /// <summary>
+                /// 房屋征收相关文书送达地址
+                /// </summary>    
+				
+				[Display(Name="房屋征收相关文书送达地址")]   
+								[Column("DocumentToAddress")]   
+				[DataMember]  
+			    public string DocumentToAddress  {get;set;}   
+                                /// <summary>
+                /// 收件联系人
+                /// </summary>    
+				
+				[Display(Name="收件联系人")]   
+								[Column("ReceiveContactPerson")]   
+				[DataMember]  
+			    public string ReceiveContactPerson  {get;set;}   
+                                /// <summary>
+                /// 收件联系手机
+                /// </summary>    
+				
+				[Display(Name="收件联系手机")]   
+								[Column("ReceiveContactPhone")]   
+				[DataMember]  
+			    public string ReceiveContactPhone  {get;set;}   
+                                /// <summary>
+                /// 调查人
+                /// </summary>    
+				
+				[Display(Name="调查人")]   
+								[Column("InvestigateUserId")]   
+				[DataMember]  
+			    public Guid? InvestigateUserId  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("InvestigateUserName")]   
+				[DataMember]  
+			    public string InvestigateUserName  {get;set;}   
+                                /// <summary>
+                /// 调查时间
+                /// </summary>    
+				
+				[Display(Name="调查时间")]   
+								[Column("InvestigateDate")]   
+				[DataMember]  
+			    public DateTime? InvestigateDate  {get;set;}   
+                                /// <summary>
+                /// 业主（产权人）签字
+                /// </summary>    
+				
+				[Display(Name="业主（产权人）签字")]   
+								[Column("PropertyRightPrsonSign")]   
+				[DataMember]  
+			    public string PropertyRightPrsonSign  {get;set;}   
+                                /// <summary>
+                /// 业主（产权人）签字时间
+                /// </summary>    
+				
+				[Display(Name="业主（产权人）签字时间")]   
+								[Column("PropertyRightPrsonSignDate")]   
+				[DataMember]  
+			    public DateTime? PropertyRightPrsonSignDate  {get;set;}   
+                                /// <summary>
+                /// 是否发布到公开系统
+                /// </summary>    
+				
+				[Display(Name="是否发布到公开系统")]   
+								[Column("IsReleaseToOpenSys")]   
+				[DataMember]  
+			    public bool IsReleaseToOpenSys  {get;set;}   
+                                /// <summary>
+                ///  发布到公开系统时间
+                /// </summary>    
+				
+				[Display(Name=" 发布到公开系统时间")]   
+								[Column("ReleaseToOpenSysDate")]   
+				[DataMember]  
+			    public DateTime? ReleaseToOpenSysDate  {get;set;}   
+                                /// <summary>
+                /// 发布到公开系统人员ID
+                /// </summary>    
+				
+				[Display(Name="发布到公开系统人员ID")]   
+								[Column("ReleaseToOpenSysUserId")]   
+				[DataMember]  
+			    public Guid? ReleaseToOpenSysUserId  {get;set;}   
+                                /// <summary>
+                /// 登记人ID
+                /// </summary>    
+				
+				[Display(Name="登记人ID")]   
+								[Column("RegisterUserId")]   
+				[DataMember]  
+			    public Guid? RegisterUserId  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("RegisterUserName")]   
+				[DataMember]  
+			    public string RegisterUserName  {get;set;}   
+                                /// <summary>
+                /// 登记日期
+                /// </summary>    
+				
+				[Display(Name="登记日期")]   
+								[Column("RegisterDate")]   
+				[DataMember]  
+			    public DateTime? RegisterDate  {get;set;}   
+                                /// <summary>
+                /// 修改人员
+                /// </summary>    
+				
+				[Display(Name="修改人员")]   
+								[Column("UpdateUserId")]   
+				[DataMember]  
+			    public Guid? UpdateUserId  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("UpdateUserName")]   
+				[DataMember]  
+			    public string UpdateUserName  {get;set;}   
+                                /// <summary>
+                /// 修改日期
+                /// </summary>    
+				
+				[Display(Name="修改日期")]   
+								[Column("UpdateDate")]   
+				[DataMember]  
+			    public DateTime? UpdateDate  {get;set;}   
+                                /// <summary>
+                /// 备注
+                /// </summary>    
+				
+				[Display(Name="备注")]   
+								[Column("Remark")]   
+				[DataMember]  
+			    public string Remark  {get;set;}   
+                                /// <summary>
+                /// 非住宅调查表附件
+                /// </summary>    
+				
+				[Display(Name="非住宅调查表附件")]   
+								[Column("Files")]   
+				[DataMember]  
+			    public string Files  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("Sfqy")]   
+				[DataMember]  
+			    public int Sfqy  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("JztdArea")]   
+				[DataMember]  
+			    public decimal? JztdArea  {get;set;}   
+                                /// <summary>
+                /// 证件类别
+                /// </summary>    
+				
+				[Display(Name="证件类别")]   
+								[Column("CodeLB")]   
+				[DataMember]  
+			    public string CodeLB  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("IsOpen")]   
+				[DataMember]  
+			    public int IsOpen  {get;set;}   
+                                /// <summary>
+                /// 房产证号
+                /// </summary>    
+				
+				[Display(Name="房产证号")]   
+								[Column("PropertyRightCardNo")]   
+				[DataMember]  
+			    public string PropertyRightCardNo  {get;set;}   
+                                /// <summary>
+                /// 证载面积
+                /// </summary>    
+				
+				[Display(Name="证载面积")]   
+								[Column("PropertyRightArea")]   
+				[DataMember]  
+			    public decimal? PropertyRightArea  {get;set;}   
+                                /// <summary>
+                /// 土地核定面积
+                /// </summary>    
+				
+				[Display(Name="土地核定面积")]   
+								[Column("LandFinalArea")]   
+				[DataMember]  
+			    public decimal? LandFinalArea  {get;set;}   
+                                /// <summary>
+                /// 商业-证载建筑面积
+                /// </summary>    
+				
+				[Display(Name="商业-证载建筑面积")]   
+								[Column("BusinessPropertyArea")]   
+				[DataMember]  
+			    public decimal? BusinessPropertyArea  {get;set;}   
+                                /// <summary>
+                /// 办公-证载建筑面积
+                /// </summary>    
+				
+				[Display(Name="办公-证载建筑面积")]   
+								[Column("OfficePropertyArea")]   
+				[DataMember]  
+			    public decimal? OfficePropertyArea  {get;set;}   
+                                /// <summary>
+                /// 工业-证载建筑面积
+                /// </summary>    
+				
+				[Display(Name="工业-证载建筑面积")]   
+								[Column("IndustrialPropertyArea")]   
+				[DataMember]  
+			    public decimal? IndustrialPropertyArea  {get;set;}   
+                                /// <summary>
+                /// 仓储-证载建筑面积
+                /// </summary>    
+				
+				[Display(Name="仓储-证载建筑面积")]   
+								[Column("StoragePropertyArea")]   
+				[DataMember]  
+			    public decimal? StoragePropertyArea  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("LesseeLB")]   
+				[DataMember]  
+			    public string LesseeLB  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("IsLessee")]   
+				[DataMember]  
+			    public string IsLessee  {get;set;}   
+                                /// <summary>
+                /// 土地证记载用途
+                /// </summary>    
+				
+				[Display(Name="土地证记载用途")]   
+								[Column("HouseUse")]   
+				[DataMember]  
+			    public string HouseUse  {get;set;}   
+                                /// <summary>
+                /// 红线内无证面积
+                /// </summary>    
+				
+				[Display(Name="红线内无证面积")]   
+								[Column("RedLine_In")]   
+				[DataMember]  
+			    public decimal? RedLine_In  {get;set;}   
+                                /// <summary>
+                /// 红线外无证面积
+                /// </summary>    
+				
+				[Display(Name="红线外无证面积")]   
+								[Column("RedLine_Out")]   
+				[DataMember]  
+			    public decimal? RedLine_Out  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("Sfth")]   
+				[DataMember]  
+			    public string Sfth  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("Thbh")]   
+				[DataMember]  
+			    public string Thbh  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("ThGuid")]   
+				[DataMember]  
+			    public string ThGuid  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("SFTJ")]   
+				[DataMember]  
+			    public int SFTJ  {get;set;}   
+                                /// <summary>
+                /// 储藏室
+                /// </summary>    
+				
+				[Display(Name="储藏室")]   
+								[Column("StoreroomArea")]   
+				[DataMember]  
+			    public decimal? StoreroomArea  {get;set;}   
+                                /// <summary>
+                /// 批次号
+                /// </summary>    
+				
+				[Display(Name="批次号")]   
+								[Column("BatchNumber")]   
+				[DataMember]  
+			    public string BatchNumber  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("GroupID")]   
+				[DataMember]  
+			    public Guid? GroupID  {get;set;}   
+                 
+		  }
+
+		  /**
+            /// <summary>
+            /// 数据表实体类Map：NonResidentialInvestigateTable 
+            /// </summary>
+            public class NonResidentialInvestigateTableMap : EntityTypeConfiguration<NonResidentialInvestigateTable>
+			{
+                public NonResidentialInvestigateTableMap()
+                {
+					this.ToTable("NonResidentialInvestigateTable");
+												this.HasKey(t => t.ID);
+													 this.Property(t => t.No).HasColumnName("No");
+													 this.Property(t => t.ProjectId).HasColumnName("ProjectId").IsRequired();
+													 this.Property(t => t.ProjectName).HasColumnName("ProjectName");
+													 this.Property(t => t.PropertyRightPrson).HasColumnName("PropertyRightPrson");
+													 this.Property(t => t.PropertyRightPrsonCardNo).HasColumnName("PropertyRightPrsonCardNo");
+													 this.Property(t => t.TheLegalRepresentative).HasColumnName("TheLegalRepresentative");
+													 this.Property(t => t.TheLegalRepresentativePhone).HasColumnName("TheLegalRepresentativePhone");
+													 this.Property(t => t.Lessee).HasColumnName("Lessee");
+													 this.Property(t => t.LesseeCardNo).HasColumnName("LesseeCardNo");
+													 this.Property(t => t.Phone).HasColumnName("Phone");
+													 this.Property(t => t.BusinessLicenseNo).HasColumnName("BusinessLicenseNo");
+													 this.Property(t => t.HouseAddress).HasColumnName("HouseAddress");
+													 this.Property(t => t.NatureOfPropertyID).HasColumnName("NatureOfPropertyID");
+													 this.Property(t => t.NatureOfProperty).HasColumnName("NatureOfProperty");
+													 this.Property(t => t.BuildingArea).HasColumnName("BuildingArea");
+													 this.Property(t => t.UsageID).HasColumnName("UsageID");
+													 this.Property(t => t.UsageSituation).HasColumnName("UsageSituation");
+													 this.Property(t => t.LandCardNo).HasColumnName("LandCardNo");
+													 this.Property(t => t.LandCardArea).HasColumnName("LandCardArea");
+													 this.Property(t => t.LandCardUse).HasColumnName("LandCardUse");
+													 this.Property(t => t.LandAchieveWay).HasColumnName("LandAchieveWay");
+													 this.Property(t => t.BusinessHouseNo).HasColumnName("BusinessHouseNo");
+													 this.Property(t => t.BusinessStructureLevel).HasColumnName("BusinessStructureLevel");
+													 this.Property(t => t.BusinessBuildArea).HasColumnName("BusinessBuildArea");
+													 this.Property(t => t.LandAcquisitionBCWillingness).HasColumnName("LandAcquisitionBCWillingness");
+													 this.Property(t => t.Razon).HasColumnName("Razon");
+													 this.Property(t => t.LandAcquisitionWillingness).HasColumnName("LandAcquisitionWillingness");
+													 this.Property(t => t.OfficeHouseNo).HasColumnName("OfficeHouseNo");
+													 this.Property(t => t.OfficeStructureLevel).HasColumnName("OfficeStructureLevel");
+													 this.Property(t => t.OfficeBuildArea).HasColumnName("OfficeBuildArea");
+													 this.Property(t => t.IndustrialHouseNo).HasColumnName("IndustrialHouseNo");
+													 this.Property(t => t.IndustrialStructureLevel).HasColumnName("IndustrialStructureLevel");
+													 this.Property(t => t.IndustrialBuildArea).HasColumnName("IndustrialBuildArea");
+													 this.Property(t => t.StorageHouseNo).HasColumnName("StorageHouseNo");
+													 this.Property(t => t.StorageStructureLevel).HasColumnName("StorageStructureLevel");
+													 this.Property(t => t.StorageBuildArea).HasColumnName("StorageBuildArea");
+													 this.Property(t => t.OtherName).HasColumnName("OtherName");
+													 this.Property(t => t.OtherHouseNo).HasColumnName("OtherHouseNo");
+													 this.Property(t => t.OtherStructureLevel).HasColumnName("OtherStructureLevel");
+													 this.Property(t => t.OtherBuildArea).HasColumnName("OtherBuildArea");
+													 this.Property(t => t.UnReg_Address).HasColumnName("UnReg_Address");
+													 this.Property(t => t.UnReg_BuildArea).HasColumnName("UnReg_BuildArea");
+													 this.Property(t => t.UnReg_BuildYear).HasColumnName("UnReg_BuildYear");
+													 this.Property(t => t.UnReg_PracticalUse).HasColumnName("UnReg_PracticalUse");
+													 this.Property(t => t.DocumentToAddress).HasColumnName("DocumentToAddress");
+													 this.Property(t => t.ReceiveContactPerson).HasColumnName("ReceiveContactPerson");
+													 this.Property(t => t.ReceiveContactPhone).HasColumnName("ReceiveContactPhone");
+													 this.Property(t => t.InvestigateUserId).HasColumnName("InvestigateUserId");
+													 this.Property(t => t.InvestigateUserName).HasColumnName("InvestigateUserName");
+													 this.Property(t => t.InvestigateDate).HasColumnName("InvestigateDate");
+													 this.Property(t => t.PropertyRightPrsonSign).HasColumnName("PropertyRightPrsonSign");
+													 this.Property(t => t.PropertyRightPrsonSignDate).HasColumnName("PropertyRightPrsonSignDate");
+													 this.Property(t => t.IsReleaseToOpenSys).HasColumnName("IsReleaseToOpenSys");
+													 this.Property(t => t.ReleaseToOpenSysDate).HasColumnName("ReleaseToOpenSysDate");
+													 this.Property(t => t.ReleaseToOpenSysUserId).HasColumnName("ReleaseToOpenSysUserId");
+													 this.Property(t => t.RegisterUserId).HasColumnName("RegisterUserId");
+													 this.Property(t => t.RegisterUserName).HasColumnName("RegisterUserName");
+													 this.Property(t => t.RegisterDate).HasColumnName("RegisterDate");
+													 this.Property(t => t.UpdateUserId).HasColumnName("UpdateUserId");
+													 this.Property(t => t.UpdateUserName).HasColumnName("UpdateUserName");
+													 this.Property(t => t.UpdateDate).HasColumnName("UpdateDate");
+													 this.Property(t => t.Remark).HasColumnName("Remark");
+													 this.Property(t => t.Files).HasColumnName("Files");
+													 this.Property(t => t.Sfqy).HasColumnName("Sfqy").IsRequired();
+													 this.Property(t => t.JztdArea).HasColumnName("JztdArea");
+													 this.Property(t => t.CodeLB).HasColumnName("CodeLB");
+													 this.Property(t => t.IsOpen).HasColumnName("IsOpen").IsRequired();
+													 this.Property(t => t.PropertyRightCardNo).HasColumnName("PropertyRightCardNo");
+													 this.Property(t => t.PropertyRightArea).HasColumnName("PropertyRightArea");
+													 this.Property(t => t.LandFinalArea).HasColumnName("LandFinalArea");
+													 this.Property(t => t.BusinessPropertyArea).HasColumnName("BusinessPropertyArea");
+													 this.Property(t => t.OfficePropertyArea).HasColumnName("OfficePropertyArea");
+													 this.Property(t => t.IndustrialPropertyArea).HasColumnName("IndustrialPropertyArea");
+													 this.Property(t => t.StoragePropertyArea).HasColumnName("StoragePropertyArea");
+													 this.Property(t => t.LesseeLB).HasColumnName("LesseeLB");
+													 this.Property(t => t.IsLessee).HasColumnName("IsLessee");
+													 this.Property(t => t.HouseUse).HasColumnName("HouseUse");
+													 this.Property(t => t.RedLine_In).HasColumnName("RedLine_In");
+													 this.Property(t => t.RedLine_Out).HasColumnName("RedLine_Out");
+													 this.Property(t => t.Sfth).HasColumnName("Sfth");
+													 this.Property(t => t.Thbh).HasColumnName("Thbh");
+													 this.Property(t => t.ThGuid).HasColumnName("ThGuid");
+													 this.Property(t => t.SFTJ).HasColumnName("SFTJ").IsRequired();
+													 this.Property(t => t.StoreroomArea).HasColumnName("StoreroomArea");
+													 this.Property(t => t.BatchNumber).HasColumnName("BatchNumber");
+													 this.Property(t => t.GroupID).HasColumnName("GroupID");
+										}
+			}**/
+
+	}
+
+	//----------NonResidentialInvestigateTable结束----------
+
+	

Ewide.Nbzs.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
+	{	
+        /// <summary>
+        /// 数据表实体类：PoliciesRegulations 
+        /// </summary>
+		[Table("PoliciesRegulations")]
+        public partial class PoliciesRegulations: BaseEntity        {    
+		                    /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+				[Key]
+								[Column("ID")]   
+				[DataMember]  
+			    public Guid ID  {get;set;}   
+                                /// <summary>
+                /// 项目id 关联Projects表ID
+                /// </summary>    
+				
+				[Display(Name="项目id 关联Projects表ID")]   
+								[Column("ProjectID")]   
+				[DataMember]  
+			    public Guid? ProjectID  {get;set;}   
+                                /// <summary>
+                /// 项目名称
+                /// </summary>    
+				
+				[Display(Name="项目名称")]   
+								[Column("ProjectName")]   
+				[DataMember]  
+			    public string ProjectName  {get;set;}   
+                                /// <summary>
+                /// 所属区域ID
+                /// </summary>    
+				
+				[Display(Name="所属区域ID")]   
+								[Column("AreaID")]   
+				[DataMember]  
+			    public Guid? AreaID  {get;set;}   
+                                /// <summary>
+                /// 所属区域
+                /// </summary>    
+				
+				[Display(Name="所属区域")]   
+								[Column("Area")]   
+				[DataMember]  
+			    public string Area  {get;set;}   
+                                /// <summary>
+                /// 标题
+                /// </summary>    
+				
+				[Display(Name="标题")]   
+								[Column("Title")]   
+				[DataMember]  
+			    public string Title  {get;set;}   
+                                /// <summary>
+                /// 征文内容
+                /// </summary>    
+				
+				[Display(Name="征文内容")]   
+								[Column("Contents")]   
+				[DataMember]  
+			    public string Contents  {get;set;}   
+                                /// <summary>
+                /// 是否公开
+                /// </summary>    
+				
+				[Display(Name="是否公开")]   
+								[Column("IsPublic")]   
+				[DataMember]  
+			    public bool IsPublic  {get;set;}   
+                                /// <summary>
+                /// 发布时间
+                /// </summary>    
+				
+				[Display(Name="发布时间")]   
+								[Column("PublicTime")]   
+				[DataMember]  
+			    public DateTime? PublicTime  {get;set;}   
+                                /// <summary>
+                /// 使用截止时间
+                /// </summary>    
+				
+				[Display(Name="使用截止时间")]   
+								[Column("PublicTimeEnd")]   
+				[DataMember]  
+			    public DateTime? PublicTimeEnd  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("CreateUserName")]   
+				[DataMember]  
+			    public string CreateUserName  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("UpdateTime")]   
+				[DataMember]  
+			    public DateTime? UpdateTime  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("UpdateUserId")]   
+				[DataMember]  
+			    public Guid? UpdateUserId  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("UpdateUserName")]   
+				[DataMember]  
+			    public string UpdateUserName  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("Remark")]   
+				[DataMember]  
+			    public string Remark  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("Files")]   
+				[DataMember]  
+			    public string Files  {get;set;}   
+                 
+		  }
+
+		  /**
+            /// <summary>
+            /// 数据表实体类Map：PoliciesRegulations 
+            /// </summary>
+            public class PoliciesRegulationsMap : EntityTypeConfiguration<PoliciesRegulations>
+			{
+                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结束----------
+
+	

Ewide.Nbzs.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
+	{	
+        /// <summary>
+        /// 数据表实体类：zjzwfwTickets 
+        /// </summary>
+		[Table("zjzwfwTickets")]
+        public partial class zjzwfwTickets: BaseEntity        {    
+		                    /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("ID")]   
+				[DataMember]  
+			    public string ID  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("Ticket")]   
+				[DataMember]  
+			    public string Ticket  {get;set;}   
+                                /// <summary>
+                /// 姓名
+                /// </summary>    
+				
+				[Display(Name="姓名")]   
+								[Column("UserName")]   
+				[DataMember]  
+			    public string UserName  {get;set;}   
+                                /// <summary>
+                /// 身份证号码
+                /// </summary>    
+				
+				[Display(Name="身份证号码")]   
+								[Column("IdCardNo")]   
+				[DataMember]  
+			    public string IdCardNo  {get;set;}   
+                                /// <summary>
+                /// 创建时间
+                /// </summary>    
+				
+				[Display(Name="创建时间")]   
+								[Column("CreateTime")]   
+				[DataMember]  
+			    public DateTime? CreateTime  {get;set;}   
+                                /// <summary>
+                /// 到期时间 默认1小时到期
+                /// </summary>    
+				
+				[Display(Name="到期时间 默认1小时到期")]   
+								[Column("ExpireTime")]   
+				[DataMember]  
+			    public DateTime? ExpireTime  {get;set;}   
+                                /// <summary>
+                /// 原始文本
+                /// </summary>    
+				
+				[Display(Name="原始文本")]   
+								[Column("OriginalResponse")]   
+				[DataMember]  
+			    public string OriginalResponse  {get;set;}   
+                 
+		  }
+
+		  /**
+            /// <summary>
+            /// 数据表实体类Map：zjzwfwTickets 
+            /// </summary>
+            public class zjzwfwTicketsMap : EntityTypeConfiguration<zjzwfwTickets>
+			{
+                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结束----------
+
+	

Ewide.Nbzs.Entity/Ewide.Nbzs.Entity.csproj

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="SqlModelTpl.cs">
+      <DependentUpon>SqlModelTpl.tt</DependentUpon>
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="SqlModelTpl.tt">
+      <LastGenOutput>SqlModelTpl.cs</LastGenOutput>
+      <Generator>TextTemplatingFileGenerator</Generator>
+    </None>
+  </ItemGroup>
+
+</Project>

Ewide.Nbzs.Entity/Extends/H5IndexPrjModel.cs

@@ -0,0 +1,157 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.NbzsZheliban.Entity.Extends
+{
+    public class ZhelibanUserInfo
+    {
+        public string CardId { get; set; }
+        public string Name { get; set; }
+    }
+    public class Dcbs
+    {
+        public string dcbId { get; set; }
+        public string PrjId { get; set; }
+    }
+    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 string Type { 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 string Type { get; set; }
+
+
+    }
+    public class H5IndexModel
+    {
+        public string UserName { get; set; }
+        public string IdCard { get; set; }
+        /// <summary>
+        /// 项目信息
+        /// </summary>
+        public List<H5IndexPrjModel> PrjList { get; set; }
+        public PoliciesRegulations PoliciesRegulationsLists { get; set; }
+    }
+    public class H5IndexPrjModel
+    {
+        public string PrjId { get; set; }
+        /// <summary>
+        /// 区域
+        /// </summary>
+        public string Area { get; set; }
+        public string Name { get; set; }
+        [Newtonsoft.Json.JsonIgnore]
+        public string AreaID { get; set; }
+        /// <summary>
+        /// 征收部门
+        /// </summary>
+        public string zsbm { get; set; }
+        /// <summary>
+        /// 年份 
+        /// </summary>
+        public decimal? Year { get; set; }
+        /// <summary>
+        /// 征收决定号
+        /// </summary>
+        public string Zsjdh { get; set; }
+        /// <summary>
+        /// 当前阶段
+        /// </summary>
+        public string CurrentState { get; set; }
+        /// <summary>
+        /// 项目备案日期
+        /// </summary>
+        public string CreateRecordTime { get; set; }
+        /// <summary>
+        /// 分户评估集合
+        /// </summary>
+        public List<Fhpgs> FhpgList { get; set; }
+        /// <summary>
+        /// 补偿协议集合
+        /// </summary>
+        public List<Bcxy> BcxyList { get; set; }
+    }
+    public class PoliciesRegulations
+    {
+        public int TotalCount { get; set; }
+        public List<PoliciesRegulation> 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; }
+    }
+    public class FHPG
+    {
+        public string Id { get; set; }
+        /// <summary>
+        /// 评估编号
+        /// </summary>
+        public string AssessmentNo { get; set; }
+        public string HouseAddress { get; set; }
+        /// <summary>
+        /// 被征收房屋评估金额
+        /// </summary>
+        public string HousingAssessmentValue { get; set; }
+        /// <summary>
+        /// 被征收房屋评估价值
+        /// </summary>
+        public string countValue { get; set; }
+        /// <summary>
+        /// 附属物评估金额
+        /// </summary>
+        public string AttachedAssessedValue { get; set; }
+        /// <summary>
+        /// 装修评估金额
+        /// </summary>
+        public string DecorateAssessedValue { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+        /// <summary>
+        /// 超容积率土地补偿费
+        /// </summary>
+        public string ExceedLandMoney { get; set; }
+        /// <summary>
+        /// 阁楼补偿费
+        /// </summary>
+        public string AtticAssessedValue { get; set; }
+        public int ValuationMethod { get; set; }
+        public string ValuationMethodText { get; set; }
+        public int Type { get; set; }
+        public bool IsExistPdf { get; set; }
+        public string[] Pics { get; set; }
+        public string Pdf { get; set; }
+
+    }
+}

Ewide.Nbzs.Entity/ModelAuto.ttinclude

@@ -0,0 +1,131 @@
+<#@ assembly name="System.Core"#>
+<#@ assembly name="EnvDTE"#>
+<#@ import namespace="System.Collections.Generic"#>
+<#@ import namespace="System.IO"#>
+<#@ import namespace="System.Text"#>
+<#@ import namespace="Microsoft.VisualStudio.TextTemplating"#>
+
+<#+
+
+class Manager
+{
+    public struct Block {
+        public String Name;
+        public int Start, Length;
+    }
+
+    public List<Block> blocks = new List<Block>();
+    public Block currentBlock;
+    public Block footerBlock = new Block();
+    public Block headerBlock = new Block();
+    public ITextTemplatingEngineHost host;
+    public ManagementStrategy strategy;
+    public StringBuilder template;
+    public String OutputPath { get; set; }
+
+    public Manager(ITextTemplatingEngineHost host, StringBuilder template, bool commonHeader) {
+        this.host = host;
+        this.template = template;
+        OutputPath = String.Empty;
+        strategy = ManagementStrategy.Create(host);
+    }
+
+    public void StartBlock(String name) {
+        currentBlock = new Block { Name = name, Start = template.Length };
+    }
+
+    public void StartFooter() {
+        footerBlock.Start = template.Length;
+    }
+
+    public void EndFooter() {
+        footerBlock.Length = template.Length - footerBlock.Start;
+    }
+
+    public void StartHeader() {
+        headerBlock.Start = template.Length;
+    }
+
+    public void EndHeader() {
+        headerBlock.Length = template.Length - headerBlock.Start;
+    }    
+
+    public void EndBlock() {
+        currentBlock.Length = template.Length - currentBlock.Start;
+        blocks.Add(currentBlock);
+    }
+	
+    public void Process(bool split,bool isCover=false) {
+        String header = template.ToString(headerBlock.Start, headerBlock.Length);
+        String footer = template.ToString(footerBlock.Start, footerBlock.Length);
+        blocks.Reverse();
+        foreach(Block block in blocks) {
+            String fileName = Path.Combine(OutputPath, block.Name);
+            if (split) {
+                String content = header + template.ToString(block.Start, block.Length) + footer;
+				//if(isCover)
+				//{
+				//	strategy.DeleteFile(fileName);
+				//}
+				if(isCover||!File.Exists(fileName))//存在则不覆盖
+					strategy.CreateFile(fileName, content);
+                template.Remove(block.Start, block.Length);
+            } else {
+                strategy.DeleteFile(fileName);
+            }
+        }
+    }
+}
+
+class ManagementStrategy
+{
+    internal static ManagementStrategy Create(ITextTemplatingEngineHost host) {
+        return (host is IServiceProvider) ? new VSManagementStrategy(host) : new ManagementStrategy(host);
+    }
+
+    internal ManagementStrategy(ITextTemplatingEngineHost host) { }
+
+    internal virtual void CreateFile(String fileName, String content) {
+        File.WriteAllText(fileName, content);
+    }
+
+    internal virtual void DeleteFile(String fileName) {
+        if (File.Exists(fileName))
+            File.Delete(fileName);
+    }
+}
+
+class VSManagementStrategy : ManagementStrategy
+{
+    private EnvDTE.ProjectItem templateProjectItem;
+
+    internal VSManagementStrategy(ITextTemplatingEngineHost host) : base(host) {
+        IServiceProvider hostServiceProvider = (IServiceProvider)host;
+        if (hostServiceProvider == null)
+            throw new ArgumentNullException("Could not obtain hostServiceProvider");
+
+        EnvDTE.DTE dte = (EnvDTE.DTE)hostServiceProvider.GetService(typeof(EnvDTE.DTE));
+        if (dte == null)
+            throw new ArgumentNullException("Could not obtain DTE from host");
+
+        templateProjectItem = dte.Solution.FindProjectItem(host.TemplateFile);
+    }
+
+    internal override void CreateFile(String fileName, String content) {
+        base.CreateFile(fileName, content);
+        ((EventHandler)delegate { templateProjectItem.ProjectItems.AddFromFile(fileName); }).BeginInvoke(null, null, null, null);
+    }
+
+    internal override void DeleteFile(String fileName) {
+        ((EventHandler)delegate { FindAndDeleteFile(fileName); }).BeginInvoke(null, null, null, null);
+    }
+
+    private void FindAndDeleteFile(String fileName) {
+        foreach(EnvDTE.ProjectItem projectItem in templateProjectItem.ProjectItems) {
+            if (projectItem.get_FileNames(0) == fileName) {
+                projectItem.Delete();
+                return;
+            }
+        }
+    }
+}#>

Ewide.Nbzs.Entity/SqlModelTpl.cs

@@ -0,0 +1,21 @@
+ 
+ 
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+ 

Ewide.Nbzs.Entity/SqlModelTpl.tt

@@ -0,0 +1,387 @@
+<#@ template language="C#" debug="True" hostspecific="True" #>
+<#@ output extension=".cs" #>
+<#@ assembly name="System.Data" #>
+<#@ assembly name="System.Data.DataSetExtensions" #>
+<#@ assembly name="$(SolutionDir)lib\EntityFramework.dll" #> 
+<#@ assembly name="System.xml" #>
+<#@ import namespace="System.Collections.Generic" #>
+<#@ import namespace="System.Data" #>
+<#@ import namespace="System.Linq" #> 
+<#@ import namespace="System.Data.SqlClient" #>
+<#@ include file="ModelAuto.ttinclude"#>
+
+
+<# var manager = new Manager(Host, GenerationEnvironment, true) { OutputPath = Path.GetDirectoryName(Host.TemplateFile)+"/DataBase/"}; #>
+<# 
+	string tableClass="";
+    //所有表名称
+    //string sqlGetTable = "SELECT Name FROM SysObjects Where XType='U' ORDER BY Name";
+    DataTable dt = GetDataTable(new List<string> { "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')";
+	DataTable datacloumn = new DataTable();
+   string primaryKey ="";         
+ #>
+ 
+<# 
+    foreach(System.Data.DataRow row in dt.Rows) 
+    { 
+		string objType=row["XType"].ToString().Trim();
+		tableClass = GetClassName(row["name"].ToString());
+		manager.StartBlock(tableClass+".cs");
+		//获取表格
+		datacloumn.Clear();
+        datacloumn = GetDataTableCloumn(row["name"].ToString());
+		primaryKey = GetKey(row["name"].ToString());
+	 #>
+	//----------<#=row["name"].ToString()#>开始----------
+    
+	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
+	{	
+        /// <summary>
+        /// 数据表实体类：<#= tableClass #> 
+        /// </summary>
+		[Table("<#=tableClass #>")]
+        public partial class <#= tableClass #><# if(objType=="U"){#>: BaseEntity<#}else{#>: BaseEntity<#}#>
+        {    
+		    <#
+			//List<string> listBaseColumn = new List<string>{"Id","UNID","CreateTime","CreateUserId","LastUpdateTime","IsDeleted","Sort"};
+			List<string> listBaseColumn = new List<string>{};
+            foreach (DataRow dr in datacloumn.Rows)
+            {
+				string columnName=GetFormColumnName(dr["columnname"].ToString(),tableClass);
+				//if(objType=="U"&&listBaseColumn.Contains(columnName))
+				if(listBaseColumn.Contains(columnName))
+					continue;
+                #>
+                /// <summary>
+                /// <#=dr["comments"].ToString()==""?"无描述": dr["comments"].ToString().Replace("\r","").Replace("\n","").Replace("\"","") #>
+                /// </summary>    
+				
+				[Display(Name="<#=dr["comments"].ToString()==""?"无描述": dr["comments"].ToString().Replace("\r","").Replace("\n","").Replace("\"","") #>")]   
+				<#
+				if(dr["columnname"].ToString().ToLower()==primaryKey.ToLower())
+				{#>[Key]
+				<#}
+				#>
+				[Column("<#=columnName #>")]   
+				[DataMember]  
+			    public <#= objType=="V"?ViewTransFromSqlType(dr["datatype"].ToString(),dr["data_length"].ToString(),dr["nullable"].ToString()):TransFromSqlType(dr["datatype"].ToString(),dr["data_length"].ToString(),dr["nullable"].ToString()) #> <#=columnName#>  {get;set;}   
+                <#
+            }
+            #> 
+		  }
+
+		  /**
+            /// <summary>
+            /// 数据表实体类Map：<#= tableClass #> 
+            /// </summary>
+            public class <#= tableClass #>Map : EntityTypeConfiguration<<#= tableClass #>>
+			{
+                public <#= tableClass #>Map()
+                {
+					this.ToTable("<#= tableClass #>");
+					<#
+					foreach (DataRow dr in datacloumn.Rows)
+					{
+						string columnName=GetFormColumnName(dr["columnname"].ToString(),tableClass);
+						if(dr["columnname"].ToString()==primaryKey)
+						{#>
+							this.HasKey(t => t.<#= columnName #>);
+						<#}
+						else
+						{#>
+							 this.Property(t => t.<#=columnName #>).HasColumnName("<#=columnName #>")<#if(dr["nullable"].ToString()=="0"){#>.IsRequired()<#}#>;
+						<#}
+					}
+					#>
+				}
+			}**/
+
+	}
+
+	//----------<#=tableClass#>结束----------
+
+	<# manager.EndBlock(); #>
+
+<# 
+    } #> 
+
+<#
+    manager.Process(true);
+#>
+
+
+ <#+
+		/// <summary>
+        /// SQL[不完善,需要的自己改造]
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+       public string TransFromSqlType(string type,string data_length,string nullable)
+       {
+			if(type.ToLower()=="nvarchar2")
+			{
+				return "varchar2";
+			}
+			if(type.ToLower()=="uniqueidentifier")
+			{
+				return "Guid"+(nullable=="1"?"?":"");
+			}
+			//是主键 且 type是字符串的 改成guid
+			if((type.ToLower()=="raw"&&data_length=="16"))
+			{
+				return "Guid"+(nullable=="1"?"?":"");
+			}
+			switch(type.ToLower())
+			{
+				case "int":
+				case "int32":
+				case "number":
+					type="int"+(nullable=="1"?"?":"");
+				break;
+				case "varchar":
+				case "varchar2":
+				case "text":
+				case "ntext":
+				case "nvarchar":
+				case "longtext":
+				case "string":
+				case "raw":
+				case "nclog":
+				case "nclob":
+				case "clob":
+					type="string";
+				break;				
+				case "blob":
+					type="byte[]";
+				break;
+				case "bit":
+				case "boolean":
+					type="bool";
+				break;
+				case "datetime":
+				case "date":
+					type="DateTime"+(nullable=="1"?"?":"");
+				break;
+				case "bigint":
+					type="long";
+				break;
+				case "numeric":
+				case "real":
+				case "decimal":
+					type="decimal"+(nullable=="1"?"?":"");
+				break;
+
+
+				
+			}
+			return type;
+        }
+		public string ViewTransFromSqlType(string type,string data_length,string nullable)
+       {
+			if(type.ToLower()=="nvarchar2")
+			{
+				return "varchar2";
+			}
+			if(type.ToLower()=="uniqueidentifier")
+			{
+				return "Guid?";
+			}
+			//是主键 且 type是字符串的 改成guid
+			if((type.ToLower()=="raw"&&data_length=="16"))
+			{
+				return "Guid?";
+			}
+			switch(type.ToLower())
+			{
+				case "int":
+				case "int32":
+				case "number":
+					type="int?";
+				break;
+				case "varchar":
+				case "varchar2":
+				case "text":
+				case "ntext":
+				case "nvarchar":
+				case "longtext":
+				case "string":
+				case "raw":
+				case "nclog":
+				case "nclob":
+				case "clob":
+					type="string";
+				break;				
+				case "blob":
+					type="byte[]";
+				break;
+				case "bit":
+				case "boolean":
+					type="bool";
+				break;
+				case "datetime":
+				case "date":
+					type="DateTime?";
+				break;
+				case "bigint":
+					type="long?";
+				break;
+
+
+				
+			}
+			return type;
+        }
+		
+		public string GetFormColumnName(string fieldname,string tablename)
+        {
+			if(tablename.StartsWith("PRJ_STAGE_FORM_")){
+				return fieldname;
+			}
+			return GetClassName(fieldname);
+		}
+        public string GetClassName(string tablename)
+        {
+		/**
+            string[] tablestr = tablename.Split('_');
+            string rslt = "";
+            foreach (var str in tablestr)
+            {
+                rslt = rslt + TitleToUpper(str.ToLower());
+            }
+            return rslt;
+			**/
+			return tablename;
+        }
+
+
+
+        public string TitleToUpper(string str)
+        {
+            if (string.IsNullOrWhiteSpace(str))
+                return string.Empty;
+
+            char[] s = str.ToCharArray();
+            char c = s[0];
+
+            if ('a' <= c && c <= 'z')
+                c = (char)(c & ~0x20);
+
+            s[0] = c;
+
+            return new string(s);
+        }
+
+
+		string connectionstr ="data source=118.178.224.202;initial catalog=Nbcqb2;persist security info=True;user id=KYSQLSERVERADMIN;password=KYDBLogin20161103...;";
+		
+        public DataTable GetDataTable(List<string> listTableName)
+        {
+            DataTable dtrslt = QueryTable("SELECT Name,XType FROM SysObjects Where XType='U' and Name in "+ "('" + string.Join("','", listTableName) + "')" + " ORDER BY Name");
+            DataTable viewrslt = QueryTable("SELECT Name,XType FROM SysObjects Where XType='V' and Name in " + "('" + string.Join("','", listTableName) + "')" + " ORDER BY Name");
+
+			 DataTable rslt = dtrslt.Copy();
+            //添加DataTable2的数据
+            foreach (DataRow dr in viewrslt.Rows)
+            {
+                rslt.ImportRow(dr);
+            }
+
+			return rslt;
+        }
+		public DataTable GetDataTable()
+        {
+            DataTable dtrslt = QueryTable("SELECT Name,XType FROM SysObjects Where XType='U' ORDER BY Name");
+            DataTable viewrslt = QueryTable("SELECT Name,XType FROM SysObjects Where XType='V' ORDER BY Name");
+
+			 DataTable rslt = dtrslt.Copy();
+            //添加DataTable2的数据
+            foreach (DataRow dr in viewrslt.Rows)
+            {
+                rslt.ImportRow(dr);
+            }
+
+			return rslt;
+        }
+		
+		public DataTable QueryTable(string sql)
+		{
+            DataSet ds = new DataSet();
+            try
+            {
+				SqlConnection con = new SqlConnection(connectionstr);
+                con.Open();
+                SqlCommand cmd = new SqlCommand(sql, con);
+                SqlDataAdapter oda = new SqlDataAdapter();
+                oda.SelectCommand = cmd;
+                oda.Fill(ds);
+                con.Close();
+            }
+            catch (Exception ee)
+            {       
+                throw;
+            }
+            return ds.Tables[0];
+		}
+		
+        public DataTable GetDataTableCloumn(string datatable)
+        {
+            DataSet ds = new DataSet();
+            try
+            {
+				SqlConnection con = new SqlConnection(connectionstr);
+                con.Open();
+                SqlCommand cmd = new SqlCommand("select sc.id,sc.name columnname,st.name datatype,sc.length data_length,sc.isnullable nullable,isnull(ep.value,'') comments from syscolumns sc inner join systypes st on sc.xusertype=st.xusertype left join sys.columns c on sc.id=c.object_id and sc.name=c.name left join sys.extended_properties ep on sc.id=ep.major_id and c.column_id=ep.minor_id and ep.class =1 where sc.id=object_id('"+datatable+"')", con);
+                SqlDataAdapter oda = new SqlDataAdapter();
+                oda.SelectCommand = cmd;
+                oda.Fill(ds);
+                con.Close();
+            }
+            catch (Exception ee)
+            {       
+                throw;
+            }
+            return ds.Tables[0];
+        }
+
+		
+        public string GetKey(string table)
+        {
+            string rslt = "";
+            string sql = @"select * from ( select a.name as FieldName,a.isnullable,c.name as FieldType,COLUMNPROPERTY(a.id,a.name,'IsIdentity') as isidentity,PK=case when exists(SELECT 1 FROM sysobjects where xtype='PK' and parent_obj=a.id and name in (SELECT name FROM sysindexes WHERE indid in(SELECT indid FROM sysindexkeys WHERE id = a.id AND colid=a.colid
+))) then 'true' else 'false' end from SysColumns a left JOIN systypes c on a.xusertype=c.xusertype where a.id=Object_Id('"+table+"') ) m where PK='true'";
+            DataSet ds = new DataSet();
+            try
+            {
+                using (SqlConnection connection = new SqlConnection(connectionstr))
+                {
+                    SqlCommand command = new SqlCommand(sql, connection);
+                    connection.Open();
+                    SqlDataReader reader;
+                    reader = command.ExecuteReader();
+                    while (reader.Read())
+                    {
+                        rslt = reader.GetString(0);
+                    }
+                    reader.Close();
+                }
+            }
+            catch (Exception ee)
+            {
+
+                throw;
+            }
+            return rslt;
+        }
+		
+
+ #>
+

Ewide.NbzsZheliban/Entity/DataBase/InvestigateTable_Assessment.cs

@@ -755,9 +755,9 @@ using System.Runtime.Serialization;
                 /// </summary>    
 				
 				[Display(Name="分户评估附件")]   
-								[Column("File")]   
+								[Column("AssementFile")]   
 				[DataMember]  
-			    public string File  {get;set;}   
+			    public string AssementFile  {get;set;}   
                  
 		  }
 
@@ -862,7 +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");
+													 this.Property(t => t.AssementFile).HasColumnName("AssementFile");
 										}
 			}**/
 

Ewide.NbzsZheliban/Entity/DataBase/NonInvestigateTable_Assessment.cs

@@ -299,9 +299,9 @@ using System.Runtime.Serialization;
                 /// </summary>    
 				
 				[Display(Name="分户评估附件")]   
-								[Column("File")]   
+								[Column("AssementFile")]   
 				[DataMember]  
-			    public string File  {get;set;}   
+			    public string AssementFile  {get;set;}   
                  
 		  }
 
@@ -349,7 +349,7 @@ using System.Runtime.Serialization;
 													 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");
+													 this.Property(t => t.AssementFile).HasColumnName("AssementFile");
 										}
 			}**/
 

Ewide.NbzsZheliban/Entity/Extends/H5IndexPrjModel.cs

@@ -117,6 +117,7 @@ namespace Ewide.NbzsZheliban.Entity.Extends
         /// 评估编号
         /// </summary>
         public string AssessmentNo { get; set; }
+        public string HouseAddress { get; set; }
         /// <summary>
         /// 被征收房屋评估金额
         /// </summary>
@@ -146,7 +147,11 @@ namespace Ewide.NbzsZheliban.Entity.Extends
         /// </summary>
         public string AtticAssessedValue { get; set; }
         public int ValuationMethod { get; set; }
+        public string ValuationMethodText { get; set; }
         public int Type { get; set; }
+        public bool IsExistPdf { get; set; }
+        public string[] Pics { get; set; }
+        public string Pdf { get; set; }
 
     }
 }

Ewide.NbzsZheliban/Ewide.NbzsZheliban.csproj

@@ -4,31 +4,23 @@
     <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="Entity\**" />
+    <EmbeddedResource Remove="Entity\**" />
+    <None Remove="Entity\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="8.3.1" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Ewide.Nbzs.Entity\Ewide.Nbzs.Entity.csproj" />
     <ProjectReference Include="..\framework\Api\Ewide.Core\Ewide.Core.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="Entity\SqlModelTpl.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>SqlModelTpl.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-
   <ItemGroup>
     <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Entity\SqlModelTpl.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>SqlModelTpl.tt</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
 </Project>

Ewide.NbzsZheliban/Service/DataService.cs

@@ -399,80 +399,105 @@ namespace Ewide.NbzsZheliban.Service
                 //非住宅 
                 jzlrModel = db.Ado.SqlQuery<FHPG>("select b.HouseAddress,a.ValuationMethod,a.AssessmentNo,a.HousingAssessmentValue,a.countValue,a.AttachedAssessedValue,a.DecorateAssessedValue,a.Remark,a.ExceedLandMoney,2 Type from NonInvestigateTable_Assessment a inner join NonResidentialInvestigateTable b on a.NonInvestigateTableID=b.ID  where a.ID=@ID", new { ID = id }).FirstOrDefault();
             }
-            if (jzlrModel.ValuationMethod == 0)
+            switch (jzlrModel.ValuationMethod)
             {
-                return jzlrModel;
-            }
-            else
-            {
-                return GetHouseEstimateFile(Guid.Parse(jzlrModel.Id), jzlrModel.Type, jzlrModel.ValuationMethod);
+                case 0:
+                    jzlrModel.ValuationMethodText = "价值录入";
+                    break;
+                case 1:
+                    jzlrModel.ValuationMethodText = "普通报告录入";
+                    break;
+                case 2:
+                    jzlrModel.ValuationMethodText = "自定义报告录入";
+                    break;
             }
+            //if (jzlrModel.ValuationMethod == 0)
+            //{
+            //return jzlrModel;
+            //}
+            //else
+            //{
+            return GetHouseEstimateFile(jzlrModel);
+            //} 
         }
-        private dynamic GetHouseEstimateFile(Guid id, int type, int ValuationMethod)
+        private dynamic GetHouseEstimateFile(FHPG jzlrModel)
         {
             var fileUrl = "";
-            if (type == 1)
+            if (jzlrModel.Type == 1)
             {
                 //住宅
-                var entity_zz = db.Queryable<Entity.InvestigateTable_Assessment>().Where(p => p.ID == id).Select(p => new { p.ID, p.File }).First();
+                var entity_zz = db.Queryable<Entity.InvestigateTable_Assessment>().Where(p => p.ID == Guid.Parse(jzlrModel.Id)).Select(p => new { p.ID, p.AssementFile }).First();
                 if (entity_zz != null)
                 {
-                    fileUrl = entity_zz.File;
+                    fileUrl = entity_zz.AssementFile;
                 }
             }
-            else if (type == 2)
+            else if (jzlrModel.Type == 2)
             {
                 //非住宅 
-                var entity_fzz = db.Queryable<Entity.NonInvestigateTable_Assessment>().Where(p => p.ID == id).Select(p => new { p.ID, p.File }).First();
+                var entity_fzz = db.Queryable<Entity.NonInvestigateTable_Assessment>().Where(p => p.ID == Guid.Parse(jzlrModel.Id)).Select(p => new { p.ID, p.AssementFile }).First();
                 if (entity_fzz != null)
                 {
-                    fileUrl = entity_fzz.File;
+                    fileUrl = entity_fzz.AssementFile;
                 }
             }
             if (string.IsNullOrEmpty(fileUrl))
-                throw Oops.Oh("未评估或未上传附件");
-            var pics = new List<string>();
-            var nbzs_file_path = App.Configuration["nbzs_file_path"];
-            var nbzs_domain = App.Configuration["nbzs_domain"];
-            var filePath = nbzs_file_path + fileUrl;
-            var pdfFile = new FileInfo(filePath);
-            if (File.Exists(pdfFile.Directory + "\\lock"))
-            {
-                var picCount = pdfFile.Directory.GetFiles(pdfFile.Name + "-*.jpg").Length;
-                for (int i = 0; i < picCount; i++)
-                {
-                    pics.Add(nbzs_domain + fileUrl + "-" + i + ".jpg");
-                }
-            }
+                //throw Oops.Oh("未评估或未上传附件");
+                jzlrModel.IsExistPdf = false;
             else
             {
-                MagickReadSettings settings = new MagickReadSettings();
-                settings.Density = new Density(400, 400); //设置质量
-                using (MagickImageCollection images = new MagickImageCollection())
+                var pics = new List<string>();
+                var nbzs_file_path = App.Configuration["nbzs_file_path"];
+                var nbzs_domain = App.Configuration["nbzs_domain"];
+                var filePath = nbzs_file_path + fileUrl;
+                var pdfFile = new FileInfo(filePath);
+                if (!pdfFile.Exists)
+                    jzlrModel.IsExistPdf = false;
+                else
                 {
-                    try
+                    if (File.Exists(pdfFile.Directory + "\\lock"))
                     {
-                        images.Read(filePath, settings);
-                        for (int i = 0; i < images.Count; i++)
+                        var picCount = pdfFile.Directory.GetFiles(pdfFile.Name + "-*.jpg").Length;
+                        for (int i = 0; i < picCount; i++)
                         {
-                            MagickImage image = (MagickImage)images[i];
-                            image.Format = MagickFormat.Jpg;
-                            var imagename = filePath + "-" + i + ".jpg";
-                            image.Write(imagename);
                             pics.Add(nbzs_domain + fileUrl + "-" + i + ".jpg");
-                            if (i == 0)
+                        }
+                    }
+                    else
+                    {
+                        MagickReadSettings settings = new MagickReadSettings();
+                        settings.Density = new Density(400, 400); //设置质量
+                        using (MagickImageCollection images = new MagickImageCollection())
+                        {
+                            try
                             {
-                                File.WriteAllText(pdfFile.Directory.FullName + "\\lock", "lock");
+                                images.Read(filePath, settings);
+                                for (int i = 0; i < images.Count; i++)
+                                {
+                                    MagickImage image = (MagickImage)images[i];
+                                    image.Format = MagickFormat.Jpg;
+                                    var imagename = filePath + "-" + i + ".jpg";
+                                    image.Write(imagename);
+                                    pics.Add(nbzs_domain + fileUrl + "-" + i + ".jpg");
+                                    if (i == 0)
+                                    {
+                                        File.WriteAllText(pdfFile.Directory.FullName + "\\lock", "lock");
+                                    }
+                                }
+                            }
+                            catch (Exception ex)
+                            {
+                                throw Oops.Oh(ex.Message);
                             }
                         }
                     }
-                    catch (Exception ex)
-                    {
-                        throw Oops.Oh(ex.Message);
-                    }
+                    //return new { ValuationMethod, ValuationMethodText, pics, pdf = nbzs_domain + fileUrl };
+                    jzlrModel.Pdf = nbzs_domain + fileUrl;
+                    jzlrModel.Pics = pics.ToArray();
+                    jzlrModel.IsExistPdf = true;
                 }
             }
-            return new { ValuationMethod, pics, pdf = nbzs_domain + fileUrl };
+            return jzlrModel;
         }
 
     }

Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.deps.json

@@ -9,6 +9,7 @@
       "Ewide.NbzsZheliban/1.0.0": {
         "dependencies": {
           "Ewide.Core": "1.0.0",
+          "Ewide.Nbzs.Entity": "1.0.0",
           "Magick.NET-Q16-AnyCPU": "8.3.1"
         },
         "runtime": {
@@ -43,7 +44,7 @@
       },
       "CSRedisCore/3.6.6": {
         "dependencies": {
-          "Newtonsoft.Json": "12.0.3",
+          "Newtonsoft.Json": "13.0.1",
           "System.ValueTuple": "4.5.0"
         },
         "runtime": {
@@ -608,7 +609,7 @@
       "MiniProfiler.Shared/4.2.22": {
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0",
-          "Newtonsoft.Json": "12.0.3",
+          "Newtonsoft.Json": "13.0.1",
           "System.ComponentModel.Primitives": "4.3.0",
           "System.Data.Common": "4.3.0",
           "System.Diagnostics.DiagnosticSource": "5.0.1",
@@ -703,11 +704,11 @@
           "System.Xml.XDocument": "4.3.0"
         }
       },
-      "Newtonsoft.Json/12.0.3": {
+      "Newtonsoft.Json/13.0.1": {
         "runtime": {
           "lib/netstandard2.0/Newtonsoft.Json.dll": {
-            "assemblyVersion": "12.0.0.0",
-            "fileVersion": "12.0.3.23909"
+            "assemblyVersion": "13.0.0.0",
+            "fileVersion": "13.0.1.25517"
           }
         }
       },
@@ -1063,7 +1064,7 @@
         "dependencies": {
           "Microsoft.Data.Sqlite": "2.2.4",
           "MySql.Data": "8.0.21",
-          "Newtonsoft.Json": "12.0.3",
+          "Newtonsoft.Json": "13.0.1",
           "Npgsql": "4.1.3.1",
           "Oracle.ManagedDataAccess.Core": "2.18.3",
           "SqlSugarCore.Dm": "1.0.0",
@@ -2033,6 +2034,14 @@
           "Ewide.Core.dll": {}
         }
       },
+      "Ewide.Nbzs.Entity/1.0.0": {
+        "dependencies": {
+          "Newtonsoft.Json": "13.0.1"
+        },
+        "runtime": {
+          "Ewide.Nbzs.Entity.dll": {}
+        }
+      },
       "Furion/2.18.7": {
         "dependencies": {
           "Furion.Extras.DependencyModel.CodeAnalysis": "2.18.7",
@@ -2519,12 +2528,12 @@
       "path": "netstandard.library/1.6.1",
       "hashPath": "netstandard.library.1.6.1.nupkg.sha512"
     },
-    "Newtonsoft.Json/12.0.3": {
+    "Newtonsoft.Json/13.0.1": {
       "type": "package",
       "serviceable": true,
-      "sha512": "sha512-6mgjfnRB4jKMlzHSl+VD+oUc1IebOZabkbyWj2RiTgWwYPPuaK1H97G1sHqGwPlS5npiF5Q0OrxN1wni2n5QWg==",
-      "path": "newtonsoft.json/12.0.3",
-      "hashPath": "newtonsoft.json.12.0.3.nupkg.sha512"
+      "sha512": "sha512-ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==",
+      "path": "newtonsoft.json/13.0.1",
+      "hashPath": "newtonsoft.json.13.0.1.nupkg.sha512"
     },
     "Npgsql/4.1.3.1": {
       "type": "package",
@@ -3469,6 +3478,11 @@
       "serviceable": false,
       "sha512": ""
     },
+    "Ewide.Nbzs.Entity/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    },
     "Furion/2.18.7": {
       "type": "project",
       "serviceable": false,

Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-ad5333fd9787f96d4c08a3722a762bad8a91584f
+283159aa7621c878c3d2922181efab5f330e0f3b

Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.FileListAbsolute.txt

@@ -34,3 +34,5 @@ D:\WORK\C宁波拆迁\h5_codegit\Ewide.NbzsZheliban\obj\Debug\net5.0\Ewide.NbzsZ
 D:\WORK\C宁波拆迁\h5_codegit\Ewide.NbzsZheliban\obj\Debug\net5.0\Ewide.NbzsZheliban.dll
 D:\WORK\C宁波拆迁\h5_codegit\Ewide.NbzsZheliban\obj\Debug\net5.0\ref\Ewide.NbzsZheliban.dll
 D:\WORK\C宁波拆迁\h5_codegit\Ewide.NbzsZheliban\obj\Debug\net5.0\Ewide.NbzsZheliban.pdb
+D:\WORK\C宁波拆迁\h5_codegit\Ewide.NbzsZheliban\bin\Debug\net5.0\Ewide.Nbzs.Entity.dll
+D:\WORK\C宁波拆迁\h5_codegit\Ewide.NbzsZheliban\bin\Debug\net5.0\Ewide.Nbzs.Entity.pdb

Ewide.NbzsZheliban/obj/Ewide.NbzsZheliban.csproj.nuget.dgspec.json

@@ -4,6 +4,69 @@
     "D:\\WORK\\C宁波拆迁\\h5_codegit\\Ewide.NbzsZheliban\\Ewide.NbzsZheliban.csproj": {}
   },
   "projects": {
+    "D:\\WORK\\C宁波拆迁\\h5_codegit\\Ewide.Nbzs.Entity\\Ewide.Nbzs.Entity.csproj": {
+      "version": "1.0.0",
+      "restore": {
+        "projectUniqueName": "D:\\WORK\\C宁波拆迁\\h5_codegit\\Ewide.Nbzs.Entity\\Ewide.Nbzs.Entity.csproj",
+        "projectName": "Ewide.Nbzs.Entity",
+        "projectPath": "D:\\WORK\\C宁波拆迁\\h5_codegit\\Ewide.Nbzs.Entity\\Ewide.Nbzs.Entity.csproj",
+        "packagesPath": "C:\\Users\\z1303\\.nuget\\packages\\",
+        "outputPath": "D:\\WORK\\C宁波拆迁\\h5_codegit\\Ewide.Nbzs.Entity\\obj\\",
+        "projectStyle": "PackageReference",
+        "fallbackFolders": [
+          "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
+        ],
+        "configFilePaths": [
+          "C:\\Users\\z1303\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
+        ],
+        "originalTargetFrameworks": [
+          "net5.0"
+        ],
+        "sources": {
+          "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+          "https://api.nuget.org/v3/index.json": {}
+        },
+        "frameworks": {
+          "net5.0": {
+            "targetAlias": "net5.0",
+            "projectReferences": {}
+          }
+        },
+        "warningProperties": {
+          "warnAsError": [
+            "NU1605"
+          ]
+        }
+      },
+      "frameworks": {
+        "net5.0": {
+          "targetAlias": "net5.0",
+          "dependencies": {
+            "Newtonsoft.Json": {
+              "target": "Package",
+              "version": "[13.0.1, )"
+            }
+          },
+          "imports": [
+            "net461",
+            "net462",
+            "net47",
+            "net471",
+            "net472",
+            "net48"
+          ],
+          "assetTargetFallback": true,
+          "warn": true,
+          "frameworkReferences": {
+            "Microsoft.NETCore.App": {
+              "privateAssets": "all"
+            }
+          },
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.400\\RuntimeIdentifierGraph.json"
+        }
+      }
+    },
     "D:\\WORK\\C宁波拆迁\\h5_codegit\\Ewide.NbzsZheliban\\Ewide.NbzsZheliban.csproj": {
       "version": "1.0.0",
       "restore": {
@@ -31,6 +94,9 @@
           "net5.0": {
             "targetAlias": "net5.0",
             "projectReferences": {
+              "D:\\WORK\\C宁波拆迁\\h5_codegit\\Ewide.Nbzs.Entity\\Ewide.Nbzs.Entity.csproj": {
+                "projectPath": "D:\\WORK\\C宁波拆迁\\h5_codegit\\Ewide.Nbzs.Entity\\Ewide.Nbzs.Entity.csproj"
+              },
               "D:\\WORK\\C宁波拆迁\\h5_codegit\\framework\\Api\\Ewide.Core\\Ewide.Core.csproj": {
                 "projectPath": "D:\\WORK\\C宁波拆迁\\h5_codegit\\framework\\Api\\Ewide.Core\\Ewide.Core.csproj"
               }
@@ -311,7 +377,7 @@
       }
     },
     "D:\\WORK\\C宁波拆迁\\h5_codegit\\framework\\Api\\Furion\\framework\\Furion.Extras.DatabaseAccessor.SqlSugar\\Furion.Extras.DatabaseAccessor.SqlSugar.csproj": {
-      "version": "2.12.9",
+      "version": "2.18.7",
       "restore": {
         "projectUniqueName": "D:\\WORK\\C宁波拆迁\\h5_codegit\\framework\\Api\\Furion\\framework\\Furion.Extras.DatabaseAccessor.SqlSugar\\Furion.Extras.DatabaseAccessor.SqlSugar.csproj",
         "projectName": "Furion.Extras.DatabaseAccessor.SqlSugar",
@@ -351,7 +417,7 @@
           "dependencies": {
             "sqlSugarCore": {
               "target": "Package",
-              "version": "[5.0.3.2, )"
+              "version": "[5.0.3.8, )"
             }
           },
           "imports": [

Ewide.NbzsZheliban/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "F+lR6QByMivxEi8mdk0/4p7Mth3vh/jVtmUX4ptGAZsOxkzk0t+0Sd167LMYlewKbOoG5MmXRpocMXn6+hbnpg==",
+  "dgSpecHash": "3cavSErWO4NFfmMKlUz4YgJK6Tu5ftpqX+LZxWd1jncD2ai2Uj4kko3U9JQFGx/EFblHKsXrbTlvzoOZm3oTgg==",
   "success": true,
   "projectFilePath": "D:\\WORK\\C宁波拆迁\\h5_codegit\\Ewide.NbzsZheliban\\Ewide.NbzsZheliban.csproj",
   "expectedPackageFiles": [
@@ -27,6 +27,8 @@
     "C:\\Users\\z1303\\.nuget\\packages\\microsoft.codeanalysis.common\\3.11.0\\microsoft.codeanalysis.common.3.11.0.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\microsoft.codeanalysis.csharp\\3.11.0\\microsoft.codeanalysis.csharp.3.11.0.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\microsoft.csharp\\4.7.0\\microsoft.csharp.4.7.0.nupkg.sha512",
+    "C:\\Users\\z1303\\.nuget\\packages\\microsoft.data.sqlclient\\2.1.1\\microsoft.data.sqlclient.2.1.1.nupkg.sha512",
+    "C:\\Users\\z1303\\.nuget\\packages\\microsoft.data.sqlclient.sni.runtime\\2.1.1\\microsoft.data.sqlclient.sni.runtime.2.1.1.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\microsoft.data.sqlite\\2.2.4\\microsoft.data.sqlite.2.2.4.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\microsoft.data.sqlite.core\\2.2.4\\microsoft.data.sqlite.core.2.2.4.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\microsoft.entityframeworkcore\\5.0.9\\microsoft.entityframeworkcore.5.0.9.nupkg.sha512",
@@ -49,32 +51,32 @@
     "C:\\Users\\z1303\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\microsoft.extensions.options.configurationextensions\\2.0.0\\microsoft.extensions.options.configurationextensions.2.0.0.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.0\\microsoft.extensions.primitives.5.0.0.nupkg.sha512",
-    "C:\\Users\\z1303\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\6.7.1\\microsoft.identitymodel.jsonwebtokens.6.7.1.nupkg.sha512",
-    "C:\\Users\\z1303\\.nuget\\packages\\microsoft.identitymodel.logging\\6.7.1\\microsoft.identitymodel.logging.6.7.1.nupkg.sha512",
-    "C:\\Users\\z1303\\.nuget\\packages\\microsoft.identitymodel.protocols\\6.7.1\\microsoft.identitymodel.protocols.6.7.1.nupkg.sha512",
-    "C:\\Users\\z1303\\.nuget\\packages\\microsoft.identitymodel.protocols.openidconnect\\6.7.1\\microsoft.identitymodel.protocols.openidconnect.6.7.1.nupkg.sha512",
-    "C:\\Users\\z1303\\.nuget\\packages\\microsoft.identitymodel.tokens\\6.7.1\\microsoft.identitymodel.tokens.6.7.1.nupkg.sha512",
+    "C:\\Users\\z1303\\.nuget\\packages\\microsoft.identity.client\\4.21.1\\microsoft.identity.client.4.21.1.nupkg.sha512",
+    "C:\\Users\\z1303\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\6.8.0\\microsoft.identitymodel.jsonwebtokens.6.8.0.nupkg.sha512",
+    "C:\\Users\\z1303\\.nuget\\packages\\microsoft.identitymodel.logging\\6.8.0\\microsoft.identitymodel.logging.6.8.0.nupkg.sha512",
+    "C:\\Users\\z1303\\.nuget\\packages\\microsoft.identitymodel.protocols\\6.8.0\\microsoft.identitymodel.protocols.6.8.0.nupkg.sha512",
+    "C:\\Users\\z1303\\.nuget\\packages\\microsoft.identitymodel.protocols.openidconnect\\6.8.0\\microsoft.identitymodel.protocols.openidconnect.6.8.0.nupkg.sha512",
+    "C:\\Users\\z1303\\.nuget\\packages\\microsoft.identitymodel.tokens\\6.8.0\\microsoft.identitymodel.tokens.6.8.0.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.netcore.targets\\1.1.0\\microsoft.netcore.targets.1.1.0.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.win32.primitives\\4.3.0\\microsoft.win32.primitives.4.3.0.nupkg.sha512",
-    "C:\\Users\\z1303\\.nuget\\packages\\microsoft.win32.registry\\4.4.0\\microsoft.win32.registry.4.4.0.nupkg.sha512",
+    "C:\\Users\\z1303\\.nuget\\packages\\microsoft.win32.registry\\4.7.0\\microsoft.win32.registry.4.7.0.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\microsoft.win32.systemevents\\5.0.0\\microsoft.win32.systemevents.5.0.0.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\miniprofiler.aspnetcore\\4.2.22\\miniprofiler.aspnetcore.4.2.22.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\miniprofiler.aspnetcore.mvc\\4.2.22\\miniprofiler.aspnetcore.mvc.4.2.22.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\miniprofiler.shared\\4.2.22\\miniprofiler.shared.4.2.22.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\mysql.data\\8.0.21\\mysql.data.8.0.21.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\netstandard.library\\1.6.1\\netstandard.library.1.6.1.nupkg.sha512",
-    "C:\\Users\\z1303\\.nuget\\packages\\newtonsoft.json\\12.0.3\\newtonsoft.json.12.0.3.nupkg.sha512",
+    "C:\\Users\\z1303\\.nuget\\packages\\newtonsoft.json\\13.0.1\\newtonsoft.json.13.0.1.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\npgsql\\4.1.3.1\\npgsql.4.1.3.1.nupkg.sha512",
-    "C:\\Users\\z1303\\.nuget\\packages\\oracle.manageddataaccess.core\\2.18.3\\oracle.manageddataaccess.core.2.18.3.nupkg.sha512",
+    "C:\\Users\\z1303\\.nuget\\packages\\oracle.manageddataaccess.core\\3.21.1\\oracle.manageddataaccess.core.3.21.1.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\portable.bouncycastle\\1.8.10\\portable.bouncycastle.1.8.10.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\quartz\\3.3.2\\quartz.3.3.2.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\runtime.native.system\\4.3.0\\runtime.native.system.4.3.0.nupkg.sha512",
-    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\runtime.native.system.data.sqlclient.sni\\4.4.0\\runtime.native.system.data.sqlclient.sni.4.4.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\runtime.native.system.io.compression\\4.3.0\\runtime.native.system.io.compression.4.3.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\runtime.native.system.net.http\\4.3.0\\runtime.native.system.net.http.4.3.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512",
@@ -87,9 +89,6 @@
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
-    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\runtime.win-arm64.runtime.native.system.data.sqlclient.sni\\4.4.0\\runtime.win-arm64.runtime.native.system.data.sqlclient.sni.4.4.0.nupkg.sha512",
-    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\runtime.win-x64.runtime.native.system.data.sqlclient.sni\\4.4.0\\runtime.win-x64.runtime.native.system.data.sqlclient.sni.4.4.0.nupkg.sha512",
-    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\runtime.win-x86.runtime.native.system.data.sqlclient.sni\\4.4.0\\runtime.win-x86.runtime.native.system.data.sqlclient.sni.4.4.0.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\serilog\\2.10.0\\serilog.2.10.0.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\serilog.aspnetcore\\4.1.0\\serilog.aspnetcore.4.1.0.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\serilog.extensions.hosting\\4.1.2\\serilog.extensions.hosting.4.1.2.nupkg.sha512",
@@ -105,7 +104,7 @@
     "C:\\Users\\z1303\\.nuget\\packages\\sqlitepclraw.lib.e_sqlite3.osx\\1.1.12\\sqlitepclraw.lib.e_sqlite3.osx.1.1.12.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\sqlitepclraw.lib.e_sqlite3.v110_xp\\1.1.12\\sqlitepclraw.lib.e_sqlite3.v110_xp.1.1.12.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\sqlitepclraw.provider.e_sqlite3.netstandard11\\1.1.12\\sqlitepclraw.provider.e_sqlite3.netstandard11.1.1.12.nupkg.sha512",
-    "C:\\Users\\z1303\\.nuget\\packages\\sqlsugarcore\\5.0.3.2\\sqlsugarcore.5.0.3.2.nupkg.sha512",
+    "C:\\Users\\z1303\\.nuget\\packages\\sqlsugarcore\\5.0.3.8\\sqlsugarcore.5.0.3.8.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\sqlsugarcore.dm\\1.0.0\\sqlsugarcore.dm.1.0.0.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\sqlsugarcore.kdbndp\\1.0.0\\sqlsugarcore.kdbndp.1.0.0.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\ssh.net\\2016.1.0\\ssh.net.2016.1.0.nupkg.sha512",
@@ -125,23 +124,26 @@
     "C:\\Users\\z1303\\.nuget\\packages\\system.configuration.configurationmanager\\4.7.0\\system.configuration.configurationmanager.4.7.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.console\\4.3.0\\system.console.4.3.0.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\system.data.common\\4.3.0\\system.data.common.4.3.0.nupkg.sha512",
-    "C:\\Users\\z1303\\.nuget\\packages\\system.data.sqlclient\\4.4.0\\system.data.sqlclient.4.4.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.diagnostics.debug\\4.3.0\\system.diagnostics.debug.4.3.0.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\system.diagnostics.diagnosticsource\\5.0.1\\system.diagnostics.diagnosticsource.5.0.1.nupkg.sha512",
+    "C:\\Users\\z1303\\.nuget\\packages\\system.diagnostics.performancecounter\\4.7.0\\system.diagnostics.performancecounter.4.7.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.diagnostics.stacktrace\\4.3.0\\system.diagnostics.stacktrace.4.3.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.diagnostics.tools\\4.3.0\\system.diagnostics.tools.4.3.0.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\system.diagnostics.tracesource\\4.0.0\\system.diagnostics.tracesource.4.0.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.diagnostics.tracing\\4.3.0\\system.diagnostics.tracing.4.3.0.nupkg.sha512",
+    "C:\\Users\\z1303\\.nuget\\packages\\system.directoryservices\\4.7.0\\system.directoryservices.4.7.0.nupkg.sha512",
+    "C:\\Users\\z1303\\.nuget\\packages\\system.directoryservices.protocols\\4.7.0\\system.directoryservices.protocols.4.7.0.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\system.drawing.common\\5.0.2\\system.drawing.common.5.0.2.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.dynamic.runtime\\4.3.0\\system.dynamic.runtime.4.3.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.globalization\\4.3.0\\system.globalization.4.3.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.globalization.calendars\\4.3.0\\system.globalization.calendars.4.3.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.globalization.extensions\\4.3.0\\system.globalization.extensions.4.3.0.nupkg.sha512",
-    "C:\\Users\\z1303\\.nuget\\packages\\system.identitymodel.tokens.jwt\\6.7.1\\system.identitymodel.tokens.jwt.6.7.1.nupkg.sha512",
+    "C:\\Users\\z1303\\.nuget\\packages\\system.identitymodel.tokens.jwt\\6.8.0\\system.identitymodel.tokens.jwt.6.8.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.io.compression\\4.3.0\\system.io.compression.4.3.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.io.compression.zipfile\\4.3.0\\system.io.compression.zipfile.4.3.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.io.filesystem\\4.3.0\\system.io.filesystem.4.3.0.nupkg.sha512",
+    "C:\\Users\\z1303\\.nuget\\packages\\system.io.filesystem.accesscontrol\\4.7.0\\system.io.filesystem.accesscontrol.4.7.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.io.filesystem.primitives\\4.3.0\\system.io.filesystem.primitives.4.3.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.linq\\4.3.0\\system.linq.4.3.0.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\system.linq.dynamic.core\\1.2.2\\system.linq.dynamic.core.1.2.2.nupkg.sha512",
@@ -162,6 +164,7 @@
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.reflection.typeextensions\\4.3.0\\system.reflection.typeextensions.4.3.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.resources.resourcemanager\\4.3.0\\system.resources.resourcemanager.4.3.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.runtime\\4.3.0\\system.runtime.4.3.0.nupkg.sha512",
+    "C:\\Users\\z1303\\.nuget\\packages\\system.runtime.caching\\4.7.0\\system.runtime.caching.4.7.0.nupkg.sha512",
     "C:\\Users\\z1303\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\5.0.0\\system.runtime.compilerservices.unsafe.5.0.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512",
     "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.runtime.handles\\4.3.0\\system.runtime.handles.4.3.0.nupkg.sha512",

framework/.gitignore

@@ -0,0 +1,9 @@
+bin/
+obj/
+*.user
+/Publish
+/packages
+.vs
+Logs/
+Upload
+dbsettings.Development.json

framework/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Api/Furion"]
+	path = Api/Furion
+	url = https://gitee.com/dotnetchina/Furion.git

framework/Api/Ewide.Application/Entity/BsHouseCode.cs

@@ -0,0 +1,52 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Ewide.Application
+{
+    [Table("bs_house_code")]
+    [Comment("房屋编码表")]
+    public class BsHouseCode : Core.DEntityBase
+    {
+        [Comment("系统中唯一的房屋编码，生成即不再变更")]
+        [MaxLength(50)]
+        [Required]
+        public string HouseCode { get; set; }
+
+        [Comment("编号")]
+        [MaxLength(3)]
+        [Required]
+        public int No { get; set; }
+
+        [Comment("项目ID")]
+        [MaxLength(36)]
+        [Required]
+        public string ProjectId { get; set; }
+
+        [Comment("片区ID")]
+        [MaxLength(36)]
+        [Required]
+        public string ZoneId { get; set; }
+
+        [Comment("详细地址")]
+        [MaxLength(500)]
+        [Required]
+        public string Address { get; set; }
+
+        [Comment("性质")]
+        [Required]
+        public int Type { get; set; }
+
+        [Comment("所属行业")]
+        [Required]
+        public int Industry { get; set; }
+
+        [Comment("坐标-经度")]
+        [MaxLength(50)]
+        public string Lng { get; set; }
+
+        [Comment("坐标-纬度")]
+        [MaxLength(50)]
+        public string Lat { get; set; }
+    }
+}

framework/Api/Ewide.Application/Entity/BsHouseCompany.cs

@@ -0,0 +1,36 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application
+{
+    [Table("bs_house_company")]
+    [Comment("房屋相关单位表")]
+    public class BsHouseCompany : Core.DEntityBase
+    {
+        /// <summary>
+        /// 单位类型，多选
+        /// </summary>
+        [Comment("单位类型，多选")]
+        [MaxLength(20)]
+        public string Type { get; set; }
+
+        /// <summary>
+        /// 单位名称
+        /// </summary>
+        [Comment("单位名称")]
+        [MaxLength(200)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 信息
+        /// </summary>
+        [Comment("信息")]
+        public string Info { get; set; }
+    }
+}

framework/Api/Ewide.Application/Entity/BsHouseInfo.cs

@@ -0,0 +1,378 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application
+{
+	[Table("bs_house_info")]
+	[Comment("房屋信息表")]
+	public class BsHouseInfo : Core.DEntityBase
+    {
+		/// <summary>
+		/// HouseCode主键ID
+		/// </summary>
+		[Comment("bs_house_code主键Id")]
+		[MaxLength(36)]
+		[Required]
+		public string HouseCodeId { get; set; }
+
+		/// <summary>
+		/// 幢名称
+		/// </summary>
+		[Comment("幢名称")]
+		[MaxLength(255)]
+		public string BuildingName { get; set; }
+
+		/// <summary>
+		/// 土地性质
+		/// </summary>
+		[Comment("土地性质")]
+		public int? LandAttribute { get; set; }
+
+		/// <summary>
+		/// 结构类型
+		/// </summary>
+		[Comment("结构类型")]
+		public int? StructureType { get; set; }
+
+		/// <summary>
+		/// 基础情况
+		/// </summary>
+		[Comment("基础情况")]
+		public int? BaseInfo { get; set; }
+
+		/// <summary>
+		/// 抗震等级
+		/// </summary>
+		[Comment("抗震等级")]
+		public int? SeismicGrade { get; set; }
+
+		/// <summary>
+		/// 竣工日期
+		/// </summary>
+		[Comment("竣工日期")]
+		public DateTime? CompletedDate { get; set; }
+
+		/// <summary>
+		/// 设计使用年限
+		/// </summary>
+		[Comment("设计使用年限")]
+		public int? UsefulYear { get; set; }
+
+		/// <summary>
+		/// 总层数
+		/// </summary>
+		[Comment("总层数")]
+		public int? TotalFloor { get; set; }
+
+		/// <summary>
+		/// 地上层数
+		/// </summary>
+		[Comment("地上层数")]
+		public int? LandFloorCount { get; set; }
+
+		/// <summary>
+		/// 地上商业层数开始
+		/// </summary>
+		[Comment("地上商业层数开始")]
+		public int? LandBsFloorStart { get; set; }
+
+		/// <summary>
+		/// 地上商业层数结束
+		/// </summary>
+		[Comment("地上商业层数结束")]
+		public int? LandBsFloorEnd { get; set; }
+
+		/// <summary>
+		/// 地上车棚层开始
+		/// </summary>
+		[Comment("地上车棚层开始")]
+		public int? LandBikeFloorStart { get; set; }
+
+		/// <summary>
+		/// 地上住宅层开始
+		/// </summary>
+		[Comment("地上住宅层开始")]
+		public int? LandResidenceFloorStart { get; set; }
+
+		/// <summary>
+		/// 地上住宅层结束
+		/// </summary>
+		[Comment("地上住宅层结束")]
+		public int? LandResidenceFloorEnd { get; set; }
+
+		/// <summary>
+		/// 地下层数
+		/// </summary>
+		[Comment("地下层数")]
+		public int? UnderFloorCount { get; set; }
+
+		/// <summary>
+		/// 总建筑面积
+		/// </summary>
+		[Comment("总建筑面积")]
+		public float? TotalArea { get; set; }
+
+		/// <summary>
+		/// 有无建筑幕墙
+		/// </summary>
+		[Comment("有无建筑幕墙")]
+		public int? CurtainWall { get; set; }
+
+		/// <summary>
+		/// 有无面砖
+		/// </summary>
+		[Comment("有无面砖")]
+		public int? FaceBrick { get; set; }
+
+		/// <summary>
+		/// 有无涂料
+		/// </summary>
+		[Comment("有无涂料")]
+		public int? Coating { get; set; }
+
+		/// <summary>
+		/// 有无粉刷
+		/// </summary>
+		[Comment("有无粉刷")]
+		public int? Painting { get; set; }
+
+		/// <summary>
+		/// 电梯
+		/// </summary>
+		[Comment("电梯")]
+		[MaxLength(20)]
+		public string Elevator { get; set; }
+
+		/// <summary>
+		/// 总户数（户）
+		/// </summary>
+		[Comment("总户数（户）")]
+		public int? HouseHolds { get; set; }
+
+		/// <summary>
+		/// 房屋单元数
+		/// </summary>
+		[Comment("房屋单元数")]
+		public int? Units { get; set; }
+
+		/// <summary>
+		/// 各单元每层户数（户）
+		/// </summary>
+		[Comment("各单元每层户数（户）")]
+		public int? UnitFloorHolds { get; set; }
+
+		/// <summary>
+		/// 建设单位ID
+		/// </summary>
+		[Comment("建设单位ID")]
+		[MaxLength(36)]
+		public string BuildingUnitId { get; set; }
+
+		/// <summary>
+		/// 设计单位ID
+		/// </summary>
+		[Comment("设计单位ID")]
+		[MaxLength(36)]
+		public string DesingerUnitId { get; set; }
+
+		/// <summary>
+		/// 施工单位ID
+		/// </summary>
+		[Comment("施工单位ID")]
+		[MaxLength(36)]
+		public string ConstructionUnitId { get; set; }
+
+		/// <summary>
+		/// 监理单位ID
+		/// </summary>
+		[Comment("监理单位ID")]
+		[MaxLength(36)]
+		public string MonitorUnitId { get; set; }
+
+		/// <summary>
+		/// 产权性质
+		/// </summary>
+		[Comment("产权性质")]
+		[MaxLength(100)]
+		public string PropertyRights { get; set; }
+
+		/// <summary>
+		/// 总共套数
+		/// </summary>
+		[Comment("总共套数")]
+		public int? HouseCount { get; set; }
+
+		/// <summary>
+		/// 直管公房套数
+		/// </summary>
+		[Comment("直管公房套数")]
+		public int? StraightHouseCount { get; set; }
+
+		/// <summary>
+		/// 自管公房套数
+		/// </summary>
+		[Comment("自管公房套数")]
+		public int? SelfHouseCount { get; set; }
+
+		/// <summary>
+		/// 私房套数
+		/// </summary>
+		[Comment("私房套数")]
+		public int? PrivateHouseCount { get; set; }
+
+		/// <summary>
+		/// 商品房套数
+		/// </summary>
+		[Comment("商品房套数")]
+		public int? BusinessCount { get; set; }
+
+		/// <summary>
+		/// 房改房套数
+		/// </summary>
+		[Comment("房改房套数")]
+		public int? ChangeHouseCount { get; set; }
+
+		/// <summary>
+		/// 拆迁安置房套数
+		/// </summary>
+		[Comment("拆迁安置房套数")]
+		public int? ResettlementHouseCount { get; set; }
+
+		/// <summary>
+		/// 其它套数
+		/// </summary>
+		[Comment("其它套数")]
+		public int? OtherCount { get; set; }
+
+		/// <summary>
+		/// 产权单位ID
+		/// </summary>
+		[Comment("产权单位ID")]
+		[MaxLength(36)]
+		public string PropertyUnitId { get; set; }
+
+		/// <summary>
+		/// 物业单位ID
+		/// </summary>
+		[Comment("物业单位ID")]
+		[MaxLength(36)]
+		public string WuYeUnitId { get; set; }
+
+		/// <summary>
+		/// 图纸资料存档处
+		/// </summary>
+		[Comment("图纸资料存档处")]
+		[MaxLength(50)]
+		public string DrawingMaterial { get; set; }
+
+		/// <summary>
+		/// 其他图纸存档
+		/// </summary>
+		[Comment("其他图纸存档")]
+		[MaxLength(100)]
+		public string DrawingMaterialText { get; set; }
+
+		/// <summary>
+		/// 立项文件
+		/// </summary>
+		[Comment("立项文件")]
+		[MaxLength(2000)]
+		public string AnEntryDocument { get; set; }
+
+		/// <summary>
+		/// 规划许可
+		/// </summary>
+		[Comment("规划许可")]
+		[MaxLength(2000)]
+		public string PlanningPermission { get; set; }
+
+		/// <summary>
+		/// 竣工验收备案
+		/// </summary>
+		[Comment("竣工验收备案")]
+		[MaxLength(2000)]
+		public string CompletionRecord { get; set; }
+
+		/// <summary>
+		/// 监理资料
+		/// </summary>
+		[Comment("监理资料")]
+		[MaxLength(2000)]
+		public string MonitorDocument { get; set; }
+
+		/// <summary>
+		/// 鉴定报告
+		/// </summary>
+		[Comment("鉴定报告")]
+		[MaxLength(2000)]
+		public string IdentificationReport { get; set; }
+
+		/// <summary>
+		/// 其它资料
+		/// </summary>
+		[Comment("其它资料")]
+		[MaxLength(2000)]
+		public string OtherDocument { get; set; }
+
+		/// <summary>
+		/// 外立面照片
+		/// </summary>
+		[Comment("外立面照片")]
+		[MaxLength(2000)]
+		public string FacadePhoto { get; set; }
+
+		/// <summary>
+		/// 房屋等级 1,2,3,4,C,d
+		/// </summary>
+		[Comment("房屋等级 1,2,3,4,C,d")]
+		public int? HouseGrade { get; set; }
+
+		/// <summary>
+		/// 房屋使用状态
+		/// </summary>
+		[Comment("房屋使用状态")]
+		public int? HouseUsedStatus { get; set; }
+
+		/// <summary>
+		/// -1 退回（审核被退回的数据） 1、待建档（需要建档的数据未暂存未保存的）2、暂存（点击了暂存的数据）3、待提交（点击了保存的数据） 5、审核中6、审核通过
+		/// </summary>
+		[Comment("-1 退回（审核被退回的数据） 1、待建档（需要建档的数据未暂存未保存的）2、暂存（点击了暂存的数据）3、待提交（点击了保存的数据） 5、审核中6、审核通过")]
+		[Required]
+		public int State { get; set; }
+
+		/// <summary>
+		/// 调查登记机构
+		/// </summary>
+		[Comment("调查登记机构")]
+		[MaxLength(100)]
+		public string InvestigateAgency { get; set; }
+
+		/// <summary>
+		/// 纸质资料调查人
+		/// </summary>
+		[Comment("纸质资料调查人")]
+		[MaxLength(50)]
+		public string InvestigateUser { get; set; }
+
+		/// <summary>
+		/// 纸质资料审核人
+		/// </summary>
+		[Comment("纸质资料审核人")]
+		[MaxLength(50)]
+		public string OfflineAuditor { get; set; }
+
+		/// <summary>
+		/// 主管部门
+		/// </summary>
+		[Comment("主管部门")]
+		[MaxLength(50)]
+		public string CompetentDepartment { get; set; }
+
+	}
+}

framework/Api/Ewide.Application/Entity/BsHouseLog.cs

@@ -0,0 +1,46 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application
+{
+    [Table("bs_house_log")]
+    [Comment("房屋流转日志")]
+    public class BsHouseLog : Core.DEntityBase
+    {
+        [Comment("房屋编码Id")]
+        [MaxLength(36)]
+        public string HouseCodeId { get; set; }
+
+        [Comment("目标处理人Id，可多个")]
+        public string TargetUserIds { get; set; }
+
+        [Comment("步骤类型")]
+        public HouseLogType Type { get; set; }
+
+        [Comment("状态")]
+        public HouseLogStatus Status { get; set; }
+
+        [Comment("备注信息")]
+        public string Remark { get; set; }
+
+        [Comment("完成时间")]
+        public DateTime? FinishedTime { get; set; }
+
+        [Comment("完成者Id")]
+        [MaxLength(36)]
+        public string FinishedUserId { get; set; }
+
+        [Comment("完成者名称")]
+        [MaxLength(20)]
+        public string FinishedUserName { get; set; }
+
+        [Comment("排序")]
+        public int Sort { get; set; }
+    }
+}

framework/Api/Ewide.Application/Entity/BsHouseMemberRelation.cs

@@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application
+{
+    [Table("bs_house_member_relation")]
+    [Comment("房屋与人员关联表")]
+    public class BsHouseMemberRelation : Core.DEntityBase
+    {
+        [Comment("sys_user主键Id")]
+        [MaxLength(36)]
+        [Required]
+        public string SysUserId { get; set; }
+
+        [Comment("bs_house_code主键Id")]
+        [MaxLength(36)]
+        [Required]
+        public string HouseCodeId { get; set; }
+    }
+}

framework/Api/Ewide.Application/Entity/BsHouseProjectInfo.cs

@@ -0,0 +1,38 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application.Entity
+{
+    [Table("bs_house_projectinfo")]
+    [Comment("项目表")]
+    public class BsHouseProjectInfo : Core.DEntityBase
+    {
+        [Comment("名称")]
+        [MaxLength(100)]
+        [Required]
+        public string Name { get; set; }
+
+        [Comment("备注")]
+        [MaxLength(1000)]
+        public string Note { get; set; }
+
+        [Comment("排序")]
+        [Required]
+        public int Sort { get; set; }
+
+        [Comment("区域ID")]
+        [MaxLength(36)]
+        [Required]
+        public string AreaCode { get; set; }
+
+        [Comment("类型")]
+        [Required]
+        public int Type { get; set; }
+    }
+}

framework/Api/Ewide.Application/Entity/BsHouseTask.cs

@@ -0,0 +1,266 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Ewide.Application
+{
+	[Table("bs_house_task")]
+	[Comment("房屋巡查任务表")]
+	public class BsHouseTask : Core.DEntityBase
+	{
+		/// <summary>
+		/// bs_house_code主键Id
+		/// </summary>
+		[Comment("bs_house_code主键Id")]
+		[MaxLength(36)]
+		[Required]
+		public string HouseCodeId { get; set; }
+
+		/// <summary>
+		/// 巡查日期
+		/// </summary>
+		[Comment("巡查日期")]
+		public DateTime? PatrolDate { get; set; }
+
+		/// <summary>
+		/// 巡查人姓名
+		/// </summary>
+		[Comment("巡查人姓名")]
+		[MaxLength(50)]
+		public string PatrolUser { get; set; }
+
+		/// <summary>
+		/// 沉降倾斜
+		/// </summary>
+		[Comment("沉降倾斜")]
+		[MaxLength(1000)]
+		public string SettlementTilt { get; set; }
+
+		/// <summary>
+		/// 沉降倾斜附件
+		/// </summary>
+		[Comment("沉降倾斜附件")]
+		[MaxLength(2000)]
+		public string SettlementTiltFiles { get; set; }
+
+		/// <summary>
+		/// 其他情况
+		/// </summary>
+		[Comment("其他情况")]
+		[MaxLength(1000)]
+		public string OtherInfo { get; set; }
+
+		/// <summary>
+		/// 其他情况附件
+		/// </summary>
+		[Comment("其他情况附件")]
+		[MaxLength(2000)]
+		public string OtherInfoFiles { get; set; }
+
+		/// <summary>
+		/// 初始等级
+		/// </summary>
+		[Comment("初始等级")]
+		public int? InitGrade { get; set; }
+
+		/// <summary>
+		/// 损坏等级
+		/// </summary>
+		[Comment("损坏等级")]
+		public int? DamageGrade { get; set; }
+
+		/// <summary>
+		/// 综合等级
+		/// </summary>
+		[Comment("综合等级")]
+		public int? ComprehensiveGrade { get; set; }
+
+		/// <summary>
+		/// 房屋场地
+		/// </summary>
+		[Comment("房屋场地")]
+		[MaxLength(100)]
+		public string HouseSite { get; set; }
+
+		/// <summary>
+		/// 相邻施工
+		/// </summary>
+		[Comment("相邻施工")]
+		[MaxLength(100)]
+		public string AdjacentConstruction { get; set; }
+
+		/// <summary>
+		/// 化学侵蚀
+		/// </summary>
+		[Comment("化学侵蚀")]
+		[MaxLength(100)]
+		public string ChemicalErosion { get; set; }
+
+		/// <summary>
+		/// 结构拆改
+		/// </summary>
+		[Comment("结构拆改")]
+		public int? StructuralDismantling { get; set; }
+
+		/// <summary>
+		/// 加层改造
+		/// </summary>
+		[Comment("加层改造")]
+		public int? AddingLayer { get; set; }
+
+		/// <summary>
+		/// 修缮加固
+		/// </summary>
+		[Comment("修缮加固")]
+		[MaxLength(100)]
+		public string RepairAndReinforce { get; set; }
+
+		/// <summary>
+		/// 历史灾害
+		/// </summary>
+		[Comment("历史灾害")]
+		[MaxLength(100)]
+		public string HistoricalCalamity { get; set; }
+
+		/// <summary>
+		/// 使用功能变更
+		/// </summary>
+		[Comment("使用功能变更")]
+		[MaxLength(100)]
+		public string FunctionalChange { get; set; }
+
+		/// <summary>
+		/// 其他调查内容
+		/// </summary>
+		[Comment("其他调查内容")]
+		[MaxLength(1000)]
+		public string OtherContents { get; set; }
+
+		/// <summary>
+		/// 主要安全隐患综述
+		/// </summary>
+		[Comment("主要安全隐患综述")]
+		[MaxLength(1000)]
+		public string MainSafety { get; set; }
+
+		/// <summary>
+		/// 处理意见
+		/// </summary>
+		[Comment("处理意见")]
+		public int? HandlingOpinion { get; set; }
+
+		/// <summary>
+		/// 处理意见备注
+		/// </summary>
+		[Comment("处理意见备注")]
+		[MaxLength(1000)]
+		public string HandlingOpinionRemark { get; set; }
+
+		/// <summary>
+		/// 整改情况
+		/// </summary>
+		[Comment("整改情况")]
+		public int? RectifyAndReform { get; set; }
+
+		/// <summary>
+		/// 整改情况备注
+		/// </summary>
+		[Comment("整改情况备注")]
+		[MaxLength(1000)]
+		public string RectifyAndReformRemark { get; set; }
+
+		/// <summary>
+		/// 巡查结果：1正常,-1异常
+		/// </summary>
+		[Comment("巡查结果：1正常,-1异常")]
+		public int? PatrolResult { get; set; }
+
+		/// <summary>
+		/// 巡查异常描述
+		/// </summary>
+		[Comment("巡查异常描述")]
+		[MaxLength(1000)]
+		public string PatrolResultRemark { get; set; }
+
+		/// <summary>
+		/// 任务人员ID
+		/// </summary>
+		[Comment("任务人员ID")]
+		[MaxLength(36)]
+		public string UserID { get; set; }
+
+		/// <summary>
+		/// 任务截止时间
+		/// </summary>
+		[Comment("任务截止时间")]
+		public DateTime? EndTime { get; set; }
+
+		/// <summary>
+		/// 是否过期
+		/// </summary>
+		[Comment("是否过期")]
+		public bool? IsDelay { get; set; }
+
+		/// <summary>
+		/// -1：退回0：待处理1：保存待提交2：待审核3：审核通过
+		/// </summary>
+		[Comment("-1：退回0：待处理1：保存待提交2：待审核6：审核通过")]
+		public int Status { get; set; } = 0;
+
+		/// <summary>
+		/// 0：建档任务1：系统派发的巡查任务2：主动巡查任务
+		/// </summary>
+		[Comment("0：建档任务1：系统派发的巡查任务2：主动巡查任务")]
+		public int? TaskType { get; set; }
+
+		/// <summary>
+		/// 上报街道
+		/// </summary>
+		[Comment("上报街道")]
+		public int? ReportRoad { get; set; }
+
+		/// <summary>
+		/// 上报街道时间
+		/// </summary>
+		[Comment("上报街道时间")]
+		public DateTime? ReportRoadTime { get; set; }
+
+		/// <summary>
+		/// 上报区住建
+		/// </summary>
+		[Comment("上报区住建")]
+		public int? ReportArea { get; set; }
+
+		/// <summary>
+		/// 上报区住建时间
+		/// </summary>
+		[Comment("上报区住建时间")]
+		public DateTime? ReportAreaTime { get; set; }
+
+		/// <summary>
+		/// 上报备注
+		/// </summary>
+		[Comment("上报备注")]
+		[MaxLength(1000)]
+		public string ReportRemark { get; set; }
+
+		/// <summary>
+		/// 提交时间
+		/// </summary>
+		[Comment("提交时间")]
+		public DateTime? SubmitTime { get; set; }
+
+		/// <summary>
+		/// 最后提交时间
+		/// </summary>
+		[Comment("最后提交时间")]
+		public DateTime? LastSubmitTime { get; set; }
+
+		/// <summary>
+		/// 是否有效
+		/// </summary>
+		[Comment("是否有效")]
+		public bool IsEnabled { get; set; } = true;
+	}
+}

framework/Api/Ewide.Application/Entity/BsHouseTaskCheckRecord.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Microsoft.EntityFrameworkCore;
+
+namespace Ewide.Application
+{
+    [Table("bs_house_task_check_record")]
+    [Comment("房屋任务审核记录表")]
+    public class BsHouseTaskCheckRecord : Core.DEntityBase
+    {
+        /// <summary>
+        /// 任务Id
+        /// </summary>
+        [Comment("任务Id")]
+        [MaxLength(36)]
+        public string TaskId { get; set; }
+
+        /// <summary>
+        /// 通过1；退回-1
+        /// </summary>
+        [Comment("通过3；退回-1")]
+        public int PassOrBack { get; set; }
+
+        /// <summary>
+        /// 审核内容
+        /// </summary>
+        [Comment("审核内容")]
+        [MaxLength(500)]
+        public string Content { get; set; }
+    }
+}

framework/Api/Ewide.Application/Entity/BsHouseTaskOptions.cs

@@ -0,0 +1,60 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+namespace Ewide.Application
+{
+	[Table("bs_house_task_options")]
+	[Comment("房屋巡查任务选项表")]
+	public class BsHouseTaskOptions : Core.DEntityBase
+	{
+		/// <summary>
+		/// bs_house_code主键Id
+		/// </summary>
+		[Comment("bs_house_code主键Id")]
+		[MaxLength(36)]
+		[Required]
+		public string TaskId { get; set; }
+
+		/// <summary>
+		/// 字典类型
+		/// </summary>
+		[Comment("字典类型")]
+		[MaxLength(50)]
+		public string DictType { get; set; }
+
+		/// <summary>
+		/// 字典code
+		/// </summary>
+		[Comment("字典code")]
+		[MaxLength(50)]
+		public string DictCode { get; set; }
+
+		/// <summary>
+		/// 字典值
+		/// </summary>
+		[Comment("字典值")]
+		[MaxLength(100)]
+		public string DictValue { get; set; }
+
+		/// <summary>
+		/// 备注
+		/// </summary>
+		[Comment("备注")]
+		[MaxLength(500)]
+		public string Remark { get; set; }
+
+		/// <summary>
+		/// 附件
+		/// </summary>
+		[Comment("附件")]
+		[MaxLength(2000)]
+		public string File { get; set; }
+
+		/// <summary>
+		/// 是否选中
+		/// </summary>
+		[Comment("是否选中")]
+		public bool? Checked { get; set; }
+	}
+}

framework/Api/Ewide.Application/Entity/README.md

@@ -0,0 +1 @@
+/** 您的业务实体文件写在此文件夹下面 **/

framework/Api/Ewide.Application/Enum/DataStatus.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application
+{
+    public enum DataStatus
+    {
+        /// <summary>
+        /// 审核退回
+        /// </summary>
+        [Description("审核退回")]
+        Back = -1,
+
+        /// <summary>
+        /// 初始未处理
+        /// </summary>
+        [Description("初始未处理")]
+        Init = 0,
+
+        /// <summary>
+        /// 暂存
+        /// </summary>
+        [Description("暂存")]
+        TempSaved = 1,
+
+        /// <summary>
+        /// 已保存，待提交
+        /// </summary>
+        [Description("已保存，待提交")]
+        Saved = 2,
+
+        /// <summary>
+        /// 已提交，待审核
+        /// </summary>
+        [Description("已提交，待审核")]
+        Submited = 3,
+
+        /// <summary>
+        /// 审核通过
+        /// </summary>
+        [Description("审核通过")]
+        Passed = 6
+    }
+}

framework/Api/Ewide.Application/Enum/HouseLog.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application
+{
+    public enum HouseLogType
+    {
+        [Description("创建房屋编码")]
+        CreateCode = 1,
+
+        [Description("人员选房")]
+        SelectMember = 2,
+
+        [Description("房屋建档")]
+        CreateInfo = 3,
+
+        [Description("审核")]
+        Check = 4,
+
+        [Description("审核通过")]
+        Agree = 5,
+
+        [Description("审核退回")]
+        Disagree = 6
+
+    }
+
+    public enum HouseLogStatus
+    {
+        [Description("待处理")]
+        Handle = 0,
+
+        [Description("正在处理")]
+        Handling = 1,
+
+        [Description("已处理")]
+        Handled = 2,
+    }
+}

framework/Api/Ewide.Application/Enum/HouseManagerRole.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application
+{
+    public enum HouseManagerRole
+    {
+        /// <summary>
+        /// 市住建部门
+        /// </summary>
+        CityManager,
+
+        /// <summary>
+        /// 区住建部门
+        /// </summary>
+        AreaManager,
+
+        /// <summary>
+        /// 街道管理员
+        /// </summary>
+        RoadManager,
+
+        /// <summary>
+        /// 片区监管员
+        /// </summary>
+        ZoneManager,
+
+        /// <summary>
+        /// 房屋安全管理员
+        /// </summary>
+        HouseSecurityManager
+    }
+}

framework/Api/Ewide.Application/Ewide.Application.csproj

@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <NoWarn>1701;1702;1591</NoWarn>
+    <DocumentationFile>Ewide.Application.xml</DocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="applicationsettings.json" />
+    <None Remove="Ewide.Application.xml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="applicationsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Ewide.Core\Ewide.Core.csproj" />
+    <ProjectReference Include="..\Ewide.EntityFramework.Core\Ewide.EntityFramework.Core.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+  </ItemGroup>
+
+</Project>

framework/Api/Ewide.Application/README.md

@@ -0,0 +1,3 @@
+1、原则上服务应该放在Application层次，考虑将咱自己的业务层直接写在Application里面好些，后续升级后，咱大家直接升级就行了，减少冲突！
+2、系统默认ORM为EF Core，如果觉得不趁手，可以自行更换
+3、在此应用层默认集成了SqlSugar,其他ORM类同，可以多个ORM并行开发，熟悉哪个用哪个

framework/Api/Ewide.Application/Service/HouseSafety/HouseCode/Dto/HouseCodeInput.cs

@@ -0,0 +1,65 @@
+using Ewide.Core;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application
+{
+    public class HouseCodeInput
+    {
+    }
+
+    public class AddHouseCodeInput : PageInputBase
+    {
+        public string HouseCode { get; set; }
+        [Required(ErrorMessage = "行政区域编码不能为空")]
+        public string AreaCode { get; set; }
+        [Required(ErrorMessage = "项目Id不能为空")]
+        public string ProjectId { get; set; }
+        [Required(ErrorMessage = "房屋编号不能为空")]
+        public int No { get; set; }
+        [Required(ErrorMessage = "片区Id不能为空")]
+        public string ZoneId { get; set; }
+        [Required(ErrorMessage = "房屋地址不能为空")]
+        public string Address { get; set; }
+        [Required(ErrorMessage = "房屋性质不能为空")]
+        public int Type { get; set; }
+        [Required(ErrorMessage = "所属行业不能为空")]
+        public int Industry { get; set; }
+        [Required(ErrorMessage = "经度不能为空")]
+        public string Lng { get; set; }
+        [Required(ErrorMessage = "纬度不能为空")]
+        public string Lat { get; set; }
+    }
+
+    public class EditHouseCodeInput : AddHouseCodeInput
+    {
+        [Required(ErrorMessage = "房屋编码Id不能为空")]
+        public string Id { get; set; }
+    }
+
+    public class DeleteHouseCodeInput
+    {
+        [Required(ErrorMessage = "房屋编码ID不可为空")]
+        public string Id { get; set; }
+    }
+
+    public class QueryHouseCodeInput : PageInputBase
+    {
+        public string HouseCode { get; set; }
+        public int? No { get; set; }
+        public string Address { get; set; }
+        public string ProjectId { get; set; }
+        public string ZoonId { get; set; }
+        public int Type { get; set; }
+    }
+
+    public class GetHouseCodeInput
+    {
+        [Required(ErrorMessage = "房屋编码ID不可为空")]
+        public string Id { get; set; }
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseCode/Dto/HouseCodeOutput.cs

@@ -0,0 +1,43 @@
+using Ewide.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application
+{
+    public class HouseCodeOutput 
+    {
+        public string Id { get; set; }
+        public string Address { get; set; }
+        public string ProjectId { get; set; }
+        public string ZoneId { get; set; }
+        public int Type { get; set; }
+        public string AreaName { get; set; }
+        public string RoadName { get; set; }
+        public string CommName { get; set; }
+        public string ZoneName { get; set; }
+        public string ProjectNote { get; set; }
+        public string FullProjName { get; set; }
+        public string HouseCode { get; set; }
+        public int No { get; set; }
+        public string Lng { get; set; }
+        public string Lat { get; set; }
+    }
+
+    public class GetHouseCodeOutput
+    {
+        public string Id { get; set; }
+        public string HouseCode { get; set; }
+        public int Type { get; set; }
+        public int Industry { get; set; }
+        public string AreaCode { get; set; }
+        public string ProjectId { get; set; }
+        public int No { get; set; }
+        public string ZoneId { get; set; }
+        public string Address { get; set; }
+        public string Lng { get; set; }
+        public string Lat { get; set; }
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseCode/HouseCodeService.cs

@@ -0,0 +1,123 @@
+using Ewide.Application.Entity;
+using Ewide.Core;
+using Furion.DatabaseAccessor;
+using Furion.DatabaseAccessor.Extensions;
+using Furion.DependencyInjection;
+using Furion.DynamicApiController;
+using Furion.FriendlyException;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using System.Threading.Tasks;
+using Dapper;
+using Ewide.Core.Extension;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Collections.Generic;
+
+namespace Ewide.Application.Service.HouseCode
+{
+    /// <summary>
+    /// 房屋编码相关
+    /// </summary>
+    [ApiDescriptionSettings(Name = "HouseCode", Order = 180)]
+    public class HouseCodeService : IHouseCodeService, IDynamicApiController, ITransient
+    {
+        private readonly IRepository<BsHouseCode> _houseCodeRep;
+        private readonly IDapperRepository _dapperRepository;
+
+        private readonly IUserManager _userManager;
+        private readonly IHouseLogService _houseLogService;
+
+        public HouseCodeService(IRepository<BsHouseCode> HouseCodeRep, IDapperRepository dapperRepository, IUserManager userManager, IHouseLogService houseLogService)
+        {
+            _houseCodeRep = HouseCodeRep;
+            _dapperRepository = dapperRepository;
+
+            _userManager = userManager;
+            _houseLogService = houseLogService;
+        }
+
+        [HttpPost("/houseCode/add")]
+        [UnitOfWork]
+        public async Task AddHouseCode(AddHouseCodeInput input)
+        {
+            var houseProjectInfoRep = Db.GetRepository<BsHouseProjectInfo>();
+            var houseProject = await houseProjectInfoRep.FirstOrDefaultAsync(p => p.Id == input.ProjectId);
+            if (houseProject == null) throw Oops.Oh("项目参数有误，添加失败");
+
+            var areaCodeRep = Db.GetRepository<SysAreaCode>();
+            var areaCode = await areaCodeRep.DetachedEntities.FirstOrDefaultAsync(a => a.Code == input.AreaCode && a.LevelType == 4);
+            if(areaCode == null) throw Oops.Oh("区域编码有误，添加失败");
+            input.HouseCode = areaCode.AdCode + houseProject.Sort.ToString().PadLeft(3, '0') + input.No.ToString().PadLeft(3, '0');
+            var id = System.Guid.NewGuid().ToString().ToLower();
+            var houseCode = input.Adapt<BsHouseCode>();
+            houseCode.Id = id;
+            var isExist = await _houseCodeRep.AnyAsync(p => p.HouseCode == houseCode.HouseCode);
+            if (isExist) throw Oops.Oh("房屋编码已存在，不可重复添加");
+            await houseCode.InsertAsync();
+
+            // 添加到流转日志
+            var sort = await _houseLogService.AddThenDone(id, _userManager.User, HouseLogType.CreateCode);
+            sort = await _houseLogService.Add(id, _userManager.User, HouseLogType.SelectMember, sort: sort);
+        }
+
+        [HttpPost("/houseCode/edit")]
+        public async Task EditHouseCode(EditHouseCodeInput input)
+        {
+            var houseCode = input.Adapt<BsHouseCode>();
+            await houseCode.UpdateExcludeAsync(new[] { nameof(BsHouseCode.HouseCode) }, true);
+        }
+
+        [HttpPost("/houseCode/delete")]
+        public async Task DeleteHouseCode(DeleteHouseCodeInput input)
+        {
+            var houseCode = _houseCodeRep.FirstOrDefault(p => p.Id == input.Id);
+            await houseCode.DeleteNowAsync();
+        }
+
+        [HttpPost("/houseCode/page")]
+        public async Task<dynamic> QueryPage([FromBody] QueryHouseCodeInput input)
+        {
+            var sql = @"SELECT 
+HC.*,AA.Name AreaName,RA.Name RoadName,CA.Name CommName,Proj.AreaCode,Proj.Note,CONCAT(Proj.`Name`, IFNULL(CONCAT('(',Proj.Note,')'), '')) FullProjName 
+FROM bs_house_code HC
+LEFT JOIN bs_house_projectinfo Proj ON Proj.Id=HC.ProjectId
+LEFT JOIN sys_area_code CA ON CA.Code = Proj.AreaCode
+LEFT JOIN sys_area_code RA ON RA.AdCode = SUBSTR(CA.AdCode,1,9)
+LEFT JOIN sys_area_code AA ON AA.AdCode = SUBSTR(CA.AdCode,1,6) ";
+            return await _dapperRepository.QueryPageDataDynamic(sql, input, filterFields: new string[] {"Type", "Address", "HouseCode","AreaCode"});
+        }
+
+        [HttpGet("/houseCode/detail")]
+        public async Task<dynamic> GetHouserCode([FromQuery] GetHouseCodeInput input)
+        {
+            var houseCode = await _houseCodeRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id == input.Id);
+            var areaCode = (await Db.GetRepository<BsHouseProjectInfo>().DetachedEntities.FirstOrDefaultAsync(p => p.Id == houseCode.ProjectId)).AreaCode;
+            var result = houseCode.Adapt<GetHouseCodeOutput>();
+            result.AreaCode = areaCode;
+            return result;
+        }
+
+        /// <summary>
+        /// 获取同一区域下的下一个编号
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        [HttpGet("/houseCode/getNextNoByCode")]
+        public async Task<dynamic> GetNextNoByFullNumber([Required] string projectId)
+        {
+            var areaCodeRep = Db.GetRepository<SysAreaCode>();
+            var houseProjectInfoRep = Db.GetRepository<BsHouseProjectInfo>();
+            var houseProject = await houseProjectInfoRep.FirstOrDefaultAsync(p => p.Id == projectId);
+            if(houseProject == null) throw Oops.Oh("项目参数有误，房屋编码生成失败");
+            //取到社区编码
+            var commAreaCode = await areaCodeRep.FirstOrDefaultAsync(a => a.Code == houseProject.AreaCode && a.LevelType == 4);
+            if(commAreaCode == null) throw Oops.Oh("项目区域编码有误，房屋编码生成失败");
+            var maxNo = await _houseCodeRep.DetachedEntities
+                .Where(h => h.HouseCode.Contains(commAreaCode.AdCode + houseProject.Sort.ToString().PadLeft(3, '0')))
+                .MaxAsync(h => (int?)h.No);
+            return maxNo.GetValueOrDefault(0) + 1;
+        }
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseCode/IHouseCodeService.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application.Service.HouseCode
+{
+    public interface IHouseCodeService
+    {
+        Task AddHouseCode(AddHouseCodeInput input);
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseCompany/Dto/HouseCompanyInput.cs

@@ -0,0 +1,61 @@
+using Ewide.Core;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application
+{
+    public class HouseCompanyInput
+    {
+        [Required(ErrorMessage = "Id不能为空")]
+        public string Id { get; set; }
+    }
+
+    public class HouseCompanyInfoInput
+    {
+        [Required(ErrorMessage = "信息名称不能为空")]
+        public string Name { get; set; }
+        [Required(ErrorMessage = "信息内容不能为空")]
+        public string Value { get; set; }
+    }
+
+    public class HouseCompanyPageInput : PageInputBase {}
+
+    public class HouseCompanyAddInput
+    {
+        [Required(ErrorMessage = "名称不能为空")]
+        public virtual string Name { get; set; }
+
+        private string _Type { get; set; }
+
+        [Required(ErrorMessage = "类型不能为空")]
+        public virtual string Type
+        {
+            get
+            {
+                return _Type;
+            }
+            set
+            {
+                _Type = String.Join(",", value.Split(',').Select(p => $"[{p}]"));
+            }
+        }
+
+        public virtual List<HouseCompanyInfoInput> Info { get; set; }
+    }
+
+    public class HouseCompanyEditInput : HouseCompanyAddInput
+    {
+        [Required(ErrorMessage = "Id不能为空")]
+        public string Id { get; set; }
+    }
+
+    public class HouseCompanyListInput
+    {
+        [Required(ErrorMessage = "类型不能为空")]
+        public string Type { get; set; }
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseCompany/Dto/HouseCompanyOutput.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application
+{
+    public class HouseCompanyInfoOutput
+    {
+        public string Name { get; set; }
+        public string Value { get; set; }
+    }
+
+    public class HouseCompanyDetailOutput
+    {
+        public string Id { get; set; }
+        public string Name { get; set; }
+        private string _Type { get; set; }
+        public string Type
+        {
+            get
+            {
+                return _Type;
+            }
+            set
+            {
+                _Type = String.Join(",", value.Split(',').Select(p => p.Replace("[", "").Replace("]", "")));
+            }
+        }
+        public List<HouseCompanyInfoOutput> Info { get; set; }
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseCompany/HouseCompanyService.cs

@@ -0,0 +1,101 @@
+using Ewide.Core.Extension;
+using Furion.DatabaseAccessor;
+using Furion.DatabaseAccessor.Extensions;
+using Furion.DependencyInjection;
+using Furion.DynamicApiController;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application.Service
+{
+    [ApiDescriptionSettings(Name = "HouseCompany")]
+    public class HouseCompanyService : IHouseCompanyService, IDynamicApiController, ITransient
+    {
+        private readonly IRepository<BsHouseCompany> _bsHouseCompanyRep;
+
+        public HouseCompanyService(IRepository<BsHouseCompany> bsHouseCompanyRep)
+        {
+            _bsHouseCompanyRep = bsHouseCompanyRep;
+        }
+
+        [HttpPost("/houseCompany/page")]
+        public async Task<dynamic> Page([FromBody] HouseCompanyPageInput input)
+        {
+            var config = new TypeAdapterConfig().ForType<BsHouseCompany, HouseCompanyDetailOutput>()
+                .Map(target => target.Info, src => JsonConvert.DeserializeObject<List<HouseCompanyInfoOutput>>(src.Info))
+                .Config;
+            return await _bsHouseCompanyRep.DetachedEntities.ToPageData<BsHouseCompany, HouseCompanyDetailOutput>(input, config);
+        }
+
+        [HttpPost("/houseCompany/add")]
+        public async Task Add([FromBody] HouseCompanyAddInput input)
+        {
+            var info = JsonConvert.SerializeObject(input.Info);
+            var config = new TypeAdapterConfig().ForType<HouseCompanyAddInput, BsHouseCompany>()
+                .Map(target => target.Info, src => JsonConvert.SerializeObject(src.Info))
+                .Config;
+            var company = input.Adapt<BsHouseCompany>(config);
+            await company.InsertAsync();
+        }
+
+        [HttpPost("/houseCompany/edit")]
+        public async Task Edit([FromBody] HouseCompanyEditInput input)
+        {
+            var config = new TypeAdapterConfig().ForType<HouseCompanyEditInput, BsHouseCompany>()
+                .Map(target => target.Info, src => JsonConvert.SerializeObject(src.Info))
+                .Config;
+            var company = input.Adapt<BsHouseCompany>(config);
+            await company.UpdateAsync();
+        }
+
+        [HttpPost("/houseCompany/delete")]
+        public async Task Delete([FromBody] HouseCompanyInput input)
+        {
+            var company = await _bsHouseCompanyRep.FirstOrDefaultAsync(p => p.Id.Equals(input.Id));
+            await company.DeleteAsync();
+        }
+
+        [HttpGet("/houseCompany/detail")]
+        public async Task<HouseCompanyDetailOutput> Detail([FromQuery] HouseCompanyInput input)
+        {
+            var company = await _bsHouseCompanyRep.FirstOrDefaultAsync(p => p.Id.Equals(input.Id));
+            var config = new TypeAdapterConfig().ForType<BsHouseCompany, HouseCompanyDetailOutput>()
+                .Map(target => target.Info, src => JsonConvert.DeserializeObject<List<HouseCompanyInfoOutput>>(src.Info))
+                .Config;
+            var output = company.Adapt<HouseCompanyDetailOutput>(config);
+            return output;
+        }
+
+        [HttpGet("/houseCompany/list")]
+        public async Task<dynamic> List([FromQuery] HouseCompanyListInput input)
+        {
+            var types = input.Type.Split(',');
+            var result = new List<HouseCompanyDetailOutput>();
+            var config = new TypeAdapterConfig().ForType<BsHouseCompany, HouseCompanyDetailOutput>()
+                .Map(target => target.Info, src => JsonConvert.DeserializeObject<List<HouseCompanyInfoOutput>>(src.Info))
+                .Config;
+            foreach (var type in types)
+            {
+                var list = (await _bsHouseCompanyRep.DetachedEntities
+                    .Where(p => EF.Functions.Like(p.Type, $"%[{type.Trim()}]%"))
+                    .OrderBy(p => p.Name)
+                    .ToListAsync())
+                    .Select(p =>
+                    {
+                        var output = p.Adapt<HouseCompanyDetailOutput>(config);
+                        return output;
+                    });
+                result.AddRange(list);
+            }
+
+            return result.Distinct();
+        }
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseCompany/IHouseCompanyService.cs

@@ -0,0 +1,19 @@
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application.Service
+{
+    public interface IHouseCompanyService
+    {
+        Task<dynamic> Page([FromBody] HouseCompanyPageInput input);
+        Task Add([FromBody] HouseCompanyAddInput input);
+        Task Edit([FromBody] HouseCompanyEditInput input);
+        Task Delete([FromBody] HouseCompanyInput input);
+        Task<HouseCompanyDetailOutput> Detail([FromQuery] HouseCompanyInput input);
+        Task<dynamic> List([FromQuery] HouseCompanyListInput input);
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoInput.cs

@@ -0,0 +1,239 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application
+{
+    public class HouseInfoInput
+    {
+		#region 建筑物基本信息building
+		public string BuildingName { get; set; }
+
+		public int? LandAttribute { get; set; }
+
+		public int? StructureType { get; set; }
+
+		public int? SeismicGrade { get; set; }
+
+		public int? BaseInfo { get; set; }
+
+		public string InsulationMaterial { get; set; }
+
+		public string WallMaterial { get; set; }
+
+		public string FireproofGrade { get; set; }
+		public int? CurtainWall { get; set; }
+		public int? FaceBrick { get; set; }
+		public int? WhiteWash { get; set; }
+		public int? Coating { get; set; }
+		public string Elevator { get; set; }
+		public DateTime? CompletedDate { get; set; }
+		public int? UsefulYear { get; set; }
+		/// <summary>
+		/// 总建筑面积
+		/// </summary>
+		public float? TotalArea { get; set; }
+		/// <summary>
+		/// 总户数（户）
+		/// </summary>
+		public int? HouseHolds { get; set; }
+
+		/// <summary>
+		/// 房屋单元数
+		/// </summary>
+		public int? Units { get; set; }
+
+		/// <summary>
+		/// 各单元每层户数（户）
+		/// </summary>
+		public int? UnitFloorHolds { get; set; }
+
+		/// <summary>
+		/// 总层数
+		/// </summary>
+		public int? TotalFloor { get; set; }
+
+		/// <summary>
+		/// 地上层数
+		/// </summary>
+		public int? LandFloorCount { get; set; }
+
+		/// <summary>
+		/// 地上商业层数开始
+		/// </summary>
+		public int? LandBsFloorStart { get; set; }
+
+		/// <summary>
+		/// 地上商业层数结束
+		/// </summary>
+		public int? LandBsFloorEnd { get; set; }
+
+		/// <summary>
+		/// 地上车棚层开始
+		/// </summary>
+		public int? LandBikeFloorStart { get; set; }
+
+		/// <summary>
+		/// 地上住宅层开始
+		/// </summary>
+		public int? LandResidenceFloorStart { get; set; }
+
+		/// <summary>
+		/// 地上住宅层结束
+		/// </summary>
+		public int? LandResidenceFloorEnd { get; set; }
+
+		/// <summary>
+		/// 地下层数
+		/// </summary>
+		public int? UnderFloorCount { get; set; }
+		#endregion
+		#region 权属情况ownership
+		/// <summary>
+		/// 产权性质
+		/// </summary>
+		public string PropertyRights { get; set; }
+
+		/// <summary>
+		/// 总共套数
+		/// </summary>
+		public int? HouseCount { get; set; }
+		/// <summary>
+		/// 直管公房套数
+		/// </summary>
+		public int? StraightHouseCount { get; set; }
+
+		/// <summary>
+		/// 自管公房套数
+		/// </summary>
+		public int? SelfHouseCount { get; set; }
+
+		/// <summary>
+		/// 私房套数
+		/// </summary>
+		public int? PrivateHouseCount { get; set; }
+
+		/// <summary>
+		/// 商品房套数
+		/// </summary>
+		public int? BusinessCount { get; set; }
+
+		/// <summary>
+		/// 房改房套数
+		/// </summary>
+		public int? ChangeHouseCount { get; set; }
+
+		/// <summary>
+		/// 拆迁安置房套数
+		/// </summary>
+		public int? ResettlementHouseCount { get; set; }
+
+		/// <summary>
+		/// 其它套数
+		/// </summary>
+		public int? OtherCount { get; set; }
+
+		#endregion
+		#region 管理情况manager
+		#endregion
+		
+		#region 鉴定治理identification
+
+		/// <summary>
+		/// 房屋等级 1,2,3,4,C,d
+		/// </summary>
+		public int? HouseGrade { get; set; }
+
+		/// <summary>
+		/// 房屋使用状态
+		/// </summary>
+		public int? HouseUsedStatus { get; set; }
+		#endregion
+
+		#region 图纸资料存档处drawing
+
+		/// <summary>
+		/// 图纸资料存档处
+		/// </summary>
+		public string DrawingMaterial { get; set; }
+
+		/// <summary>
+		/// 其他图纸存档
+		/// </summary>
+		public string DrawingMaterialText { get; set; }
+		#endregion
+
+		#region 相关附件资料attachments
+		/// <summary>
+		/// 立项文件
+		/// </summary>
+		public string AnEntryDocument { get; set; }
+
+		/// <summary>
+		/// 规划许可
+		/// </summary>
+		public string PlanningPermission { get; set; }
+
+		/// <summary>
+		/// 竣工验收备案
+		/// </summary>
+		public string CompletionRecord { get; set; }
+
+		/// <summary>
+		/// 监理资料
+		/// </summary>
+		public string MonitorDocument { get; set; }
+
+		/// <summary>
+		/// 鉴定报告
+		/// </summary>
+		public string IdentificationReport { get; set; }
+
+		/// <summary>
+		/// 其它资料
+		/// </summary>
+		public string OtherDocument { get; set; }
+		#endregion
+
+		#region 建筑概貌aspect
+		/// <summary>
+		/// 外立面照片
+		/// </summary>
+		public string FacadePhoto { get; set; }
+		#endregion
+
+		#region 调查单位unit
+		/// <summary>
+		/// 调查登记机构
+		/// </summary>
+		public string InvestigateAgency { get; set; }
+
+		/// <summary>
+		/// 纸质资料调查人
+		/// </summary>
+		public string InvestigateUser { get; set; }
+
+		/// <summary>
+		/// 纸质资料审核人
+		/// </summary>
+		public string OfflineAuditor { get; set; }
+
+		/// <summary>
+		/// 主管部门
+		/// </summary>
+		public string CompetentDepartment { get; set; }
+		#endregion
+        
+		public int State { get; set; }
+    }
+
+    public class HouseInfoInputSave
+    {
+		public HouseCodeOutput houseCode { get; set; }
+		public HouseInfoInput houseInfo { get; set; }
+		public EditHouseTaskInput PatrolInfo { get; set; }
+		public HouseTaskCheckRecordInput TaskCheckRecord { get; set; }
+	}
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoOutput.cs

@@ -0,0 +1,239 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application
+{
+	public class HouseInfoOutput
+	{
+		#region 建筑物基本信息building
+		public string BuildingName { get; set; }
+
+		public int? LandAttribute { get; set; }
+
+		public int? StructureType { get; set; }
+
+		public int? SeismicGrade { get; set; }
+
+		public int? BaseInfo { get; set; }
+
+		public string InsulationMaterial { get; set; }
+
+		public string WallMaterial { get; set; }
+
+		public string FireproofGrade { get; set; }
+		public int? CurtainWall { get; set; }
+		public int? FaceBrick { get; set; }
+		public int? WhiteWash { get; set; }
+		public int? Coating { get; set; }
+		public string Elevator { get; set; }
+		public DateTime? CompletedDate { get; set; }
+		public int? UsefulYear { get; set; }
+		/// <summary>
+		/// 总建筑面积
+		/// </summary>
+		public float? TotalArea { get; set; }
+		/// <summary>
+		/// 总户数（户）
+		/// </summary>
+		public int? HouseHolds { get; set; }
+
+		/// <summary>
+		/// 房屋单元数
+		/// </summary>
+		public int? Units { get; set; }
+
+		/// <summary>
+		/// 各单元每层户数（户）
+		/// </summary>
+		public int? UnitFloorHolds { get; set; }
+
+		/// <summary>
+		/// 总层数
+		/// </summary>
+		public int? TotalFloor { get; set; }
+
+		/// <summary>
+		/// 地上层数
+		/// </summary>
+		public int? LandFloorCount { get; set; }
+
+		/// <summary>
+		/// 地上商业层数开始
+		/// </summary>
+		public int? LandBsFloorStart { get; set; }
+
+		/// <summary>
+		/// 地上商业层数结束
+		/// </summary>
+		public int? LandBsFloorEnd { get; set; }
+
+		/// <summary>
+		/// 地上车棚层开始
+		/// </summary>
+		public int? LandBikeFloorStart { get; set; }
+
+		/// <summary>
+		/// 地上住宅层开始
+		/// </summary>
+		public int? LandResidenceFloorStart { get; set; }
+
+		/// <summary>
+		/// 地上住宅层结束
+		/// </summary>
+		public int? LandResidenceFloorEnd { get; set; }
+
+		/// <summary>
+		/// 地下层数
+		/// </summary>
+		public int? UnderFloorCount { get; set; }
+		#endregion
+		#region 权属情况ownership
+		/// <summary>
+		/// 产权性质
+		/// </summary>
+		public string PropertyRights { get; set; }
+
+		/// <summary>
+		/// 总共套数
+		/// </summary>
+		public int? HouseCount { get; set; }
+		/// <summary>
+		/// 直管公房套数
+		/// </summary>
+		public int? StraightHouseCount { get; set; }
+
+		/// <summary>
+		/// 自管公房套数
+		/// </summary>
+		public int? SelfHouseCount { get; set; }
+
+		/// <summary>
+		/// 私房套数
+		/// </summary>
+		public int? PrivateHouseCount { get; set; }
+
+		/// <summary>
+		/// 商品房套数
+		/// </summary>
+		public int? BusinessCount { get; set; }
+
+		/// <summary>
+		/// 房改房套数
+		/// </summary>
+		public int? ChangeHouseCount { get; set; }
+
+		/// <summary>
+		/// 拆迁安置房套数
+		/// </summary>
+		public int? ResettlementHouseCount { get; set; }
+
+		/// <summary>
+		/// 其它套数
+		/// </summary>
+		public int? OtherCount { get; set; }
+
+		#endregion
+		#region 管理情况manager
+		#endregion
+		
+		#region 鉴定治理identification
+
+		/// <summary>
+		/// 房屋等级 1,2,3,4,C,d
+		/// </summary>
+		public int? HouseGrade { get; set; }
+
+		/// <summary>
+		/// 房屋使用状态
+		/// </summary>
+		public int? HouseUsedStatus { get; set; }
+		#endregion
+
+		#region 图纸资料存档处drawing
+
+		/// <summary>
+		/// 图纸资料存档处
+		/// </summary>
+		public string DrawingMaterial { get; set; }
+
+		/// <summary>
+		/// 其他图纸存档
+		/// </summary>
+		public string DrawingMaterialText { get; set; }
+		#endregion
+
+		#region 相关附件资料attachments
+		/// <summary>
+		/// 立项文件
+		/// </summary>
+		public string AnEntryDocument { get; set; }
+
+		/// <summary>
+		/// 规划许可
+		/// </summary>
+		public string PlanningPermission { get; set; }
+
+		/// <summary>
+		/// 竣工验收备案
+		/// </summary>
+		public string CompletionRecord { get; set; }
+
+		/// <summary>
+		/// 监理资料
+		/// </summary>
+		public string MonitorDocument { get; set; }
+
+		/// <summary>
+		/// 鉴定报告
+		/// </summary>
+		public string IdentificationReport { get; set; }
+
+		/// <summary>
+		/// 其它资料
+		/// </summary>
+		public string OtherDocument { get; set; }
+		#endregion
+
+		#region 建筑概貌aspect
+		/// <summary>
+		/// 外立面照片
+		/// </summary>
+		public string FacadePhoto { get; set; }
+		#endregion
+		public int State { get; set; }
+		#region 调查单位unit
+		/// <summary>
+		/// 调查登记机构
+		/// </summary>
+		public string InvestigateAgency { get; set; }
+
+		/// <summary>
+		/// 纸质资料调查人
+		/// </summary>
+		public string InvestigateUser { get; set; }
+
+		/// <summary>
+		/// 纸质资料审核人
+		/// </summary>
+		public string OfflineAuditor { get; set; }
+
+		/// <summary>
+		/// 主管部门
+		/// </summary>
+		public string CompetentDepartment { get; set; }
+		#endregion
+	}
+
+	public class HouseInfoOutputForDetailPage
+    {
+		#region header
+		public HouseCodeOutput HouseCode { get; set; }
+		#endregion
+
+		public HouseInfoOutput HouseInfo { get; set; }
+		public HouseTaskOutput PatrolInfo { get; set; }
+	}
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs

@@ -0,0 +1,208 @@
+using Dapper;
+using Ewide.Core;
+using Furion.DatabaseAccessor;
+using Furion.DatabaseAccessor.Extensions;
+using Furion.DependencyInjection;
+using Furion.DynamicApiController;
+using Furion.FriendlyException;
+using Mapster;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application.Service.HouseSafety.HouseInfo
+{
+    /// <summary>
+    /// 房屋详细信息
+    /// </summary>
+    [ApiDescriptionSettings(Name = "HouseInfo", Order = 200)]
+    public class HouseInfoService : IHouseInfoService, IDynamicApiController, ITransient
+    {
+
+        private readonly IRepository<BsHouseCode> _houseCodeRep;
+        private readonly IRepository<BsHouseInfo> _houseInfoRep;
+        private readonly IRepository<BsHouseTask> _houseTaskRep;
+        private readonly IRepository<SysUser> _sysUserRep;
+        private readonly IUserManager _userManager;
+        private readonly IDapperRepository _dapperRepository;
+
+        private readonly IHouseLogService _houseLogService;
+
+
+        public HouseInfoService(
+            IRepository<BsHouseCode> HouseCodeRep,
+            IRepository<BsHouseInfo> HouseInfoRep, 
+            IRepository<BsHouseTask> HouseTaskRep,
+            IRepository<SysUser> sysUserRep,
+            IUserManager userManager, IDapperRepository dapperRepository, IHouseLogService houseLogService)
+        {
+            _houseCodeRep = HouseCodeRep;
+            _houseInfoRep = HouseInfoRep;
+            _houseTaskRep = HouseTaskRep;
+            _sysUserRep = sysUserRep;
+            _userManager = userManager;
+            _dapperRepository = dapperRepository;
+
+            _houseLogService = houseLogService;
+        }
+
+        [HttpPost("/houseInfo/save")]
+        [UnitOfWork]
+        [AllowAnonymous]
+        public async Task Save([FromBody] HouseInfoInputSave input)
+        {
+            await InputDataProcess(input,  DataStatus.Saved);
+        }
+
+        [HttpPost("/houseInfo/submitToCheck")]
+        [UnitOfWork]
+        [AllowAnonymous]
+        public async Task SubmitToCheck([FromBody] HouseInfoInputSave input)
+        {
+            await InputDataProcess(input,DataStatus.Submited);
+        }
+
+        [HttpPost("/houseInfo/check")]
+        [UnitOfWork]
+        public async Task Check([FromBody] HouseInfoInputSave input)
+        {
+            await InputDataProcess(input, input.TaskCheckRecord.PassOrBackDataStatus );
+        }
+
+        [HttpGet("/houseInfo/getByTaskId")]
+        [UnitOfWork]
+        public async Task<HouseInfoOutputForDetailPage> GetByTaskId([Required] string taskId)
+        {
+            //获取任务实体
+            var houseTask = await _houseTaskRep.DetachedEntities.FirstOrDefaultAsync(t=>t.Id == taskId);
+            if(houseTask == null) throw Oops.Oh("任务不存在");
+
+            //获取房屋编码信息
+            var houseCodeOutputAsync = await _dapperRepository.QueryAsync<HouseCodeOutput>(
+                @"SELECT 
+HC.Id,HC.Address,HC.ProjectId,HC.ZoneId,HC.Type,AA.Name AreaName,RA.Name RoadName,CA.Name CommName,O.Name ZoneName,Proj.Note ProjectNote,CONCAT(Proj.`Name`, IFNULL(CONCAT('(',Proj.Note,')'), '')) FullProjName,HC.HouseCode,HC.Lng,HC.Lat,HC.No 
+FROM bs_house_code HC
+LEFT JOIN bs_house_projectinfo Proj ON Proj.Id=HC.ProjectId
+LEFT JOIN sys_org O ON HC.ZoneId = O.Id
+LEFT JOIN sys_area_code CA ON CA.Code = Proj.AreaCode
+LEFT JOIN sys_area_code RA ON RA.AdCode = SUBSTR(CA.AdCode,1,9)
+LEFT JOIN sys_area_code AA ON AA.AdCode = SUBSTR(CA.AdCode,1,6)
+WHERE HC.Id=@HouseCodeId", new { houseTask.HouseCodeId }
+                );
+            var houseCodeOutput= houseCodeOutputAsync.SingleOrDefault();
+            if (houseCodeOutput == null) throw Oops.Oh("任务已失效：房屋编码不存在，请重新加载任务列表");
+            
+            //获取当前登录账号
+            var currentUser = await _userManager.CheckUserAsync();
+
+            //查询房屋详细信息是否存在
+            var houseInfo = await _houseInfoRep.DetachedEntities.FirstOrDefaultAsync(h => h.HouseCodeId == houseTask.HouseCodeId);
+            var houseInfoOutputForDetailPage = new HouseInfoOutputForDetailPage
+            {
+                HouseCode = houseCodeOutput
+            };
+
+            var taskOutput = houseTask.Adapt<HouseTaskOutput>();
+            taskOutput.PatrolDate = houseTask.PatrolDate.GetValueOrDefault(DateTime.Now);
+            taskOutput.PatrolUser = String.IsNullOrEmpty(houseTask.PatrolUser) ? currentUser.Name : houseTask.PatrolUser;
+            houseInfoOutputForDetailPage.PatrolInfo = taskOutput;
+
+            if (houseInfo == null || houseInfo.State <= (int)DataStatus.Submited)
+            {
+                // 未建档或者当前数据未提交时打开,标记为已读
+                await _houseLogService.Read(houseCodeOutput.Id);
+            }
+
+            if (houseInfo == null)
+            {
+                houseInfoOutputForDetailPage.HouseInfo = new HouseInfoOutput();
+                return houseInfoOutputForDetailPage;
+            }
+
+            var houseInfoOutput = (await _houseInfoRep.DetachedEntities.FirstOrDefaultAsync(p => p.HouseCodeId == houseTask.HouseCodeId)).Adapt<HouseInfoOutput>();
+            houseInfoOutputForDetailPage.HouseInfo = houseInfoOutput;
+
+            return houseInfoOutputForDetailPage;
+        }
+
+        [NonAction]
+        [UnitOfWork]
+        public async Task InputDataProcess(HouseInfoInputSave input,DataStatus dataStatus = DataStatus.Init)
+        {
+            //房屋编码地址/坐标单独更新
+            var houseCode = input.houseCode.Adapt<BsHouseCode>();
+            await houseCode.UpdateIncludeAsync(new[] { nameof(BsHouseCode.Address), nameof(BsHouseCode.Lng), nameof(BsHouseCode.Lat) }, true);
+
+            //获取房屋详情实体，判断是新增还是更新
+            var houseEntity = await _houseInfoRep.DetachedEntities.FirstOrDefaultAsync(h => h.HouseCodeId == input.houseCode.Id);
+
+            //建档审核通过的房屋数据修改时，对应的建档任务Task不处理
+            var houseTask = await _houseTaskRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id == input.PatrolInfo.Id);
+            if (houseEntity == null || houseEntity.State != 6)
+            {
+                var _houseTask = input.PatrolInfo.Adapt<BsHouseTask>();
+                _houseTask.HouseCodeId = input.houseCode.Id;
+                //任务没有暂存状态，其他状态与HouseInfo的State一致
+                _houseTask.Status = dataStatus == DataStatus.TempSaved ? (int)DataStatus.Saved : (int)dataStatus;
+                await _houseTask.UpdateExcludeAsync(new string[] { nameof(BsHouseTask.TaskType) }, ignoreNullValues: true);
+            }
+            //判断房屋建档状态
+            //dataStatus == DataStatus.Saved 若是保存操作   则判断是新增/更新
+            //判断是新增/更新 根据传入参数dataStatus确定
+            input.houseInfo.State = dataStatus == DataStatus.Saved ? (houseEntity == null ? (int)DataStatus.Saved : houseEntity.State) : (int)dataStatus;
+            var houseInfo = input.houseInfo.Adapt<BsHouseInfo>();
+            houseInfo.HouseCodeId = input.houseCode.Id;
+            
+            if (houseEntity == null)
+            {
+                houseInfo.Id = Guid.NewGuid().ToString();
+                await houseInfo.InsertAsync();
+            }
+            else
+            {
+                houseInfo.Id = houseEntity.Id;
+                await houseInfo.UpdateExcludeAsync(new[] { nameof(BsHouseInfo.HouseGrade) }, true);
+            }
+
+            int? logSort = null;
+
+            if (dataStatus == DataStatus.Submited)
+            {
+                await _houseLogService.Done(input.houseCode.Id);
+
+                var org = await _userManager.GetUserOrgInfo();
+
+                var _sysEmpRep = Db.GetRepository<SysEmp>();
+                var _sysUserRoleRep = Db.GetRepository<SysUserRole>();
+                var _sysRoleRep = Db.GetRepository<SysRole>();
+                var zoneManagerList = await (from u in _sysUserRep.DetachedEntities
+                                             join e in _sysEmpRep.DetachedEntities on u.Id equals e.Id
+                                             join ur in _sysUserRoleRep.DetachedEntities on u.Id equals ur.SysUserId
+                                             join r in _sysRoleRep.DetachedEntities on ur.SysRoleId equals r.Id
+                                             where e.OrgId == org.Id && r.Code == Enum.GetName(HouseManagerRole.ZoneManager).ToUnderScoreCase()
+                                             select u).ToListAsync();
+
+                logSort = await _houseLogService.Add(input.houseCode.Id, zoneManagerList, HouseLogType.Check);
+            }
+            //审核操作则新增一条审核记录
+            if (dataStatus == DataStatus.Back || dataStatus == DataStatus.Passed)
+            {
+                var checkRecord = input.TaskCheckRecord.Adapt<BsHouseTaskCheckRecord>();
+                await checkRecord.InsertAsync();
+                await _houseLogService.Done(input.houseCode.Id);
+                logSort = await _houseLogService.AddThenDone(input.houseCode.Id, _userManager.User, dataStatus == DataStatus.Passed ? HouseLogType.Agree : HouseLogType.Disagree, remark: checkRecord.Content, sort: logSort);
+                if (dataStatus == DataStatus.Back)
+                {
+                    var user = await _sysUserRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id.Equals(houseTask.UserID));
+                    logSort = await _houseLogService.Add(input.houseCode.Id, user, HouseLogType.CreateInfo, sort: logSort);
+                }
+            }
+        }
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseInfo/IHouseInfoService.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application.Service
+{
+    public interface IHouseInfoService
+    {
+        Task<HouseInfoOutputForDetailPage> GetByTaskId(string taskId);
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseLog/Dto/HouseLogInput.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application
+{
+    public class HouseLogInput
+    {
+        [Required(ErrorMessage = "Id不能为空")]
+        public string Id { get; set; }
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseLog/Dto/HouseLogOutput.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application
+{
+    public class HouseLogOutput
+    {
+        public string Id { get; set; }
+        public string TargetUserNames { get; set; }
+        public int Type { get; set; }
+        public int Status { get; set; }
+        public string Remark { get; set; }
+        public DateTime? FinishedTime { get; set; }
+        public string FinishedUserId { get; set; }
+        public string FinishedUserName { get; set; }
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseLog/HouseLogService.cs

@@ -0,0 +1,209 @@
+using Dapper;
+using Ewide.Core;
+using Furion.DatabaseAccessor;
+using Furion.DatabaseAccessor.Extensions;
+using Furion.DependencyInjection;
+using Furion.DynamicApiController;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application.Service
+{
+    /// <summary>
+    /// 房屋流转日志
+    /// </summary>
+    [ApiDescriptionSettings(Name = "HouseLog", Order = 210)]
+    public class HouseLogService : IHouseLogService, IDynamicApiController, ITransient
+    {
+        private readonly IDapperRepository _dapperRep;
+
+        private readonly IUserManager _userManager;
+
+        private readonly IRepository<BsHouseLog> _bsHouseLogRep;
+
+        public HouseLogService(IDapperRepository dapperRep, IUserManager userManager, IRepository<BsHouseLog> bsHouseLogRep)
+        {
+            _dapperRep = dapperRep;
+            _userManager = userManager;
+            _bsHouseLogRep = bsHouseLogRep;
+        }
+
+        [NonAction]
+        [UnitOfWork]
+        public async Task<int> Add(string houseCodeId, SysUser targetUser, HouseLogType type, string remark = null, int? sort = null)
+        {
+            return await Add(houseCodeId, new List<SysUser> { targetUser }, type, remark, sort);
+        }
+
+        [NonAction]
+        [UnitOfWork]
+        public async Task<int> Add(string houseCodeId, List<SysUser> targetUsers, HouseLogType type, string remark = null, int? sort = null)
+        {
+            if (!sort.HasValue)
+            {
+                sort = await _bsHouseLogRep.DetachedEntities.Where(p => p.HouseCodeId.Equals(houseCodeId)).MaxAsync(p => p.Sort);
+            }
+            var _sort = sort.GetValueOrDefault(1) + 1;
+            await new BsHouseLog
+            {
+                Id = Guid.NewGuid().ToString(),
+                HouseCodeId = houseCodeId,
+                TargetUserIds = String.Join(",", targetUsers.Select(p => p.Id)),
+                Type = type,
+                Status = HouseLogStatus.Handle,
+                Remark = remark,
+                Sort = _sort
+            }.InsertAsync();
+
+            return _sort;
+        }
+
+        [NonAction]
+        [UnitOfWork]
+        public async Task Read(string houseCodeId)
+        {
+            var log = await _bsHouseLogRep
+                .Where(p => p.HouseCodeId.Equals(houseCodeId) && p.Status.Equals(HouseLogStatus.Handle))
+                .OrderByDescending(p => p.CreatedTime)
+                .FirstOrDefaultAsync();
+            if (log != null)
+            {
+                log.Status = HouseLogStatus.Handling;
+                await log.UpdateAsync();
+            }
+        }
+
+        [NonAction]
+        [UnitOfWork]
+        public async Task Done(string houseCodeId)
+        {
+            var log = await _bsHouseLogRep
+                .Where(p => p.HouseCodeId.Equals(houseCodeId) && !p.Status.Equals(HouseLogStatus.Handled))
+                .OrderByDescending(p => p.CreatedTime)
+                .FirstOrDefaultAsync();
+            if (log != null)
+            {
+                log.Status = HouseLogStatus.Handled;
+                log.FinishedTime = DateTime.Now;
+                log.FinishedUserId = _userManager.UserId;
+                log.FinishedUserName = _userManager.User.Account;
+                await log.UpdateAsync();
+            }
+        }
+
+        [NonAction]
+        [UnitOfWork]
+        public async Task<int> AddThenRead(string houseCodeId, SysUser targetUser, HouseLogType type, string remark = null, int? sort = null)
+        {
+            return await AddThenRead(houseCodeId, new List<SysUser> { targetUser }, type, remark, sort);
+        }
+
+        [NonAction]
+        [UnitOfWork]
+        public async Task<int> AddThenRead(string houseCodeId, List<SysUser> targetUsers, HouseLogType type, string remark = null, int? sort = null)
+        {
+            if (!sort.HasValue)
+            {
+                sort = await _bsHouseLogRep.DetachedEntities.Where(p => p.HouseCodeId.Equals(houseCodeId)).MaxAsync(p => p.Sort);
+            }
+            var _sort = sort.GetValueOrDefault(1) + 1;
+            await new BsHouseLog
+            {
+                Id = Guid.NewGuid().ToString(),
+                HouseCodeId = houseCodeId,
+                TargetUserIds = String.Join(",", targetUsers.Select(p => p.Id)),
+                Type = type,
+                Status = HouseLogStatus.Handling,
+                Remark = remark,
+                Sort = _sort
+            }.InsertAsync();
+
+            return _sort;
+        }
+
+        [NonAction]
+        [UnitOfWork]
+        public async Task<int> AddThenDone(string houseCodeId, SysUser targetUser, HouseLogType type, string remark = null, int? sort = null)
+        {
+            return await AddThenDone(houseCodeId, new List<SysUser> { targetUser }, type, remark, sort);
+        }
+
+        [NonAction]
+        [UnitOfWork]
+        public async Task<int> AddThenDone(string houseCodeId, List<SysUser> targetUsers, HouseLogType type, string remark = null, int? sort = null)
+        {
+            if (!sort.HasValue)
+            {
+                sort = await _bsHouseLogRep.DetachedEntities.Where(p => p.HouseCodeId.Equals(houseCodeId)).MaxAsync(p => p.Sort);
+            }
+            var _sort = sort.GetValueOrDefault(1) + 1;
+            await new BsHouseLog
+            {
+                Id = Guid.NewGuid().ToString(),
+                HouseCodeId = houseCodeId,
+                TargetUserIds = String.Join(",", targetUsers.Select(p => p.Id)),
+                Type = type,
+                Status = HouseLogStatus.Handled,
+                Remark = remark,
+                FinishedTime = DateTime.Now,
+                FinishedUserId = _userManager.UserId,
+                FinishedUserName = _userManager.User.Account,
+                Sort = _sort
+            }.InsertAsync();
+
+            return _sort;
+        }
+
+        [HttpGet("/houseLog/list")]
+        public async Task<dynamic> List([FromQuery] HouseLogInput input)
+        {
+            var sql = @"SELECT
+	HL.Id,
+	HL.Type,
+	HL.`Status`,
+    HL.Remark,
+	HL.FinishedTime,
+	HL.FinishedUserId,
+	IFNULL(NickName, `Name`) FinishedUserName,
+(SELECT GROUP_CONCAT(IFNULL(NickName,`Name`)) FROM sys_user
+	WHERE Id IN (
+		SELECT DISTINCT SUBSTRING_INDEX(SUBSTRING_INDEX(_HL.TargetUserIds,',',HT.help_topic_id + 1),',',-1)
+		FROM bs_house_log _HL
+		JOIN mysql.help_topic HT ON HT.help_topic_id < (LENGTH(_HL.TargetUserIds) - LENGTH(REPLACE(_HL.TargetUserIds,',','')) + 1)
+		WHERE _HL.Id = HL.Id
+	)
+) TargetUserNames
+FROM bs_house_log HL
+LEFT JOIN sys_user SU ON HL.FinishedUserId = SU.Id
+WHERE HouseCodeId = @HouseCodeId
+ORDER BY Sort DESC";
+
+            return await _dapperRep.QueryAsync<HouseLogOutput>(sql, new { houseCodeId = input.Id });
+        }
+
+        [HttpGet("/houseLog/listByInfoId")]
+        public async Task<dynamic> ListByInfoId([FromQuery] HouseLogInput input)
+        {
+            var info = await Db.GetRepository<BsHouseInfo>().DetachedEntities.FirstOrDefaultAsync(p => p.Id.Equals(input.Id));
+            return await List(new HouseLogInput
+            {
+                Id = info.HouseCodeId
+            });
+        }
+
+        [HttpGet("/houseLog/listByTaskId")]
+        public async Task<dynamic> ListByTaskId([FromQuery] HouseLogInput input)
+        {
+            var task = await Db.GetRepository<BsHouseTask>().DetachedEntities.FirstOrDefaultAsync(p => p.Id.Equals(input.Id));
+            return await List(new HouseLogInput
+            {
+                Id = task.HouseCodeId
+            });
+        }
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseLog/IHouseLogService.cs

@@ -0,0 +1,24 @@
+using Ewide.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application.Service
+{
+    public interface IHouseLogService
+    {
+        Task<int> Add(string houseCodeId, SysUser targetUser, HouseLogType type, string remark = null, int? sort = null);
+        Task<int> Add(string houseCodeId, List<SysUser> targetUsers, HouseLogType type, string remark = null, int? sort = null);
+        Task Read(string houseCodeId);
+        Task Done(string houseCodeId);
+        Task<int> AddThenRead(string houseCodeId, SysUser targetUser, HouseLogType type, string remark = null, int? sort = null);
+        Task<int> AddThenRead(string houseCodeId, List<SysUser> targetUsers, HouseLogType type, string remark = null, int? sort = null);
+        Task<int> AddThenDone(string houseCodeId, SysUser targetUser, HouseLogType type, string remark = null, int? sort = null);
+        Task<int> AddThenDone(string houseCodeId, List<SysUser> targetUsers, HouseLogType type, string remark = null, int? sort = null);
+        Task<dynamic> List(HouseLogInput input);
+        Task<dynamic> ListByInfoId(HouseLogInput input);
+        Task<dynamic> ListByTaskId(HouseLogInput input);
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseMember/Dto/HouseMemberInput.cs

@@ -0,0 +1,16 @@
+using Ewide.Core.Service;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application.Service
+{
+    public class AddHouseMemberInput : AddUserInput
+    {
+        [Required(ErrorMessage = "角色不能为空")]
+        public string RoleId { get; set; }
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseMember/Dto/HouseMemberOutput.cs

@@ -0,0 +1,13 @@
+using Ewide.Core.Service;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application.Service
+{
+    public class HouseMemberOutput
+    {
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseMember/HouseMemberService.cs

@@ -0,0 +1,326 @@
+using Dapper;
+using Ewide.Core;
+using Ewide.Core.Extension;
+using Ewide.Core.Service;
+using Furion.DatabaseAccessor;
+using Furion.DataEncryption;
+using Furion.DependencyInjection;
+using Furion.DynamicApiController;
+using Furion.FriendlyException;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System;
+
+namespace Ewide.Application.Service
+{
+    [ApiDescriptionSettings(Name = "HouseMember")]
+    public class HouseMemberService : IHouseMemberService, IDynamicApiController, ITransient
+    {
+        private readonly IDapperRepository _dapperRepository;
+
+        private readonly IRepository<SysUser> _sysUserRep;  // 用户表仓储 
+        private readonly IUserManager _userManager;
+        private readonly ISysUserService _sysUserService;
+        private readonly ISysEmpService _sysEmpService;
+
+        public HouseMemberService(
+            IDapperRepository dapperRepository,
+            IRepository<SysUser> sysUserRep,
+            IUserManager userManager,
+            ISysUserService sysUserService,
+            ISysEmpService sysEmpService
+        )
+        {
+            _dapperRepository = dapperRepository;
+            _sysUserRep = sysUserRep;
+            _userManager = userManager;
+            _sysUserService = sysUserService;
+            _sysEmpService = sysEmpService;
+        }
+
+        /// <summary>
+        /// 分页查询用户
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("/houseMember/page")]
+        public async Task<dynamic> QueryMemberPageList([FromBody] UserInput input)
+        {
+            var dataScopes = await _userManager.GetUserAllDataScopeList();
+
+            var sql = @"SELECT
+SU.*,
+SO.Name OrgName,
+SUR.RoleName,
+SUR.RoleCode
+FROM sys_user SU
+LEFT JOIN sys_emp SE ON SU.Id = SE.Id
+LEFT JOIN sys_org SO ON SE.OrgId = SO.Id
+LEFT JOIN (
+	SELECT
+		SUR.SysUserId,
+		GROUP_CONCAT(SR.Name) RoleName,
+		GROUP_CONCAT(SR.Code) RoleCode
+	FROM sys_user_role SUR
+	LEFT JOIN sys_role SR ON SUR.SysRoleId = SR.Id
+	GROUP BY SUR.SysUserId
+) SUR ON SU.Id = SUR.SysUserId
+WHERE 1=1";
+            var param = new DynamicParameters();
+
+            if (!string.IsNullOrEmpty(input.SearchValue))
+            {
+                sql += @" AND (SU.Account Like @SearchValue
+                OR SU.Name Like @SearchValue
+                OR SU.Phone Like @SearchValue)";
+                param.Add("SearchValue", "%" + input.SearchValue + "%");
+            }
+
+            if (!string.IsNullOrEmpty(input.SysEmpParam.OrgId))
+            {
+                var filter = " AND (SO.Id = @OrgId {0}) ";
+                filter = String.Format(filter, input.TreeNodeDataScope.GetValueOrDefault(1) == 2 ? " OR SO.Pids Like CONCAT('%[', @OrgId, ']%') " : "");
+                sql += filter;
+                param.Add("OrgId", input.SysEmpParam.OrgId);
+            }
+
+            if (input.SearchStatus >= 0)
+            {
+                sql += " AND SU.Status = @Status";
+                param.Add("Status", input.SearchStatus);
+            }
+
+            if (!_userManager.SuperAdmin)
+            {
+                sql += " AND SU.AdminType <> @AdminType";
+                param.Add("AdminType", AdminType.SuperAdmin);
+
+                sql += " AND SU.Id <> @UserId";
+                param.Add("UserId", _userManager.UserId);
+
+                if (dataScopes.Count > 0)
+                {
+                    sql += " AND SO.Id IN @OrgIds";
+                    param.Add("OrgIds", dataScopes.ToArray());
+                }
+            }
+
+            var users = await _dapperRepository.QueryPageData<UserOutput>(sql, input, param);
+
+            //foreach (var user in users.Items)
+            //{
+            //    user.SysEmpInfo = await _sysEmpService.GetEmpInfo(user.Id);
+            //}
+            return PageDataResult<UserOutput>.PageResult(users);
+        }
+
+        /// <summary>
+        /// 增加用户       
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("/houseMember/add")]
+        [UnitOfWork]
+        public async Task AddUser(AddHouseMemberInput input)
+        {
+            var id = await _sysUserService.AddUser(input);
+            var grantRoleInput = input.Adapt<UpdateUserInput>();
+            grantRoleInput.Id = id;
+
+            // 添加角色
+            grantRoleInput.GrantRoleIdList.Add(input.RoleId);
+            await _sysUserService.GrantUserRole(grantRoleInput);
+        }
+
+        /// <summary>
+        /// 获取角色
+        /// </summary>
+        /// <param name="orgId"></param>
+        /// <returns></returns>
+        [HttpGet("/houseMember/defaultRole")]
+        public async Task<dynamic> DefaultRole([FromQuery] string orgId)
+        {
+            return (await GetDefaultRole(orgId)).Adapt<RoleOutput>();
+        }
+
+        /// <summary>
+        /// 获取用户拥有角色
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpGet("/houseMember/ownRole")]
+        public async Task<dynamic> GetUserOwnRole([FromQuery] QueryUserInput input)
+        {
+            return await _sysUserService.GetUserOwnRole(input);
+        }
+
+        [HttpGet("/houseMember/defaultRoleRange")]
+        public async Task<dynamic> DefaultRoleRange()
+        {
+            return (await GetRoleRange()).Select(p => p.Adapt<RoleOutput>()).ToList();
+        }
+
+        /// <summary>
+        /// 删除用户
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("/houseMember/delete")]
+        [UnitOfWork]
+        public async Task DeleteUser(DeleteUserInput input)
+        {
+            /*
+             * 未处理逻辑
+             * 片区监管员在本片区已有安全员的情况下无法删除
+             */
+
+            await _sysUserService.DeleteUser(input);
+        }
+
+        /// <summary>
+        /// 更新用户
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("/houseMember/edit")]
+        [UnitOfWork]
+        public async Task UpdateUser(UpdateUserInput input)
+        {
+            /*
+             * 未处理逻辑
+             * 如果移动组织架构,会产生以下几种逻辑
+             * 片区1监管员(无安全员或有其他监管员)=>片区2,直接成功
+             * 片区1监管员(有安全员并且无其他监管员)=>片区2,无法移动
+             * 片区1安全员=>片区2(有监管员),直接成功
+             * 片区1安全员=>片区2(无监管员),无法移动,需要创建监管员
+             */
+
+            await _sysUserService.UpdateUser(input);
+        }
+
+        /// <summary>
+        /// 查看用户
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpGet("/houseMember/detail")]
+        public async Task<dynamic> GetUser([FromQuery] QueryUserInput input)
+        {
+            var sql = @"SELECT
+SU.*,
+SO.Name OrgName,
+SUR.RoleName,
+SUR.RoleCode
+FROM sys_user SU
+LEFT JOIN sys_emp SE ON SU.Id = SE.Id
+LEFT JOIN sys_org SO ON SE.OrgId = SO.Id
+LEFT JOIN (
+	SELECT
+		SUR.SysUserId,
+		GROUP_CONCAT(SR.Name) RoleName,
+		GROUP_CONCAT(SR.Code) RoleCode
+	FROM sys_user_role SUR
+	LEFT JOIN sys_role SR ON SUR.SysRoleId = SR.Id
+	GROUP BY SUR.SysUserId
+) SUR ON SU.Id = SUR.SysUserId
+WHERE SU.Id=@Id";
+            var user = (await _dapperRepository.QueryAsync<UserOutput>(sql, new { input.Id })).SingleOrDefault();
+            if (user != null)
+            {
+                user.SysEmpInfo = await _sysEmpService.GetEmpInfo(user.Id);
+            }
+            return user;
+        }
+
+        /// <summary>
+        /// 修改用户状态
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("/houseMember/changeStatus")]
+        public async Task ChangeUserStatus(UpdateUserInput input)
+        {
+            await _sysUserService.ChangeUserStatus(input);
+        }
+
+        /// <summary>
+        /// 授权用户数据范围
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("/houseMember/grantData")]
+        public async Task GrantUserData(UpdateUserInput input)
+        {
+            await _sysUserService.GrantUserData(input);
+        }
+
+        /// <summary>
+        /// 获取用户拥有数据
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpGet("/houseMember/ownData")]
+        public async Task<dynamic> GetUserOwnData([FromQuery] QueryUserInput input)
+        {
+            return await _sysUserService.GetUserOwnData(input);
+        }
+
+        /// <summary>
+        /// 获取当前机构中所创建的默认角色
+        ///     片区中的第一个帐号必定为片区监管员
+        /// </summary>
+        /// <param name="orgId"></param>
+        /// <returns></returns>
+        [NonAction]
+        private async Task<SysRole> GetDefaultRole(string orgId)
+        {
+            var roles = await GetRoleRange();
+            if (roles.Count < 2) throw Oops.Oh("未配置正确的角色");
+
+            var _sysOrgRep = Db.GetRepository<SysOrg>();
+            var org = await _sysOrgRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id == orgId);
+            // 如果当前组织为街道, 则直接返回安全员
+            if (org == null || org.Type <= (int)OrgType.乡镇街道办事处)
+            {
+                return roles.LastOrDefault();
+            }
+
+            var _sysEmpRep = Db.GetRepository<SysEmp>();
+            var _sysUserRoleRep = Db.GetRepository<SysUserRole>();
+            var userIds = await _sysEmpRep.DetachedEntities.Where(p => p.OrgId == orgId).Select(p => p.Id).ToListAsync();
+            var roleIds = await _sysUserRoleRep.DetachedEntities.Where(p => userIds.Contains(p.SysUserId)).Select(p => p.SysRoleId).ToListAsync();
+
+            var _sysRoleRep = Db.GetRepository<SysRole>();
+            var isExistZoneManager = await _sysRoleRep.DetachedEntities.AnyAsync(p => roleIds.Contains(p.Id) && p.Code == Enum.GetName(HouseManagerRole.ZoneManager).ToUnderScoreCase());
+            // 存在片区监管员，返回安全员, 否则返回监管员
+            if (isExistZoneManager)
+            {
+                return roles.LastOrDefault();
+            }
+
+            return roles.FirstOrDefault();
+        }
+
+        /// <summary>
+        /// 获取可创建的角色列表
+        /// </summary>
+        /// <returns></returns>
+        [NonAction]
+        private async Task<List<SysRole>> GetRoleRange()
+        {
+            var codes = (new[] {
+                Enum.GetName(HouseManagerRole.ZoneManager),
+                Enum.GetName(HouseManagerRole.HouseSecurityManager),
+            }).Select(p => p.ToUnderScoreCase());
+
+            var _sysRoleRep = Db.GetRepository<SysRole>();
+            var roles = await _sysRoleRep.DetachedEntities.Where(p => codes.Contains(p.Code)).ToListAsync();
+
+            return roles;
+        }
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseMember/IHouseMemberService.cs

@@ -0,0 +1,22 @@
+using Ewide.Core.Service;
+using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Ewide.Application.Service
+{
+    public interface IHouseMemberService
+    {
+        Task<dynamic> QueryMemberPageList([FromBody] UserInput input);
+        Task AddUser(AddHouseMemberInput input);
+        Task<dynamic> DefaultRole([FromQuery] string orgId);
+        Task DeleteUser(DeleteUserInput input);
+        Task UpdateUser(UpdateUserInput input);
+        Task<dynamic> GetUser([FromQuery] QueryUserInput input);
+        Task ChangeUserStatus(UpdateUserInput input);
+        Task<dynamic> GetUserOwnRole([FromQuery] QueryUserInput input);
+        Task GrantUserData(UpdateUserInput input);
+        Task<dynamic> GetUserOwnData([FromQuery] QueryUserInput input);
+        Task<dynamic> DefaultRoleRange();
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseProjectInfo/Dto/HouseProjectInfoInput.cs

@@ -0,0 +1,52 @@
+using Ewide.Core;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application.Service.HouseProjectInfo.Dto
+{
+    public class HouseProjectInfoInput : InputBase
+    {
+        public string Name { get; set; }
+        public string Note { get; set; }
+        public int Sort { get; set; }
+        public string AreaCode { get; set; }
+        public int Type { get; set; }
+    }
+    public class AddProjectInput : HouseProjectInfoInput
+    {
+       
+    }
+    public class UpdateProjectInput : HouseProjectInfoInput
+    {
+        [Required(ErrorMessage = "项目ID不可为空")]
+        public string Id { get; set; }
+    }
+
+    public class DeleteProjectInput 
+    {
+        [Required(ErrorMessage = "项目ID不可为空")]
+        public string Id { get; set; }
+    }
+
+    public class QueryProjectInput : UpdateProjectInput
+    {
+
+    }
+
+    public class PageProjectInput: HouseProjectInfoInput
+    {
+        public string pid { get; set; }
+    }
+
+    public class ListHouseProjectInfoInput
+    {
+        [Required(ErrorMessage = "区域编码不可为空")]
+        public string AreaCode { get; set; }
+        [Required(ErrorMessage = "性质不可为空")]
+        public int Type { get; set; }
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseProjectInfo/Dto/HouseProjectOutput.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application.Service.HouseProjectInfo.Dto
+{
+    public class HouseProjectOutput
+    {
+        public string Id { get; set; }
+        public string Name { get; set; }
+        public string Note { get; set; }
+        public int Sort { get; set; }
+        public string AreaCode { get; set; }
+        public string AreaName { get; set; }
+        public int Type { get; set; }
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseProjectInfo/HouseProjectInfoService.cs

@@ -0,0 +1,147 @@
+using Ewide.Application.Entity;
+using Ewide.Application.Service.HouseProjectInfo.Dto;
+using Ewide.Core;
+using Ewide.Core.Service;
+using Furion.DatabaseAccessor;
+using Furion.DatabaseAccessor.Extensions;
+using Furion.DependencyInjection;
+using Furion.DynamicApiController;
+using Furion.FriendlyException;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Data;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Ewide.Application.Service.HouseProjectInfo
+{
+    /// <summary>
+    /// 项目管理相关服务
+    /// </summary>
+    [ApiDescriptionSettings(Name = "HouseProjectInfo", Order = 170)]
+    public class HouseProjectInfoService : IHouseProjectInfoService, ITransient, IDynamicApiController
+    {
+        private readonly IRepository<BsHouseProjectInfo> _houseProjectInfoRep;
+
+        public HouseProjectInfoService(IRepository<BsHouseProjectInfo> houseProjectInfoRep)
+        {
+            _houseProjectInfoRep = houseProjectInfoRep;
+        }
+
+        /// <summary>
+        /// 添加项目
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("/houseProjectInfo/add")]
+        public async Task AddProject(AddProjectInput input)
+        {
+            await _houseProjectInfoRep.InsertNowAsync(input.Adapt<BsHouseProjectInfo>());
+        }
+
+        /// <summary>
+        /// 删除项目
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("/houseProjectInfo/delete")]
+        public async Task DeleteProject(DeleteProjectInput input)
+        {
+            var project = _houseProjectInfoRep.FirstOrDefault(p => p.Id == input.Id);
+            await project.DeleteNowAsync();
+        }
+
+        /// <summary>
+        /// 编辑项目
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("/houseProjectInfo/edit")]
+        public async Task UpdateProject(UpdateProjectInput input)
+        {
+            var project = input.Adapt<BsHouseProjectInfo>();
+            await project.UpdateExcludeAsync(new[] { nameof(BsHouseProjectInfo.AreaCode) }, true);
+        }
+
+        /// <summary>
+        /// 通过ID获取项目
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        [HttpGet("/houseProjectInfo/getById")]
+        public async Task<BsHouseProjectInfo> GetById([Required] string projectId)
+        {
+            return await _houseProjectInfoRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id == projectId);
+        }
+
+        /// <summary>
+        /// 分页查询
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("/houseProjectInfo/page")]
+        public async Task<dynamic> QueryProjectPageList([FromBody] PageProjectInput input)
+        {
+            var areaCodeRep = Db.GetRepository<SysAreaCode>();
+            var projects = await _houseProjectInfoRep.DetachedEntities
+                .Join(areaCodeRep.DetachedEntities, p => p.AreaCode, a => a.Code, (p, a) => new { p, AreaName = a.Name })
+                .Where(input.Type>0, x => x.p.Type == input.Type)
+                .Where(!string.IsNullOrEmpty(input.Name), x => x.p.Name.Contains(input.Name))
+                .Where(!string.IsNullOrEmpty(input.Note), x => x.p.Note.Contains(input.Note))
+                .Where(!string.IsNullOrEmpty(input.AreaCode), x => x.p.AreaCode == input.AreaCode)
+                .Where(!string.IsNullOrEmpty(input.pid) , x=> x.p.AreaCode.Contains(input.pid))
+                .Select(x => new { x.p.Id, x.p.Name, x.p.Note, x.p.Sort, x.p.AreaCode, x.AreaName, x.p.Type }.Adapt<HouseProjectOutput>()).ToPagedListAsync(input.PageIndex, input.PageSize);
+            return PageDataResult<HouseProjectOutput>.PageResult(projects);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpGet("/houseProjectInfo/detail")]
+        public async Task<dynamic> GetProject([FromQuery] QueryProjectInput input)
+        {
+            var user = await _houseProjectInfoRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id == input.Id);
+            var userDto = user.Adapt<UserOutput>();
+
+            return userDto;
+        }
+
+        [HttpGet("/houseProjectInfo/nextSort")]
+        public async Task<int> GetNextProjectSortByAreaCode([FromQuery] ListHouseProjectInfoInput input)
+        {
+            //var projects = await _houseProjectInfoRep.DetachedEntities
+            //    .Where(p => p.AreaCode == input.AreaCode && p.Type == input.Type)
+            //    .Select(p => p.Sort)
+            //    .DefaultIfEmpty()
+            //    .MaxAsync();
+            if (input.Type > 2 || input.Type < 1)
+            {
+                throw Oops.Oh("类型参数异常");
+            }
+            var p = await _houseProjectInfoRep.DetachedEntities
+                .Where(p => p.AreaCode == input.AreaCode && p.Type == input.Type)
+                .MaxAsync(p => (int?)p.Sort);
+
+            return p.GetValueOrDefault(0) + 1;
+        }
+
+        /// <summary>
+        /// 获取项目下拉列表
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpGet("houseProjectInfo/list")]
+        public async Task<dynamic> GetProjectList([FromQuery] ListHouseProjectInfoInput input)
+        {
+            return await _houseProjectInfoRep.DetachedEntities
+                .Where(p => p.AreaCode == input.AreaCode && p.Type == input.Type)
+                .OrderBy(p => p.Sort)
+                .ToListAsync();
+        }
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseProjectInfo/IHouseProjectInfoService.cs

@@ -0,0 +1,24 @@
+using Ewide.Application.Entity;
+using Ewide.Application.Service.HouseProjectInfo.Dto;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application.Service.HouseProjectInfo
+{
+    public interface IHouseProjectInfoService
+    {
+        Task AddProject(AddProjectInput input);
+        Task DeleteProject(DeleteProjectInput input);
+        Task UpdateProject(UpdateProjectInput input);
+        Task<BsHouseProjectInfo> GetById([FromRoute] string projectId);
+        Task<dynamic> GetProject([FromQuery] QueryProjectInput input);
+        Task<dynamic> QueryProjectPageList([FromQuery] PageProjectInput input);
+
+        Task<int> GetNextProjectSortByAreaCode([FromQuery] ListHouseProjectInfoInput input);
+        Task<dynamic> GetProjectList([FromQuery] ListHouseProjectInfoInput input);
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseQuery/Dto/HouseQueryInput.cs

@@ -0,0 +1,21 @@
+using Ewide.Core;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application
+{
+    public class HouseQueryInput: PageInputBase
+    {
+
+    }
+
+    public class HouseQueryDetailInput
+    {
+        [Required(ErrorMessage = "Id不能为空")]
+        public string Id { get; set; }
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseQuery/Dto/HouseQueryOutput.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application
+{
+    public class HouseQueryOutput
+    {
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseQuery/HouseQueryService.cs

@@ -0,0 +1,110 @@
+using Dapper;
+using Ewide.Core.Extension;
+using Furion.DatabaseAccessor;
+using Furion.DependencyInjection;
+using Furion.DynamicApiController;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application.Service.HouseSafety.HouseQuery
+{
+    /// <summary>
+    /// 住宅查询
+    /// </summary>
+    [ApiDescriptionSettings(Name = "HouseQuery", Order = 210)]
+    public class HouseQueryService : IHouseQueryService, IDynamicApiController, ITransient
+    {
+        private readonly IRepository<BsHouseCode> _houseCodeRep;
+        private readonly IRepository<BsHouseInfo> _houseInfoRep;
+        private readonly IRepository<BsHouseTask> _houseTaskRep;
+        private readonly IDapperRepository _dapperRepository;
+
+        public HouseQueryService(IRepository<BsHouseCode> HouseCodeRep, IRepository<BsHouseInfo> HouseInfoRep, IRepository<BsHouseTask> HouseTaskRep, IDapperRepository dapperRepository)
+        {
+            _houseCodeRep = HouseCodeRep;
+            _houseInfoRep = HouseInfoRep;
+            _houseTaskRep = HouseTaskRep;
+            _dapperRepository = dapperRepository;
+        }
+
+        [HttpPost("/houseQuery/page")]
+        public async Task<dynamic> QueryPage([FromBody] HouseQueryInput input)
+        {
+            var sql = @"SELECT 
+    HC.ID,
+    HC.HouseCode,
+    AA.Name AreaName,
+    RA.Name RoadName,
+    CA.Name CommName,
+    Proj.AreaCode,
+    Proj.Note,
+    Proj.Name,
+    CONCAT(Proj.Name,'(',Proj.Note,')') FullProjName,
+    HC.Address,
+    IFNULL(HI.BuildingName,'') BuildingName,
+    IFNULL(HI.TotalFloor,0) TotalFloor,
+    IFNULL(HI.TotalArea,0) TotalArea,
+    HI.LandAttribute,
+    IFNULL(HI.HouseGrade,0) HouseGrade,
+    HC.Type,
+    HC.No,
+    HI.State,
+    HI.CompletedDate,
+    HI.CreatedTime
+FROM bs_house_code HC 
+LEFT JOIN bs_house_info HI ON HI.HouseCodeId = HC.Id
+LEFT JOIN bs_house_projectinfo Proj ON Proj.Id=HC.ProjectId
+LEFT JOIN sys_area_code CA ON CA.Code = Proj.AreaCode
+LEFT JOIN sys_area_code RA ON RA.AdCode = SUBSTR(CA.AdCode,1,9)
+LEFT JOIN sys_area_code AA ON AA.AdCode = SUBSTR(CA.AdCode,1,6)
+WHERE 1=1";
+
+            return await _dapperRepository.QueryPageDataDynamic(sql, input, filterFields: new string[] { 
+                "HouseCode", 
+                "Address", 
+                "BuildingName", 
+                "State", 
+                "AreaCode", 
+                "LandAttribute", 
+                "HouseGrade",
+                "CompletedDate", 
+                "CreatedTime",
+                "TotalArea",
+                "TotalFloor"
+            });
+        }
+
+        [HttpGet("/houseQuery/detail")]
+        public async Task<dynamic> Detail([FromQuery] HouseQueryDetailInput input) 
+        {
+            var houseCodeOutputAsync = await _dapperRepository.QueryAsync<HouseCodeOutput>(
+                @"SELECT HC.Id,HC.Address,HC.ProjectId,HC.ZoneId,HC.Type,AA.Name AreaName,RA.Name RoadName,CA.Name CommName,O.Name ZoneName,Proj.Note ProjectNote,CONCAT(Proj.Name,'(',Proj.Note,')') ProjectFullName,HC.HouseCode,HC.Lng,HC.Lat,HC.No FROM bs_house_code HC
+LEFT JOIN bs_house_projectinfo Proj ON Proj.Id=HC.ProjectId
+LEFT JOIN sys_org O ON HC.ZoneId = O.Id
+LEFT JOIN sys_area_code CA ON CA.Code = Proj.AreaCode
+LEFT JOIN sys_area_code RA ON RA.AdCode = SUBSTR(CA.AdCode,1,9)
+LEFT JOIN sys_area_code AA ON AA.AdCode = SUBSTR(CA.AdCode,1,6)
+WHERE HC.Id=@Id", new { input.Id }
+                );
+
+            var houseCodeOutput = houseCodeOutputAsync.SingleOrDefault();
+
+            
+            var houseInfoOutputForDetailPage = new HouseInfoOutputForDetailPage
+            {
+                HouseCode = houseCodeOutput
+            };
+
+            var houseInfoOutput = (await _houseInfoRep.DetachedEntities.FirstOrDefaultAsync(p => p.HouseCodeId == houseCodeOutput.Id)).Adapt<HouseInfoOutput>();
+            houseInfoOutputForDetailPage.HouseInfo = houseInfoOutput;
+
+            return houseInfoOutputForDetailPage;
+        }
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseQuery/IHouseQueryService.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application.Service.HouseSafety.HouseQuery
+{
+    public interface IHouseQueryService
+    {
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseSelector/Dto/HouseSelectorInput.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application
+{
+    public class HouseSelectInput
+    {
+        [Required(ErrorMessage = "用户Id不能为空")]
+        public string UserId { get; set; }
+
+        [Required(ErrorMessage = "房屋编码Id不能为空")]
+        public string[] Ids { get; set; }
+    }
+
+    public class QueryHouseSelectorInput : QueryHouseCodeInput
+    {
+        [Required(ErrorMessage = "用户Id不能为空")]
+        public string UserId { get; set; }
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseSelector/Dto/HouseSelectorOutput.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application
+{
+    public class HouseSelectorOutput
+    {
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseSelector/HouseSelectorService.cs

@@ -0,0 +1,225 @@
+using Dapper;
+using Ewide.Core;
+using Ewide.Core.Extension;
+using Furion.DatabaseAccessor;
+using Furion.DatabaseAccessor.Extensions;
+using Furion.DependencyInjection;
+using Furion.DynamicApiController;
+using Furion.FriendlyException;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Ewide.Application.Service
+{
+    /// <summary>
+    /// 选房相关
+    /// </summary>
+    [ApiDescriptionSettings(Name = "HouseSelector", Order = 180)]
+    public class HouseSelectorService : IHouseSelectorService, IDynamicApiController, ITransient
+    {
+        private readonly IUserManager _userManager;
+        private readonly IDapperRepository _dapperRep;
+
+        private readonly IRepository<BsHouseMemberRelation> _bsHouseMemberRelationRep;
+        private readonly IRepository<BsHouseCode> _bsHouseCodeRep;
+        private readonly IRepository<BsHouseTask> _bsHouseTaskRep;
+        private readonly IRepository<SysUser> _sysUserRep;
+        private readonly IHouseZoneService _houseZoneService;
+
+        private readonly IHouseLogService _houseLogService;
+
+        public HouseSelectorService(
+            IUserManager userManager,
+            IDapperRepository dapperRep,
+            IRepository<BsHouseMemberRelation> bsHouseMemberRelationRep,
+            IRepository<BsHouseCode> bsHouseCodeRep,
+            IRepository<BsHouseTask> bsHouseTaskRep,
+            IRepository<SysUser> sysUserRep,
+            IHouseZoneService houseZoneService,
+            IHouseLogService houseLogService
+        )
+        {
+            _userManager = userManager;
+
+            _dapperRep = dapperRep;
+            _bsHouseMemberRelationRep = bsHouseMemberRelationRep;
+            _bsHouseCodeRep = bsHouseCodeRep;
+            _bsHouseTaskRep = bsHouseTaskRep;
+            _sysUserRep = sysUserRep;
+            _houseZoneService = houseZoneService;
+
+            _houseLogService = houseLogService;
+        }
+
+        /// <summary>
+        /// 获取人员允许绑定的房屋编码列表
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("/houseSelector/selectorPage")]
+        public async Task<dynamic> HouseSelectorList([FromBody] QueryHouseSelectorInput input)
+        {
+            var sql = @"SELECT 
+	HC.*,AA.Name AreaName,RA.Name RoadName,CA.Name CommName,Proj.AreaCode,Proj.Note,CONCAT(Proj.`Name`, IFNULL(CONCAT('(',Proj.Note,')'), '')) FullProjName 
+FROM bs_house_code HC
+LEFT JOIN bs_house_projectinfo Proj ON Proj.Id=HC.ProjectId
+LEFT JOIN sys_area_code CA ON CA.Code = Proj.AreaCode
+LEFT JOIN sys_area_code RA ON RA.AdCode = SUBSTR(CA.AdCode,1,9)
+LEFT JOIN sys_area_code AA ON AA.AdCode = SUBSTR(CA.AdCode,1,6) 
+LEFT JOIN bs_house_member_relation HM ON HC.Id = HM.HouseCodeId
+INNER JOIN (SELECT * FROM sys_emp WHERE Id = @UserId) E ON HC.ZoneId = E.OrgId
+WHERE HM.Id IS NULL";
+            return await _dapperRep.QueryPageDataDynamic(sql, input, param: new
+            {
+                input.UserId
+            }, filterFields: new[] { 
+                nameof(BsHouseCode.Address) ,
+                nameof(BsHouseCode.CreatedTime)
+            });
+        }
+
+        /// <summary>
+        /// 获取人员已经绑定的房屋编码列表
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("/houseSelector/selectedPage")]
+        public async Task<dynamic> HouseSelectedList([FromBody] QueryHouseSelectorInput input)
+        {
+            var sql = @"SELECT 
+	HC.*,AA.Name AreaName,RA.Name RoadName,CA.Name CommName,Proj.AreaCode,Proj.Note,CONCAT(Proj.`Name`, IFNULL(CONCAT('(',Proj.Note,')'), '')) FullProjName 
+FROM bs_house_code HC
+LEFT JOIN bs_house_projectinfo Proj ON Proj.Id=HC.ProjectId
+LEFT JOIN sys_area_code CA ON CA.Code = Proj.AreaCode
+LEFT JOIN sys_area_code RA ON RA.AdCode = SUBSTR(CA.AdCode,1,9)
+LEFT JOIN sys_area_code AA ON AA.AdCode = SUBSTR(CA.AdCode,1,6) 
+INNER JOIN (SELECT * FROM bs_house_member_relation WHERE SysUserId = @UserId) HM ON HC.Id = HM.HouseCodeId";
+            return await _dapperRep.QueryPageDataDynamic(sql, input, param: new
+            {
+                input.UserId
+            }, filterFields: new[] {
+                nameof(BsHouseCode.Address) ,
+                nameof(BsHouseCode.CreatedTime)
+            });
+        }
+
+        /// <summary>
+        /// 从人员选择房屋
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("/houseSelector/select")]
+        [UnitOfWork]
+        public async Task Select([FromBody] HouseSelectInput input)
+        {
+            #region 验证房屋是否在当前用户可选范围内
+
+            var ids = input.Ids.Distinct().ToList();
+            if (ids.Count == 0) throw Oops.Oh("没有选中任何房屋");
+
+            // 验证当前用户是否安全员 **须补充
+
+            // 已经被选中的房屋,从ids中剔除
+            var houseSelected = await _bsHouseMemberRelationRep.DetachedEntities
+                .Where(p => ids.Contains(p.HouseCodeId))
+                .Select(p => p.HouseCodeId)
+                .ToListAsync();
+            if (houseSelected.Count > 0)
+            {
+                houseSelected.ForEach(p =>
+                {
+                    var index = ids.IndexOf(p);
+                    if (index > -1)
+                    {
+                        ids.RemoveAt(index);
+                    }
+                });
+            }
+
+            if (ids.Count == 0) throw Oops.Oh("当前房屋在此之前已经全部被选中，请确认");
+
+            var selectedUser = await _sysUserRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id.Equals(input.UserId));
+
+            // 从用户所在片区中过滤房屋
+            var zoneId = await _houseZoneService.GetZoneByUser(selectedUser.Id);
+            var house = await _bsHouseCodeRep.DetachedEntities.Where(p => ids.Contains(p.Id) && p.ZoneId == zoneId).Select(p => p.Id).ToListAsync();
+
+            if (house.Count == 0) throw Oops.Oh("选中的房屋错误");
+
+            #endregion
+
+            // 选定房屋
+            house.ForEach(async p =>
+            {
+                var originalTask = _bsHouseTaskRep.DetachedEntities.FirstOrDefault(t => t.HouseCodeId == p && t.TaskType == 0 && t.IsEnabled);
+                if (originalTask == null)
+                {
+                    new BsHouseTask
+                    {
+                        Id = System.Guid.NewGuid().ToString(),
+                        HouseCodeId = p,
+                        UserID = selectedUser.Id,
+                        EndTime = System.DateTime.Now.AddMonths(1),
+                        Status = 0,
+                        TaskType = 0
+                    }.Insert();
+
+                    await _houseLogService.Done(p);
+                    await _houseLogService.Add(p, selectedUser, HouseLogType.CreateInfo);
+                }
+                else
+                {
+                    var sort = await _houseLogService.AddThenDone(p, _userManager.User, HouseLogType.SelectMember);
+                    if (originalTask.Status != 6)//建档未完成，生成新建档任务分配给新的人员；原建档任务数据保留，有效性设置为false，取消巡查关系
+                    {
+                        var newTask = originalTask.Adapt<BsHouseTask>();
+                        newTask.Id = System.Guid.NewGuid().ToString();
+                        newTask.UserID = input.UserId;
+                        newTask.EndTime = System.DateTime.Now.AddMonths(1);
+                        newTask.Insert();
+
+                        originalTask.IsEnabled = false;
+                        originalTask.Update();
+
+                        sort = await _houseLogService.Add(p, selectedUser, HouseLogType.CreateInfo, sort: sort);
+                    }//已建档完成，不再分配建档任务，仅更换巡查关系
+                    else
+                    {
+                        var originalRelation = _bsHouseMemberRelationRep.DetachedEntities.FirstOrDefault(r => r.HouseCodeId == p && r.SysUserId == originalTask.UserID);
+                        originalRelation.Delete();
+                    }
+                }
+
+                new BsHouseMemberRelation
+                {
+                    SysUserId = selectedUser.Id,
+                    HouseCodeId = p
+                }.Insert();
+            });
+        }
+
+        [HttpPost("/houseSelector/revoke")]
+        [UnitOfWork]
+        public async Task Revoke([FromBody] HouseSelectInput input)
+        {
+            var ids = input.Ids.Distinct().ToList();
+            if (ids.Count == 0) throw Oops.Oh("没有选中任何房屋");
+
+            var selected = await _bsHouseMemberRelationRep.Where(p => ids.Contains(p.HouseCodeId) && p.SysUserId == input.UserId).ToListAsync();
+
+            selected.ForEach(p =>
+            {
+                p.Delete();
+            });
+        }
+
+        public async Task SelectMember()
+        {
+
+        }
+    }
+}

framework/Api/Ewide.Application/Service/HouseSafety/HouseSelector/IHouseSelectorService.cs

@@ -0,0 +1,18 @@
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application.Service
+{
+    public interface IHouseSelectorService
+    {
+        Task<dynamic> HouseSelectorList([FromQuery] QueryHouseSelectorInput input);
+        Task<dynamic> HouseSelectedList([FromQuery] QueryHouseSelectorInput input);
+        Task Select([FromBody] HouseSelectInput input);
+        Task Revoke([FromBody] HouseSelectInput input);
+        Task SelectMember();
+    }
+}