diff --git a/Ewide.Nbzs.BackWorkerService/Ewide.Nbzs.BackWorkerService.csproj b/Ewide.Nbzs.BackWorkerService/Ewide.Nbzs.BackWorkerService.csproj
new file mode 100644
index 0000000..e9d1649
--- /dev/null
+++ b/Ewide.Nbzs.BackWorkerService/Ewide.Nbzs.BackWorkerService.csproj
@@ -0,0 +1,17 @@
+
+
+
+ net5.0
+ dotnet-Ewide.Nbzs.BackWorkerService-5E150AE7-682D-42D1-AF3F-1C9CA78CDAD8
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Ewide.Nbzs.BackWorkerService/Program.cs b/Ewide.Nbzs.BackWorkerService/Program.cs
new file mode 100644
index 0000000..bbe11e3
--- /dev/null
+++ b/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();
+ });
+ }
+}
diff --git a/Ewide.Nbzs.BackWorkerService/Properties/launchSettings.json b/Ewide.Nbzs.BackWorkerService/Properties/launchSettings.json
new file mode 100644
index 0000000..55d2e97
--- /dev/null
+++ b/Ewide.Nbzs.BackWorkerService/Properties/launchSettings.json
@@ -0,0 +1,11 @@
+{
+ "profiles": {
+ "Ewide.Nbzs.BackWorkerService": {
+ "commandName": "Project",
+ "dotnetRunMessages": "true",
+ "environmentVariables": {
+ "DOTNET_ENVIRONMENT": "Development"
+ }
+ }
+ }
+}
diff --git a/Ewide.Nbzs.BackWorkerService/Worker.cs b/Ewide.Nbzs.BackWorkerService/Worker.cs
new file mode 100644
index 0000000..04a537e
--- /dev/null
+++ b/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 _logger;
+
+ public Worker(ILogger logger)
+ {
+ _logger = logger;
+ List 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().ToList();
+ var asd = db.Queryable().ToList();
+ _logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
+ await Task.Delay(1000, stoppingToken);
+ }
+ }
+ ///
+ /// ִ ÿ
+ ///
+ private void ExecProcess()
+ {
+ Thread.Sleep(3000);
+ }
+
+ private void ExecPushProcess()
+ {
+
+
+ }
+ }
+}
diff --git a/Ewide.Nbzs.BackWorkerService/appsettings.Development.json b/Ewide.Nbzs.BackWorkerService/appsettings.Development.json
new file mode 100644
index 0000000..8983e0f
--- /dev/null
+++ b/Ewide.Nbzs.BackWorkerService/appsettings.Development.json
@@ -0,0 +1,9 @@
+{
+ "Logging": {
+ "LogLevel": {
+ "Default": "Information",
+ "Microsoft": "Warning",
+ "Microsoft.Hosting.Lifetime": "Information"
+ }
+ }
+}
diff --git a/Ewide.Nbzs.BackWorkerService/appsettings.json b/Ewide.Nbzs.BackWorkerService/appsettings.json
new file mode 100644
index 0000000..3893a5b
--- /dev/null
+++ b/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"
+ }
+}
diff --git a/Ewide.Nbzs.Entity/Base/BaseEntity.cs b/Ewide.Nbzs.Entity/Base/BaseEntity.cs
new file mode 100644
index 0000000..29fb674
--- /dev/null
+++ b/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
+{
+ ///
+ /// 基础实体类
+ ///
+ [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; }
+
+ }
+}
diff --git a/Ewide.Nbzs.Entity/Base/RespModel.cs b/Ewide.Nbzs.Entity/Base/RespModel.cs
new file mode 100644
index 0000000..7ebb673
--- /dev/null
+++ b/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
+ {
+ ///
+ /// 是否成功
+ ///
+ [System.Runtime.Serialization.DataMember]
+ public bool issuccess { get; set; }
+ ///
+ /// 错误码
+ ///
+ [System.Runtime.Serialization.DataMember]
+ public string errorcode { get; set; }
+ [System.Runtime.Serialization.DataMember]
+ public string message { get; set; }
+ ///
+ ///
+ ///
+ [System.Runtime.Serialization.DataMember]
+ public object data { get; set; }
+ ///
+ ///
+ ///
+ [System.Runtime.Serialization.DataMember]
+ public int allcount { get; set; }
+ ///
+ /// 附加对象
+ ///
+ [System.Runtime.Serialization.DataMember]
+ public object addition { get; set; }
+
+ ///
+ /// 消耗时间,单位毫秒
+ ///
+ [System.Runtime.Serialization.DataMember]
+ public long consume_time { get; set; }
+ }
+}
diff --git a/Ewide.Nbzs.Entity/DataBase/InvestigateTable.cs b/Ewide.Nbzs.Entity/DataBase/InvestigateTable.cs
new file mode 100644
index 0000000..ab2c7be
--- /dev/null
+++ b/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
+ {
+ ///
+ /// 数据表实体类:InvestigateTable
+ ///
+ [Table("InvestigateTable")]
+ public partial class InvestigateTable: BaseEntity {
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Key]
+ [Column("ID")]
+ [DataMember]
+ public Guid ID {get;set;}
+ ///
+ /// 调查表编号
+ ///
+
+ [Display(Name="调查表编号")]
+ [Column("No")]
+ [DataMember]
+ public string No {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("ProjectName")]
+ [DataMember]
+ public string ProjectName {get;set;}
+ ///
+ /// 项目ID
+ ///
+
+ [Display(Name="项目ID")]
+ [Column("ProjectId")]
+ [DataMember]
+ public Guid ProjectId {get;set;}
+ ///
+ /// 被征收人姓名
+ ///
+
+ [Display(Name="被征收人姓名")]
+ [Column("ExpropriatedName")]
+ [DataMember]
+ public string ExpropriatedName {get;set;}
+ ///
+ /// 被征收人性质ID 关联数据字典表ID
+ ///
+
+ [Display(Name="被征收人性质ID 关联数据字典表ID")]
+ [Column("ExpropriatedNatureID")]
+ [DataMember]
+ public Guid? ExpropriatedNatureID {get;set;}
+ ///
+ /// 被征收人性质 被征收人还是承租人
+ ///
+
+ [Display(Name="被征收人性质 被征收人还是承租人")]
+ [Column("ExpropriatedNature")]
+ [DataMember]
+ public string ExpropriatedNature {get;set;}
+ ///
+ /// 被征收人身份证
+ ///
+
+ [Display(Name="被征收人身份证")]
+ [Column("ExpropriatedCardNo")]
+ [DataMember]
+ public string ExpropriatedCardNo {get;set;}
+ ///
+ /// 被征收人联系电话
+ ///
+
+ [Display(Name="被征收人联系电话")]
+ [Column("ExpropriatedPhone")]
+ [DataMember]
+ public string ExpropriatedPhone {get;set;}
+ ///
+ /// 产权性质ID
+ ///
+
+ [Display(Name="产权性质ID")]
+ [Column("NatureOfPropertyID")]
+ [DataMember]
+ public string NatureOfPropertyID {get;set;}
+ ///
+ /// 产权性质
+ ///
+
+ [Display(Name="产权性质")]
+ [Column("NatureOfProperty")]
+ [DataMember]
+ public string NatureOfProperty {get;set;}
+ ///
+ /// 结构ID 字典表ID,可能有多个 逗号分隔
+ ///
+
+ [Display(Name="结构ID 字典表ID,可能有多个 逗号分隔")]
+ [Column("StructureID")]
+ [DataMember]
+ public string StructureID {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("LandAcquisitionBCWillingness")]
+ [DataMember]
+ public string LandAcquisitionBCWillingness {get;set;}
+ ///
+ /// 结构,可能有多个 逗号分隔
+ ///
+
+ [Display(Name="结构,可能有多个 逗号分隔")]
+ [Column("StructureID_text")]
+ [DataMember]
+ public string StructureID_text {get;set;}
+ ///
+ /// 产权人
+ ///
+
+ [Display(Name="产权人")]
+ [Column("PropertyRightPrson")]
+ [DataMember]
+ public string PropertyRightPrson {get;set;}
+ ///
+ /// 产权人电话
+ ///
+
+ [Display(Name="产权人电话")]
+ [Column("PropertyRightPrsonPhone")]
+ [DataMember]
+ public string PropertyRightPrsonPhone {get;set;}
+ ///
+ /// 产权人身份证,证件号码
+ ///
+
+ [Display(Name="产权人身份证,证件号码")]
+ [Column("PropertyRightPrsonCardNo")]
+ [DataMember]
+ public string PropertyRightPrsonCardNo {get;set;}
+ ///
+ /// 用户编号1
+ ///
+
+ [Display(Name="用户编号1")]
+ [Column("No1")]
+ [DataMember]
+ public string No1 {get;set;}
+ ///
+ /// 用户编号2
+ ///
+
+ [Display(Name="用户编号2")]
+ [Column("No2")]
+ [DataMember]
+ public string No2 {get;set;}
+ ///
+ /// 承租人
+ ///
+
+ [Display(Name="承租人")]
+ [Column("Lessee")]
+ [DataMember]
+ public string Lessee {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("LesseePhone")]
+ [DataMember]
+ public string LesseePhone {get;set;}
+ ///
+ /// 承租人证件号码
+ ///
+
+ [Display(Name="承租人证件号码")]
+ [Column("LesseeCardNo")]
+ [DataMember]
+ public string LesseeCardNo {get;set;}
+ ///
+ /// 被征收房屋地址
+ ///
+
+ [Display(Name="被征收房屋地址")]
+ [Column("HouseAddress")]
+ [DataMember]
+ public string HouseAddress {get;set;}
+ ///
+ /// 街道
+ ///
+
+ [Display(Name="街道")]
+ [Column("Street")]
+ [DataMember]
+ public string Street {get;set;}
+ ///
+ /// 丘号
+ ///
+
+ [Display(Name="丘号")]
+ [Column("LandNo")]
+ [DataMember]
+ public string LandNo {get;set;}
+ ///
+ /// 产权证号
+ ///
+
+ [Display(Name="产权证号")]
+ [Column("PropertyRightCardNo")]
+ [DataMember]
+ public string PropertyRightCardNo {get;set;}
+ ///
+ /// 权证建筑面积
+ ///
+
+ [Display(Name="权证建筑面积")]
+ [Column("BuildingArea")]
+ [DataMember]
+ public decimal? BuildingArea {get;set;}
+ ///
+ /// 使用面积
+ ///
+
+ [Display(Name="使用面积")]
+ [Column("UseArea")]
+ [DataMember]
+ public decimal? UseArea {get;set;}
+ ///
+ /// 核定建筑面积
+ ///
+
+ [Display(Name="核定建筑面积")]
+ [Column("ApprovedArea")]
+ [DataMember]
+ public decimal? ApprovedArea {get;set;}
+ ///
+ /// 所在层
+ ///
+
+ [Display(Name="所在层")]
+ [Column("InLayer")]
+ [DataMember]
+ public decimal? InLayer {get;set;}
+ ///
+ /// 总层数
+ ///
+
+ [Display(Name="总层数")]
+ [Column("AllLayer")]
+ [DataMember]
+ public decimal? AllLayer {get;set;}
+ ///
+ /// 房屋用途
+ ///
+
+ [Display(Name="房屋用途")]
+ [Column("HouseUse")]
+ [DataMember]
+ public string HouseUse {get;set;}
+ ///
+ /// 自行车房面积
+ ///
+
+ [Display(Name="自行车房面积")]
+ [Column("BiicyclesArea")]
+ [DataMember]
+ public decimal? BiicyclesArea {get;set;}
+ ///
+ /// 房屋产权性质
+ ///
+
+ [Display(Name="房屋产权性质")]
+ [Column("HouseNatureOfProperty")]
+ [DataMember]
+ public string HouseNatureOfProperty {get;set;}
+ ///
+ /// 使用情况ID 关联字典表ID
+ ///
+
+ [Display(Name="使用情况ID 关联字典表ID")]
+ [Column("UsageID")]
+ [DataMember]
+ public Guid? UsageID {get;set;}
+ ///
+ /// 使用情况
+ ///
+
+ [Display(Name="使用情况")]
+ [Column("UsageSituation")]
+ [DataMember]
+ public string UsageSituation {get;set;}
+ ///
+ /// 人口
+ ///
+
+ [Display(Name="人口")]
+ [Column("Population")]
+ [DataMember]
+ public int? Population {get;set;}
+ ///
+ /// 备注
+ ///
+
+ [Display(Name="备注")]
+ [Column("Remark")]
+ [DataMember]
+ public string Remark {get;set;}
+ ///
+ /// 房号
+ ///
+
+ [Display(Name="房号")]
+ [Column("HouseNo")]
+ [DataMember]
+ public string HouseNo {get;set;}
+ ///
+ /// 土地证号
+ ///
+
+ [Display(Name="土地证号")]
+ [Column("LandCardNo")]
+ [DataMember]
+ public string LandCardNo {get;set;}
+ ///
+ /// 土地证面积
+ ///
+
+ [Display(Name="土地证面积")]
+ [Column("LandCardArea")]
+ [DataMember]
+ public decimal? LandCardArea {get;set;}
+ ///
+ /// 土地用途
+ ///
+
+ [Display(Name="土地用途")]
+ [Column("LandUse")]
+ [DataMember]
+ public string LandUse {get;set;}
+ ///
+ /// 土地取得方式
+ ///
+
+ [Display(Name="土地取得方式")]
+ [Column("LandWay")]
+ [DataMember]
+ public string LandWay {get;set;}
+ ///
+ /// 未登记-坐落
+ ///
+
+ [Display(Name="未登记-坐落")]
+ [Column("UnReg_Address")]
+ [DataMember]
+ public string UnReg_Address {get;set;}
+ ///
+ /// 未登记-建筑面积
+ ///
+
+ [Display(Name="未登记-建筑面积")]
+ [Column("UnReg_BuildArea")]
+ [DataMember]
+ public decimal? UnReg_BuildArea {get;set;}
+ ///
+ /// 未登记-建造年份
+ ///
+
+ [Display(Name="未登记-建造年份")]
+ [Column("UnReg_BuildYear")]
+ [DataMember]
+ public string UnReg_BuildYear {get;set;}
+ ///
+ /// 未登记-实际用途
+ ///
+
+ [Display(Name="未登记-实际用途")]
+ [Column("UnReg_PracticalUse")]
+ [DataMember]
+ public string UnReg_PracticalUse {get;set;}
+ ///
+ /// 未登记-合法面积
+ ///
+
+ [Display(Name="未登记-合法面积")]
+ [Column("UnReg_LegalArea")]
+ [DataMember]
+ public decimal? UnReg_LegalArea {get;set;}
+ ///
+ /// 建造年份
+ ///
+
+ [Display(Name="建造年份")]
+ [Column("BuildYear")]
+ [DataMember]
+ public DateTime? BuildYear {get;set;}
+ ///
+ /// 底层情况
+ ///
+
+ [Display(Name="底层情况")]
+ [Column("Underlying")]
+ [DataMember]
+ public string Underlying {get;set;}
+ ///
+ /// 车房类别
+ ///
+
+ [Display(Name="车房类别")]
+ [Column("CarHouseType")]
+ [DataMember]
+ public string CarHouseType {get;set;}
+ ///
+ /// 车房面积
+ ///
+
+ [Display(Name="车房面积")]
+ [Column("CarHouseArea")]
+ [DataMember]
+ public decimal? CarHouseArea {get;set;}
+ ///
+ /// 房屋征收相关文书送达地址
+ ///
+
+ [Display(Name="房屋征收相关文书送达地址")]
+ [Column("DocumentToAddress")]
+ [DataMember]
+ public string DocumentToAddress {get;set;}
+ ///
+ /// 收件联系人
+ ///
+
+ [Display(Name="收件联系人")]
+ [Column("ReceiveContactPerson")]
+ [DataMember]
+ public string ReceiveContactPerson {get;set;}
+ ///
+ /// 收件联系手机
+ ///
+
+ [Display(Name="收件联系手机")]
+ [Column("ReceiveContactPhone")]
+ [DataMember]
+ public string ReceiveContactPhone {get;set;}
+ ///
+ /// 征收意愿
+ ///
+
+ [Display(Name="征收意愿")]
+ [Column("LandAcquisitionWillingness")]
+ [DataMember]
+ public string LandAcquisitionWillingness {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Razon")]
+ [DataMember]
+ public string Razon {get;set;}
+ ///
+ /// 安置意向
+ ///
+
+ [Display(Name="安置意向")]
+ [Column("SettlementIntention")]
+ [DataMember]
+ public string SettlementIntention {get;set;}
+ ///
+ /// 调查人ID
+ ///
+
+ [Display(Name="调查人ID")]
+ [Column("InvestigateUserId")]
+ [DataMember]
+ public Guid? InvestigateUserId {get;set;}
+ ///
+ /// 调查人
+ ///
+
+ [Display(Name="调查人")]
+ [Column("InvestigateUserName")]
+ [DataMember]
+ public string InvestigateUserName {get;set;}
+ ///
+ /// 调查时间
+ ///
+
+ [Display(Name="调查时间")]
+ [Column("InvestigateDate")]
+ [DataMember]
+ public DateTime? InvestigateDate {get;set;}
+ ///
+ /// 登记人ID
+ ///
+
+ [Display(Name="登记人ID")]
+ [Column("RegisterUserId")]
+ [DataMember]
+ public Guid? RegisterUserId {get;set;}
+ ///
+ /// 登记人
+ ///
+
+ [Display(Name="登记人")]
+ [Column("RegisterUserName")]
+ [DataMember]
+ public string RegisterUserName {get;set;}
+ ///
+ /// 登记日期
+ ///
+
+ [Display(Name="登记日期")]
+ [Column("RegisterDate")]
+ [DataMember]
+ public DateTime? RegisterDate {get;set;}
+ ///
+ /// 修改人员ID
+ ///
+
+ [Display(Name="修改人员ID")]
+ [Column("UpdateUserId")]
+ [DataMember]
+ public Guid? UpdateUserId {get;set;}
+ ///
+ /// 修改人员
+ ///
+
+ [Display(Name="修改人员")]
+ [Column("UpdateUserName")]
+ [DataMember]
+ public string UpdateUserName {get;set;}
+ ///
+ /// 修改日期
+ ///
+
+ [Display(Name="修改日期")]
+ [Column("UpdateDate")]
+ [DataMember]
+ public DateTime? UpdateDate {get;set;}
+ ///
+ /// 附房使用面积
+ ///
+
+ [Display(Name="附房使用面积")]
+ [Column("AttachedHouseUseArea")]
+ [DataMember]
+ public decimal? AttachedHouseUseArea {get;set;}
+ ///
+ /// 是否在重点规划控制区内
+ ///
+
+ [Display(Name="是否在重点规划控制区内")]
+ [Column("IsInTheKeyPlanControlAreas")]
+ [DataMember]
+ public int? IsInTheKeyPlanControlAreas {get;set;}
+ ///
+ /// 实际居住地
+ ///
+
+ [Display(Name="实际居住地")]
+ [Column("ActualSettlement")]
+ [DataMember]
+ public string ActualSettlement {get;set;}
+ ///
+ /// 业主(产权人)签字
+ ///
+
+ [Display(Name="业主(产权人)签字")]
+ [Column("PropertyRightPrsonSign")]
+ [DataMember]
+ public string PropertyRightPrsonSign {get;set;}
+ ///
+ /// 业主(产权人)签字时间
+ ///
+
+ [Display(Name="业主(产权人)签字时间")]
+ [Column("PropertyRightPrsonSignDate")]
+ [DataMember]
+ public DateTime? PropertyRightPrsonSignDate {get;set;}
+ ///
+ /// 发布到公开系统时间
+ ///
+
+ [Display(Name="发布到公开系统时间")]
+ [Column("ReleaseToOpenSysDate")]
+ [DataMember]
+ public DateTime? ReleaseToOpenSysDate {get;set;}
+ ///
+ /// 发布到公开系统人员ID
+ ///
+
+ [Display(Name="发布到公开系统人员ID")]
+ [Column("ReleaseToOpenSysUserId")]
+ [DataMember]
+ public Guid? ReleaseToOpenSysUserId {get;set;}
+ ///
+ /// 调查表附件
+ ///
+
+ [Display(Name="调查表附件")]
+ [Column("Files")]
+ [DataMember]
+ public string Files {get;set;}
+ ///
+ /// 危旧房区块ID关联ProjectsBlock表ID
+ ///
+
+ [Display(Name="危旧房区块ID关联ProjectsBlock表ID")]
+ [Column("WJF_BlockID")]
+ [DataMember]
+ public Guid? WJF_BlockID {get;set;}
+ ///
+ /// 危旧房区块名称
+ ///
+
+ [Display(Name="危旧房区块名称")]
+ [Column("WJF_Block")]
+ [DataMember]
+ public string WJF_Block {get;set;}
+ ///
+ /// 是否发布到公开系统
+ ///
+
+ [Display(Name="是否发布到公开系统")]
+ [Column("IsReleaseToOpenSys")]
+ [DataMember]
+ public bool IsReleaseToOpenSys {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Sfqy")]
+ [DataMember]
+ public int Sfqy {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("IsOpen")]
+ [DataMember]
+ public int IsOpen {get;set;}
+ ///
+ /// 被征收人证件号码类别
+ ///
+
+ [Display(Name="被征收人证件号码类别")]
+ [Column("CardLB")]
+ [DataMember]
+ public string CardLB {get;set;}
+ ///
+ /// 土地核定面积
+ ///
+
+ [Display(Name="土地核定面积")]
+ [Column("LandFinalArea")]
+ [DataMember]
+ public decimal? LandFinalArea {get;set;}
+ ///
+ /// 承租人证件类型
+ ///
+
+ [Display(Name="承租人证件类型")]
+ [Column("LesseeLB")]
+ [DataMember]
+ public string LesseeLB {get;set;}
+ ///
+ /// 阁楼面积
+ ///
+
+ [Display(Name="阁楼面积")]
+ [Column("AtticArea")]
+ [DataMember]
+ public decimal? AtticArea {get;set;}
+ ///
+ /// 附属用房面积
+ ///
+
+ [Display(Name="附属用房面积")]
+ [Column("AttachedArea")]
+ [DataMember]
+ public decimal? AttachedArea {get;set;}
+ ///
+ /// 红线内无证面积
+ ///
+
+ [Display(Name="红线内无证面积")]
+ [Column("RedLine_In")]
+ [DataMember]
+ public decimal? RedLine_In {get;set;}
+ ///
+ /// 红线外无证面积
+ ///
+
+ [Display(Name="红线外无证面积")]
+ [Column("RedLine_Out")]
+ [DataMember]
+ public decimal? RedLine_Out {get;set;}
+ ///
+ /// 住改非面积
+ ///
+
+ [Display(Name="住改非面积")]
+ [Column("NoHouseArea")]
+ [DataMember]
+ public decimal? NoHouseArea {get;set;}
+ ///
+ /// 营业执照号
+ ///
+
+ [Display(Name="营业执照号")]
+ [Column("BusinessCode")]
+ [DataMember]
+ public string BusinessCode {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Sfth")]
+ [DataMember]
+ public string Sfth {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Thbh")]
+ [DataMember]
+ public string Thbh {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("ThGuid")]
+ [DataMember]
+ public string ThGuid {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("SFTJ")]
+ [DataMember]
+ public int SFTJ {get;set;}
+ ///
+ /// 出租出借私房产权人
+ ///
+
+ [Display(Name="出租出借私房产权人")]
+ [Column("PropertyUser1")]
+ [DataMember]
+ public string PropertyUser1 {get;set;}
+ ///
+ /// 出租出借私房承租人
+ ///
+
+ [Display(Name="出租出借私房承租人")]
+ [Column("Lessee1")]
+ [DataMember]
+ public string Lessee1 {get;set;}
+ ///
+ /// 金额是否计算比例
+ ///
+
+ [Display(Name="金额是否计算比例")]
+ [Column("MoneyIfCalute")]
+ [DataMember]
+ public int MoneyIfCalute {get;set;}
+ ///
+ /// 储藏室
+ ///
+
+ [Display(Name="储藏室")]
+ [Column("StoreroomArea")]
+ [DataMember]
+ public decimal? StoreroomArea {get;set;}
+ ///
+ /// 地段
+ ///
+
+ [Display(Name="地段")]
+ [Column("Section")]
+ [DataMember]
+ public string Section {get;set;}
+ ///
+ /// 朝向
+ ///
+
+ [Display(Name="朝向")]
+ [Column("Orientation")]
+ [DataMember]
+ public string Orientation {get;set;}
+ ///
+ /// 房屋部位
+ ///
+
+ [Display(Name="房屋部位")]
+ [Column("HousePosition")]
+ [DataMember]
+ public string HousePosition {get;set;}
+ ///
+ /// 批次号
+ ///
+
+ [Display(Name="批次号")]
+ [Column("BatchNumber")]
+ [DataMember]
+ public string BatchNumber {get;set;}
+ ///
+ /// 分组ID
+ ///
+
+ [Display(Name="分组ID")]
+ [Column("GroupID")]
+ [DataMember]
+ public Guid? GroupID {get;set;}
+
+ }
+
+ /**
+ ///
+ /// 数据表实体类Map:InvestigateTable
+ ///
+ public class InvestigateTableMap : EntityTypeConfiguration
+ {
+ 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结束----------
+
+
\ No newline at end of file
diff --git a/Ewide.Nbzs.Entity/DataBase/InvestigateTable_Assessment.cs b/Ewide.Nbzs.Entity/DataBase/InvestigateTable_Assessment.cs
new file mode 100644
index 0000000..febfb25
--- /dev/null
+++ b/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
+ {
+ ///
+ /// 数据表实体类:InvestigateTable_Assessment
+ ///
+ [Table("InvestigateTable_Assessment")]
+ public partial class InvestigateTable_Assessment: BaseEntity {
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Key]
+ [Column("ID")]
+ [DataMember]
+ public Guid ID {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("ProjectId")]
+ [DataMember]
+ public Guid? ProjectId {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("ProjectName")]
+ [DataMember]
+ public string ProjectName {get;set;}
+ ///
+ /// 调查表ID
+ ///
+
+ [Display(Name="调查表ID")]
+ [Column("InvestigateTableID")]
+ [DataMember]
+ public Guid InvestigateTableID {get;set;}
+ ///
+ /// 评估金额
+ ///
+
+ [Display(Name="评估金额")]
+ [Column("HousingAssessmentValue")]
+ [DataMember]
+ public decimal? HousingAssessmentValue {get;set;}
+ ///
+ /// 装修评估金额小计
+ ///
+
+ [Display(Name="装修评估金额小计")]
+ [Column("DecorateAssessedValue")]
+ [DataMember]
+ public decimal? DecorateAssessedValue {get;set;}
+ ///
+ /// 附属物评估金额小计
+ ///
+
+ [Display(Name="附属物评估金额小计")]
+ [Column("AttachedAssessedValue")]
+ [DataMember]
+ public decimal? AttachedAssessedValue {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("countValue")]
+ [DataMember]
+ public decimal? countValue {get;set;}
+ ///
+ /// 评估人员
+ ///
+
+ [Display(Name="评估人员")]
+ [Column("EstimatorsUserId")]
+ [DataMember]
+ public Guid? EstimatorsUserId {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("AssessmentNo")]
+ [DataMember]
+ public string AssessmentNo {get;set;}
+ ///
+ /// 评估时间
+ ///
+
+ [Display(Name="评估时间")]
+ [Column("EstimatorsDate")]
+ [DataMember]
+ public DateTime? EstimatorsDate {get;set;}
+ ///
+ /// 是否最终
+ ///
+
+ [Display(Name="是否最终")]
+ [Column("IsFinal")]
+ [DataMember]
+ public int IsFinal {get;set;}
+ ///
+ /// 是否备案
+ ///
+
+ [Display(Name="是否备案")]
+ [Column("IsInRecord")]
+ [DataMember]
+ public int? IsInRecord {get;set;}
+ ///
+ /// 备案时间
+ ///
+
+ [Display(Name="备案时间")]
+ [Column("InRecordTime")]
+ [DataMember]
+ public DateTime? InRecordTime {get;set;}
+ ///
+ /// 备案人ID
+ ///
+
+ [Display(Name="备案人ID")]
+ [Column("InRecordUserId")]
+ [DataMember]
+ public Guid? InRecordUserId {get;set;}
+ ///
+ /// 备案人
+ ///
+
+ [Display(Name="备案人")]
+ [Column("InRecordUserName")]
+ [DataMember]
+ public string InRecordUserName {get;set;}
+ ///
+ /// 是否公开/是否公示
+ ///
+
+ [Display(Name="是否公开/是否公示")]
+ [Column("IsPublic")]
+ [DataMember]
+ public int? IsPublic {get;set;}
+ ///
+ /// 公开时间/公示时间
+ ///
+
+ [Display(Name="公开时间/公示时间")]
+ [Column("PublicTime")]
+ [DataMember]
+ public DateTime? PublicTime {get;set;}
+ ///
+ /// 公开人ID
+ ///
+
+ [Display(Name="公开人ID")]
+ [Column("PublicUserId")]
+ [DataMember]
+ public Guid? PublicUserId {get;set;}
+ ///
+ /// 公开人
+ ///
+
+ [Display(Name="公开人")]
+ [Column("PublicUserName")]
+ [DataMember]
+ public string PublicUserName {get;set;}
+ ///
+ /// 创建时间
+ ///
+
+ [Display(Name="创建时间")]
+ [Column("CreateTime")]
+ [DataMember]
+ public DateTime? CreateTime {get;set;}
+ ///
+ /// 创建人ID
+ ///
+
+ [Display(Name="创建人ID")]
+ [Column("CreateUserId")]
+ [DataMember]
+ public Guid? CreateUserId {get;set;}
+ ///
+ /// 创建人姓名
+ ///
+
+ [Display(Name="创建人姓名")]
+ [Column("CreateUserName")]
+ [DataMember]
+ public string CreateUserName {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("UpdateTime")]
+ [DataMember]
+ public DateTime? UpdateTime {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("UpdateUserId")]
+ [DataMember]
+ public Guid? UpdateUserId {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("UpdateUserName")]
+ [DataMember]
+ public string UpdateUserName {get;set;}
+ ///
+ /// 备注
+ ///
+
+ [Display(Name="备注")]
+ [Column("Remark")]
+ [DataMember]
+ public string Remark {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Files")]
+ [DataMember]
+ public string Files {get;set;}
+ ///
+ /// 被征收人
+ ///
+
+ [Display(Name="被征收人")]
+ [Column("Bzsr")]
+ [DataMember]
+ public string Bzsr {get;set;}
+ ///
+ /// 房屋坐落
+ ///
+
+ [Display(Name="房屋坐落")]
+ [Column("Fwzl")]
+ [DataMember]
+ public string Fwzl {get;set;}
+ ///
+ /// 建筑面积
+ ///
+
+ [Display(Name="建筑面积")]
+ [Column("Jzmj")]
+ [DataMember]
+ public string Jzmj {get;set;}
+ ///
+ /// 土地面积
+ ///
+
+ [Display(Name="土地面积")]
+ [Column("Tdmj")]
+ [DataMember]
+ public string Tdmj {get;set;}
+ ///
+ /// 阁楼补偿费
+ ///
+
+ [Display(Name="阁楼补偿费")]
+ [Column("AtticAssessedValue")]
+ [DataMember]
+ public decimal? AtticAssessedValue {get;set;}
+ ///
+ /// 超容积率土地补偿费
+ ///
+
+ [Display(Name="超容积率土地补偿费")]
+ [Column("ExceedLandMoney")]
+ [DataMember]
+ public decimal? ExceedLandMoney {get;set;}
+ ///
+ /// 超容积率土地
+ ///
+
+ [Display(Name="超容积率土地")]
+ [Column("ExceedLand")]
+ [DataMember]
+ public decimal? ExceedLand {get;set;}
+ ///
+ /// 编号
+ ///
+
+ [Display(Name="编号")]
+ [Column("No")]
+ [DataMember]
+ public string No {get;set;}
+ ///
+ /// 建筑面积
+ ///
+
+ [Display(Name="建筑面积")]
+ [Column("BuildingArea")]
+ [DataMember]
+ public decimal? BuildingArea {get;set;}
+ ///
+ /// 土地面积
+ ///
+
+ [Display(Name="土地面积")]
+ [Column("LandArea")]
+ [DataMember]
+ public decimal? LandArea {get;set;}
+ ///
+ /// 房屋部位
+ ///
+
+ [Display(Name="房屋部位")]
+ [Column("HousePosition")]
+ [DataMember]
+ public string HousePosition {get;set;}
+ ///
+ /// 价值时点
+ ///
+
+ [Display(Name="价值时点")]
+ [Column("MoneyPoint")]
+ [DataMember]
+ public DateTime? MoneyPoint {get;set;}
+ ///
+ /// 所在层(如果是连续层次1-3)
+ ///
+
+ [Display(Name="所在层(如果是连续层次1-3)")]
+ [Column("InLayer")]
+ [DataMember]
+ public string InLayer {get;set;}
+ ///
+ /// 总层数
+ ///
+
+ [Display(Name="总层数")]
+ [Column("AllLayer")]
+ [DataMember]
+ public decimal? AllLayer {get;set;}
+ ///
+ /// 是否顶层阁楼:0否,1是
+ ///
+
+ [Display(Name="是否顶层阁楼:0否,1是")]
+ [Column("IfHaveAttic")]
+ [DataMember]
+ public int? IfHaveAttic {get;set;}
+ ///
+ /// 朝向
+ ///
+
+ [Display(Name="朝向")]
+ [Column("Orientation")]
+ [DataMember]
+ public string Orientation {get;set;}
+ ///
+ /// 结构等级ID
+ ///
+
+ [Display(Name="结构等级ID")]
+ [Column("StructureID")]
+ [DataMember]
+ public string StructureID {get;set;}
+ ///
+ /// 结构等级
+ ///
+
+ [Display(Name="结构等级")]
+ [Column("StructureID_text")]
+ [DataMember]
+ public string StructureID_text {get;set;}
+ ///
+ /// 建造日期
+ ///
+
+ [Display(Name="建造日期")]
+ [Column("BuildYear")]
+ [DataMember]
+ public DateTime? BuildYear {get;set;}
+ ///
+ /// 建成年份
+ ///
+
+ [Display(Name="建成年份")]
+ [Column("CompletedYear")]
+ [DataMember]
+ public string CompletedYear {get;set;}
+ ///
+ /// 底层情况
+ ///
+
+ [Display(Name="底层情况")]
+ [Column("Underlying")]
+ [DataMember]
+ public string Underlying {get;set;}
+ ///
+ /// 地段
+ ///
+
+ [Display(Name="地段")]
+ [Column("Section")]
+ [DataMember]
+ public string Section {get;set;}
+ ///
+ /// 土地性质
+ ///
+
+ [Display(Name="土地性质")]
+ [Column("LandWay")]
+ [DataMember]
+ public string LandWay {get;set;}
+ ///
+ /// 独用天井使用面积
+ ///
+
+ [Display(Name="独用天井使用面积")]
+ [Column("CourtyardArea")]
+ [DataMember]
+ public decimal? CourtyardArea {get;set;}
+ ///
+ /// 独用晒台使用面积
+ ///
+
+ [Display(Name="独用晒台使用面积")]
+ [Column("ShaitaiArea")]
+ [DataMember]
+ public decimal? ShaitaiArea {get;set;}
+ ///
+ /// 围墙类别
+ ///
+
+ [Display(Name="围墙类别")]
+ [Column("WallType")]
+ [DataMember]
+ public string WallType {get;set;}
+ ///
+ /// 围墙面积
+ ///
+
+ [Display(Name="围墙面积")]
+ [Column("WallArea")]
+ [DataMember]
+ public decimal? WallArea {get;set;}
+ ///
+ /// 车房类别
+ ///
+
+ [Display(Name="车房类别")]
+ [Column("GarageType")]
+ [DataMember]
+ public string GarageType {get;set;}
+ ///
+ /// 车房房号
+ ///
+
+ [Display(Name="车房房号")]
+ [Column("GarageNo")]
+ [DataMember]
+ public string GarageNo {get;set;}
+ ///
+ /// 车房面积
+ ///
+
+ [Display(Name="车房面积")]
+ [Column("GarageArea")]
+ [DataMember]
+ public decimal? GarageArea {get;set;}
+ ///
+ /// 评估比准价
+ ///
+
+ [Display(Name="评估比准价")]
+ [Column("PG_UnitMoney")]
+ [DataMember]
+ public decimal? PG_UnitMoney {get;set;}
+ ///
+ /// 结构修正系数
+ ///
+
+ [Display(Name="结构修正系数")]
+ [Column("StructureRatio")]
+ [DataMember]
+ public decimal? StructureRatio {get;set;}
+ ///
+ /// 使用年限调整系数
+ ///
+
+ [Display(Name="使用年限调整系数")]
+ [Column("YearRatio")]
+ [DataMember]
+ public decimal? YearRatio {get;set;}
+ ///
+ /// 朝向差价率
+ ///
+
+ [Display(Name="朝向差价率")]
+ [Column("OrientationRatio")]
+ [DataMember]
+ public decimal? OrientationRatio {get;set;}
+ ///
+ /// 层次差价率
+ ///
+
+ [Display(Name="层次差价率")]
+ [Column("LayerRatio")]
+ [DataMember]
+ public decimal? LayerRatio {get;set;}
+ ///
+ /// 层高修正系数
+ ///
+
+ [Display(Name="层高修正系数")]
+ [Column("LayerHighRatio")]
+ [DataMember]
+ public decimal? LayerHighRatio {get;set;}
+ ///
+ /// 容积率修正系数
+ ///
+
+ [Display(Name="容积率修正系数")]
+ [Column("VolumeRatio")]
+ [DataMember]
+ public decimal? VolumeRatio {get;set;}
+ ///
+ /// 装修面积小计
+ ///
+
+ [Display(Name="装修面积小计")]
+ [Column("DecorateArea")]
+ [DataMember]
+ public decimal? DecorateArea {get;set;}
+ ///
+ /// 土地补偿金额
+ ///
+
+ [Display(Name="土地补偿金额")]
+ [Column("LandCompensationMoney")]
+ [DataMember]
+ public decimal? LandCompensationMoney {get;set;}
+ ///
+ /// 土地出让金
+ ///
+
+ [Display(Name="土地出让金")]
+ [Column("LandTransferMoney")]
+ [DataMember]
+ public decimal? LandTransferMoney {get;set;}
+ ///
+ /// 备注
+ ///
+
+ [Display(Name="备注")]
+ [Column("Note")]
+ [DataMember]
+ public string Note {get;set;}
+ ///
+ /// 装修评估类型类型:0按面积装修评估 | 1分部分项装修
+ ///
+
+ [Display(Name="装修评估类型类型:0按面积装修评估 | 1分部分项装修")]
+ [Column("DecorationType")]
+ [DataMember]
+ public int DecorationType {get;set;}
+ ///
+ /// 附属物评估类型:0通用附属物评估 | 1其他附属物评估
+ ///
+
+ [Display(Name="附属物评估类型:0通用附属物评估 | 1其他附属物评估")]
+ [Column("AttachedType")]
+ [DataMember]
+ public int AttachedType {get;set;}
+ ///
+ /// 地价调整
+ ///
+
+ [Display(Name="地价调整")]
+ [Column("AdjustLandMoney")]
+ [DataMember]
+ public decimal? AdjustLandMoney {get;set;}
+ ///
+ /// 金额选择:0超容积率土地评估金额 | 1土地出让金 | 2地价调整
+ ///
+
+ [Display(Name="金额选择:0超容积率土地评估金额 | 1土地出让金 | 2地价调整")]
+ [Column("MoneyChoose")]
+ [DataMember]
+ public string MoneyChoose {get;set;}
+ ///
+ /// 评估方法:0-直接金额录入 1-普通报告录入 2-自定义报告录入
+ ///
+
+ [Display(Name="评估方法:0-直接金额录入 1-普通报告录入 2-自定义报告录入")]
+ [Column("ValuationMethod")]
+ [DataMember]
+ public int ValuationMethod {get;set;}
+ ///
+ /// 评估项目状态:0-未使用 1-初审 2-二审 3-终审 4-终审通过
+ ///
+
+ [Display(Name="评估项目状态:0-未使用 1-初审 2-二审 3-终审 4-终审通过")]
+ [Column("ValuationStatus")]
+ [DataMember]
+ public int ValuationStatus {get;set;}
+ ///
+ /// 通过终审后的打印次数
+ ///
+
+ [Display(Name="通过终审后的打印次数")]
+ [Column("PrintTimes")]
+ [DataMember]
+ public int? PrintTimes {get;set;}
+ ///
+ /// 底层无自行车房的普通住宅房屋层次差价率
+ ///
+
+ [Display(Name="底层无自行车房的普通住宅房屋层次差价率")]
+ [Column("NoData")]
+ [DataMember]
+ public string NoData {get;set;}
+ ///
+ /// 底层为自行车房的普通住宅房屋层次差价率
+ ///
+
+ [Display(Name="底层为自行车房的普通住宅房屋层次差价率")]
+ [Column("BicycleData")]
+ [DataMember]
+ public string BicycleData {get;set;}
+ ///
+ /// 住宅房屋朝向差价率
+ ///
+
+ [Display(Name="住宅房屋朝向差价率")]
+ [Column("OrientationRadioData")]
+ [DataMember]
+ public string OrientationRadioData {get;set;}
+ ///
+ /// 住宅房屋结构等级修正系数
+ ///
+
+ [Display(Name="住宅房屋结构等级修正系数")]
+ [Column("StructureData")]
+ [DataMember]
+ public string StructureData {get;set;}
+ ///
+ /// 主要附属物评估标准
+ ///
+
+ [Display(Name="主要附属物评估标准")]
+ [Column("AppendagesData")]
+ [DataMember]
+ public string AppendagesData {get;set;}
+ ///
+ /// 中高层住宅房屋层次差价率
+ ///
+
+ [Display(Name="中高层住宅房屋层次差价率")]
+ [Column("MiddleHighData")]
+ [DataMember]
+ public string MiddleHighData {get;set;}
+ ///
+ /// 房屋部位:0不显示;1显示
+ ///
+
+ [Display(Name="房屋部位:0不显示;1显示")]
+ [Column("HouseLocaion")]
+ [DataMember]
+ public int? HouseLocaion {get;set;}
+ ///
+ /// 评估自定义概况:0不显示;1显示
+ ///
+
+ [Display(Name="评估自定义概况:0不显示;1显示")]
+ [Column("Survey")]
+ [DataMember]
+ public int? Survey {get;set;}
+ ///
+ /// 主要附属物:0不显示;1显示
+ ///
+
+ [Display(Name="主要附属物:0不显示;1显示")]
+ [Column("ImportantFsw")]
+ [DataMember]
+ public int? ImportantFsw {get;set;}
+ ///
+ /// 附属物:0不显示;1显示
+ ///
+
+ [Display(Name="附属物:0不显示;1显示")]
+ [Column("Attached")]
+ [DataMember]
+ public int? Attached {get;set;}
+ ///
+ /// 未登记建筑评估:0不显示;1显示
+ ///
+
+ [Display(Name="未登记建筑评估:0不显示;1显示")]
+ [Column("Other")]
+ [DataMember]
+ public int? Other {get;set;}
+ ///
+ /// 其他因素修正系数
+ ///
+
+ [Display(Name="其他因素修正系数")]
+ [Column("OtherRatio")]
+ [DataMember]
+ public decimal? OtherRatio {get;set;}
+ ///
+ /// 补缴土地出让金
+ ///
+
+ [Display(Name="补缴土地出让金")]
+ [Column("PaymentLandTransferMoney")]
+ [DataMember]
+ public decimal? PaymentLandTransferMoney {get;set;}
+ ///
+ /// 是否落地房
+ ///
+
+ [Display(Name="是否落地房")]
+ [Column("IsLDF")]
+ [DataMember]
+ public string IsLDF {get;set;}
+ ///
+ /// 土地出让金计算公式
+ ///
+
+ [Display(Name="土地出让金计算公式")]
+ [Column("LandTransferMoneyFormula")]
+ [DataMember]
+ public string LandTransferMoneyFormula {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Carrymode")]
+ [DataMember]
+ public string Carrymode {get;set;}
+ ///
+ /// 分户评估附件
+ ///
+
+ [Display(Name="分户评估附件")]
+ [Column("AssementFile")]
+ [DataMember]
+ public string AssementFile {get;set;}
+
+ }
+
+ /**
+ ///
+ /// 数据表实体类Map:InvestigateTable_Assessment
+ ///
+ public class InvestigateTable_AssessmentMap : EntityTypeConfiguration
+ {
+ 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结束----------
+
+
\ No newline at end of file
diff --git a/Ewide.Nbzs.Entity/DataBase/NonInvestigateTable_Assessment.cs b/Ewide.Nbzs.Entity/DataBase/NonInvestigateTable_Assessment.cs
new file mode 100644
index 0000000..2877bbe
--- /dev/null
+++ b/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
+ {
+ ///
+ /// 数据表实体类:NonInvestigateTable_Assessment
+ ///
+ [Table("NonInvestigateTable_Assessment")]
+ public partial class NonInvestigateTable_Assessment: BaseEntity {
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Key]
+ [Column("ID")]
+ [DataMember]
+ public Guid ID {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("ProjectId")]
+ [DataMember]
+ public Guid? ProjectId {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("ProjectName")]
+ [DataMember]
+ public string ProjectName {get;set;}
+ ///
+ /// 非住宅调查表ID
+ ///
+
+ [Display(Name="非住宅调查表ID")]
+ [Column("NonInvestigateTableID")]
+ [DataMember]
+ public Guid NonInvestigateTableID {get;set;}
+ ///
+ /// 房屋评估价值
+ ///
+
+ [Display(Name="房屋评估价值")]
+ [Column("HousingAssessmentValue")]
+ [DataMember]
+ public decimal? HousingAssessmentValue {get;set;}
+ ///
+ /// 装修评估价值
+ ///
+
+ [Display(Name="装修评估价值")]
+ [Column("DecorateAssessedValue")]
+ [DataMember]
+ public decimal? DecorateAssessedValue {get;set;}
+ ///
+ /// 附属物评估价值
+ ///
+
+ [Display(Name="附属物评估价值")]
+ [Column("AttachedAssessedValue")]
+ [DataMember]
+ public decimal? AttachedAssessedValue {get;set;}
+ ///
+ /// 总价
+ ///
+
+ [Display(Name="总价")]
+ [Column("countValue")]
+ [DataMember]
+ public decimal? countValue {get;set;}
+ ///
+ /// 评估人员
+ ///
+
+ [Display(Name="评估人员")]
+ [Column("EstimatorsUserId")]
+ [DataMember]
+ public Guid? EstimatorsUserId {get;set;}
+ ///
+ /// 评估报告编号
+ ///
+
+ [Display(Name="评估报告编号")]
+ [Column("AssessmentNo")]
+ [DataMember]
+ public string AssessmentNo {get;set;}
+ ///
+ /// 评估时间
+ ///
+
+ [Display(Name="评估时间")]
+ [Column("EstimatorsDate")]
+ [DataMember]
+ public DateTime? EstimatorsDate {get;set;}
+ ///
+ /// 是否最终
+ ///
+
+ [Display(Name="是否最终")]
+ [Column("IsFinal")]
+ [DataMember]
+ public int IsFinal {get;set;}
+ ///
+ /// 是否备案
+ ///
+
+ [Display(Name="是否备案")]
+ [Column("IsInRecord")]
+ [DataMember]
+ public int? IsInRecord {get;set;}
+ ///
+ /// 备案时间
+ ///
+
+ [Display(Name="备案时间")]
+ [Column("InRecordTime")]
+ [DataMember]
+ public DateTime? InRecordTime {get;set;}
+ ///
+ /// 备案人ID
+ ///
+
+ [Display(Name="备案人ID")]
+ [Column("InRecordUserId")]
+ [DataMember]
+ public Guid? InRecordUserId {get;set;}
+ ///
+ /// 备案人
+ ///
+
+ [Display(Name="备案人")]
+ [Column("InRecordUserName")]
+ [DataMember]
+ public string InRecordUserName {get;set;}
+ ///
+ /// 是否公开,是否公示
+ ///
+
+ [Display(Name="是否公开,是否公示")]
+ [Column("IsPublic")]
+ [DataMember]
+ public int? IsPublic {get;set;}
+ ///
+ /// 公开时间,公示时间
+ ///
+
+ [Display(Name="公开时间,公示时间")]
+ [Column("PublicTime")]
+ [DataMember]
+ public DateTime? PublicTime {get;set;}
+ ///
+ /// 公开人ID
+ ///
+
+ [Display(Name="公开人ID")]
+ [Column("PublicUserId")]
+ [DataMember]
+ public Guid? PublicUserId {get;set;}
+ ///
+ /// 公开人
+ ///
+
+ [Display(Name="公开人")]
+ [Column("PublicUserName")]
+ [DataMember]
+ public string PublicUserName {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("CreateTime")]
+ [DataMember]
+ public DateTime? CreateTime {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("CreateUserId")]
+ [DataMember]
+ public Guid? CreateUserId {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("CreateUserName")]
+ [DataMember]
+ public string CreateUserName {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("UpdateTime")]
+ [DataMember]
+ public DateTime? UpdateTime {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("UpdateUserId")]
+ [DataMember]
+ public Guid? UpdateUserId {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("UpdateUserName")]
+ [DataMember]
+ public string UpdateUserName {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Remark")]
+ [DataMember]
+ public string Remark {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Files")]
+ [DataMember]
+ public string Files {get;set;}
+ ///
+ /// 房屋类型名字
+ ///
+
+ [Display(Name="房屋类型名字")]
+ [Column("HousingTypeName")]
+ [DataMember]
+ public string HousingTypeName {get;set;}
+ ///
+ /// 房屋类型价值
+ ///
+
+ [Display(Name="房屋类型价值")]
+ [Column("HousingTypeValue")]
+ [DataMember]
+ public string HousingTypeValue {get;set;}
+ ///
+ /// 超容积率土地补偿费
+ ///
+
+ [Display(Name="超容积率土地补偿费")]
+ [Column("ExceedLandMoney")]
+ [DataMember]
+ public decimal? ExceedLandMoney {get;set;}
+ ///
+ /// 超容积率土地
+ ///
+
+ [Display(Name="超容积率土地")]
+ [Column("ExceedLand")]
+ [DataMember]
+ public decimal? ExceedLand {get;set;}
+ ///
+ /// 评估方法:0-直接金额录入 1-普通报告录入
+ ///
+
+ [Display(Name="评估方法:0-直接金额录入 1-普通报告录入")]
+ [Column("ValuationMethod")]
+ [DataMember]
+ public int ValuationMethod {get;set;}
+ ///
+ /// 评估项目状态:0-未使用 1-初审 2-二审 3-终审
+ ///
+
+ [Display(Name="评估项目状态:0-未使用 1-初审 2-二审 3-终审")]
+ [Column("ValuationStatus")]
+ [DataMember]
+ public int ValuationStatus {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("PgPrice")]
+ [DataMember]
+ public decimal? PgPrice {get;set;}
+ ///
+ /// 分户评估附件
+ ///
+
+ [Display(Name="分户评估附件")]
+ [Column("AssementFile")]
+ [DataMember]
+ public string AssementFile {get;set;}
+
+ }
+
+ /**
+ ///
+ /// 数据表实体类Map:NonInvestigateTable_Assessment
+ ///
+ public class NonInvestigateTable_AssessmentMap : EntityTypeConfiguration
+ {
+ 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结束----------
+
+
\ No newline at end of file
diff --git a/Ewide.Nbzs.Entity/DataBase/NonResidentialAgreement.cs b/Ewide.Nbzs.Entity/DataBase/NonResidentialAgreement.cs
new file mode 100644
index 0000000..4bfd15d
--- /dev/null
+++ b/Ewide.Nbzs.Entity/DataBase/NonResidentialAgreement.cs
@@ -0,0 +1,2061 @@
+ //----------NonResidentialAgreement开始----------
+
+ 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
+ {
+ ///
+ /// 数据表实体类:NonResidentialAgreement
+ ///
+ [Table("NonResidentialAgreement")]
+ public partial class NonResidentialAgreement: BaseEntity {
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Key]
+ [Column("ID")]
+ [DataMember]
+ public Guid ID {get;set;}
+ ///
+ /// 项目id 关联Projects表ID
+ ///
+
+ [Display(Name="项目id 关联Projects表ID")]
+ [Column("ProjectID")]
+ [DataMember]
+ public Guid ProjectID {get;set;}
+ ///
+ /// 项目名称
+ ///
+
+ [Display(Name="项目名称")]
+ [Column("ProjectName")]
+ [DataMember]
+ public string ProjectName {get;set;}
+ ///
+ /// 非住宅调查表ID
+ ///
+
+ [Display(Name="非住宅调查表ID")]
+ [Column("NonInvestigateTableID")]
+ [DataMember]
+ public Guid? NonInvestigateTableID {get;set;}
+ ///
+ /// 征收决定号前置标识ID 取字典表ID
+ ///
+
+ [Display(Name="征收决定号前置标识ID 取字典表ID")]
+ [Column("CollectDecisionNoHeadID")]
+ [DataMember]
+ public Guid? CollectDecisionNoHeadID {get;set;}
+ ///
+ /// 征收决定号前置标识
+ ///
+
+ [Display(Name="征收决定号前置标识")]
+ [Column("CollectDecisionNoHeadName")]
+ [DataMember]
+ public string CollectDecisionNoHeadName {get;set;}
+ ///
+ /// 协议编号第一部分
+ ///
+
+ [Display(Name="协议编号第一部分")]
+ [Column("No1")]
+ [DataMember]
+ public string No1 {get;set;}
+ ///
+ /// 协议编号第二部分
+ ///
+
+ [Display(Name="协议编号第二部分")]
+ [Column("No2")]
+ [DataMember]
+ public string No2 {get;set;}
+ ///
+ /// 协议编号第三部分
+ ///
+
+ [Display(Name="协议编号第三部分")]
+ [Column("No3")]
+ [DataMember]
+ public string No3 {get;set;}
+ ///
+ /// 协议中文件依据,按照XX等有关规定
+ ///
+
+ [Display(Name="协议中文件依据,按照XX等有关规定")]
+ [Column("FilesBasis")]
+ [DataMember]
+ public string FilesBasis {get;set;}
+ ///
+ /// 征收决定号
+ ///
+
+ [Display(Name="征收决定号")]
+ [Column("CollectDecisionNo")]
+ [DataMember]
+ public string CollectDecisionNo {get;set;}
+ ///
+ /// 被征收人姓名
+ ///
+
+ [Display(Name="被征收人姓名")]
+ [Column("ExpropriatedName")]
+ [DataMember]
+ public string ExpropriatedName {get;set;}
+ ///
+ /// 被征收人身份证或组织机构代码证
+ ///
+
+ [Display(Name="被征收人身份证或组织机构代码证")]
+ [Column("ExpropriatedCardNo")]
+ [DataMember]
+ public string ExpropriatedCardNo {get;set;}
+ ///
+ /// 被拆迁人电话
+ ///
+
+ [Display(Name="被拆迁人电话")]
+ [Column("ExpropriatedPhone")]
+ [DataMember]
+ public string ExpropriatedPhone {get;set;}
+ ///
+ /// 被拆迁人地址
+ ///
+
+ [Display(Name="被拆迁人地址")]
+ [Column("ExpropriatedAddr")]
+ [DataMember]
+ public string ExpropriatedAddr {get;set;}
+ ///
+ /// 被征收人性质ID 关联数据字典表ID
+ ///
+
+ [Display(Name="被征收人性质ID 关联数据字典表ID")]
+ [Column("ExpropriatedNatureID")]
+ [DataMember]
+ public Guid? ExpropriatedNatureID {get;set;}
+ ///
+ /// 被征收人性质
+ ///
+
+ [Display(Name="被征收人性质")]
+ [Column("ExpropriatedNature")]
+ [DataMember]
+ public string ExpropriatedNature {get;set;}
+ ///
+ /// 区域ID 关联字典表ID
+ ///
+
+ [Display(Name="区域ID 关联字典表ID ")]
+ [Column("AreaID")]
+ [DataMember]
+ public Guid? AreaID {get;set;}
+ ///
+ /// 区域
+ ///
+
+ [Display(Name="区域")]
+ [Column("Area")]
+ [DataMember]
+ public string Area {get;set;}
+ ///
+ /// 被征收房屋地址
+ ///
+
+ [Display(Name="被征收房屋地址")]
+ [Column("HouseAddress")]
+ [DataMember]
+ public string HouseAddress {get;set;}
+ ///
+ /// 地段等级ID 字典表ID
+ ///
+
+ [Display(Name="地段等级ID 字典表ID")]
+ [Column("LocationLevelID")]
+ [DataMember]
+ public Guid? LocationLevelID {get;set;}
+ ///
+ /// 地段等级
+ ///
+
+ [Display(Name="地段等级")]
+ [Column("LocationLevel")]
+ [DataMember]
+ public string LocationLevel {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("LandAchieveWay")]
+ [DataMember]
+ public string LandAchieveWay {get;set;}
+ ///
+ /// 结构ID 字典表ID
+ ///
+
+ [Display(Name="结构ID 字典表ID")]
+ [Column("StructureID")]
+ [DataMember]
+ public Guid? StructureID {get;set;}
+ ///
+ /// 结构
+ ///
+
+ [Display(Name="结构")]
+ [Column("Structure")]
+ [DataMember]
+ public string Structure {get;set;}
+ ///
+ /// 建筑面积
+ ///
+
+ [Display(Name="建筑面积")]
+ [Column("BuildingArea")]
+ [DataMember]
+ public decimal? BuildingArea {get;set;}
+ ///
+ /// 建筑面积中商业面积
+ ///
+
+ [Display(Name="建筑面积中商业面积")]
+ [Column("BusinessArea")]
+ [DataMember]
+ public decimal? BusinessArea {get;set;}
+ ///
+ /// 建筑面积中办公用房面积
+ ///
+
+ [Display(Name="建筑面积中办公用房面积")]
+ [Column("OfficeArea")]
+ [DataMember]
+ public decimal? OfficeArea {get;set;}
+ ///
+ /// 建筑面积中办公用房面积
+ ///
+
+ [Display(Name="建筑面积中办公用房面积")]
+ [Column("CKArea")]
+ [DataMember]
+ public decimal? CKArea {get;set;}
+ ///
+ /// 建筑面积中工业用房
+ ///
+
+ [Display(Name="建筑面积中工业用房")]
+ [Column("IndustrialArea")]
+ [DataMember]
+ public decimal? IndustrialArea {get;set;}
+ ///
+ /// 建筑面积中仓储用房
+ ///
+
+ [Display(Name="建筑面积中仓储用房")]
+ [Column("StorageArea")]
+ [DataMember]
+ public decimal? StorageArea {get;set;}
+ ///
+ /// 土地面积
+ ///
+
+ [Display(Name="土地面积")]
+ [Column("LandArea")]
+ [DataMember]
+ public decimal? LandArea {get;set;}
+ ///
+ /// 使用情况ID 关联字典表ID
+ ///
+
+ [Display(Name="使用情况ID 关联字典表ID")]
+ [Column("UsageID")]
+ [DataMember]
+ public Guid? UsageID {get;set;}
+ ///
+ /// 使用情况、使用状况
+ ///
+
+ [Display(Name="使用情况、使用状况")]
+ [Column("Usage")]
+ [DataMember]
+ public string Usage {get;set;}
+ ///
+ /// 户籍人口数量
+ ///
+
+ [Display(Name="户籍人口数量")]
+ [Column("Population")]
+ [DataMember]
+ public int? Population {get;set;}
+ ///
+ /// 是否成套房
+ ///
+
+ [Display(Name="是否成套房")]
+ [Column("IsSuite")]
+ [DataMember]
+ public bool IsSuite {get;set;}
+ ///
+ /// 产权人
+ ///
+
+ [Display(Name="产权人")]
+ [Column("PropertyRightPrson")]
+ [DataMember]
+ public string PropertyRightPrson {get;set;}
+ ///
+ /// 承租人
+ ///
+
+ [Display(Name="承租人")]
+ [Column("Lessee")]
+ [DataMember]
+ public string Lessee {get;set;}
+ ///
+ /// 承租人营业执照号(或身份证号)
+ ///
+
+ [Display(Name="承租人营业执照号(或身份证号)")]
+ [Column("LesseeCardNo")]
+ [DataMember]
+ public string LesseeCardNo {get;set;}
+ ///
+ /// 使用人口
+ ///
+
+ [Display(Name="使用人口")]
+ [Column("UsePopulation")]
+ [DataMember]
+ public int? UsePopulation {get;set;}
+ ///
+ /// 评估金额
+ ///
+
+ [Display(Name="评估金额")]
+ [Column("AssessMoney")]
+ [DataMember]
+ public decimal? AssessMoney {get;set;}
+ ///
+ /// 评估金额_大写
+ ///
+
+ [Display(Name="评估金额_大写")]
+ [Column("AssessMoney_DX")]
+ [DataMember]
+ public string AssessMoney_DX {get;set;}
+ ///
+ /// 评估金额中商业用房
+ ///
+
+ [Display(Name="评估金额中商业用房")]
+ [Column("AssessBusinessMoney")]
+ [DataMember]
+ public decimal? AssessBusinessMoney {get;set;}
+ ///
+ /// 评估金额中办公用房
+ ///
+
+ [Display(Name="评估金额中办公用房 ")]
+ [Column("AssessOfficeMoney")]
+ [DataMember]
+ public decimal? AssessOfficeMoney {get;set;}
+ ///
+ /// 评估金额中工业用房
+ ///
+
+ [Display(Name="评估金额中工业用房")]
+ [Column("AssessIndustrialMoney")]
+ [DataMember]
+ public decimal? AssessIndustrialMoney {get;set;}
+ ///
+ /// 评估金额中仓储用房
+ ///
+
+ [Display(Name="评估金额中仓储用房")]
+ [Column("AssessStorageMoney")]
+ [DataMember]
+ public decimal? AssessStorageMoney {get;set;}
+ ///
+ /// 乙方可得被征收房屋评估金额的60%,计多少元
+ ///
+
+ [Display(Name="乙方可得被征收房屋评估金额的60%,计多少元")]
+ [Column("PartyBCanGetMoney")]
+ [DataMember]
+ public decimal? PartyBCanGetMoney {get;set;}
+ ///
+ /// 丙方可得被征收房屋评估金额的60%,计多少元
+ ///
+
+ [Display(Name="丙方可得被征收房屋评估金额的60%,计多少元")]
+ [Column("PartyCCanGetMoney")]
+ [DataMember]
+ public decimal? PartyCCanGetMoney {get;set;}
+ ///
+ /// 停业停产损失费
+ ///
+
+ [Display(Name="停业停产损失费")]
+ [Column("ClosedProductionLossesFee")]
+ [DataMember]
+ public decimal? ClosedProductionLossesFee {get;set;}
+ ///
+ /// 重大设施搬迁损失费
+ ///
+
+ [Display(Name="重大设施搬迁损失费")]
+ [Column("MajorFacilitiesMovementLossesFee")]
+ [DataMember]
+ public decimal? MajorFacilitiesMovementLossesFee {get;set;}
+ ///
+ /// 合计应发补偿金额
+ ///
+
+ [Display(Name="合计应发补偿金额")]
+ [Column("SummationShouldCompensateMoney")]
+ [DataMember]
+ public decimal? SummationShouldCompensateMoney {get;set;}
+ ///
+ /// 合计应发补偿金额大写
+ ///
+
+ [Display(Name="合计应发补偿金额大写")]
+ [Column("SummationShouldCompensateMoney_DX")]
+ [DataMember]
+ public string SummationShouldCompensateMoney_DX {get;set;}
+ ///
+ /// 应核减房改购房资金
+ ///
+
+ [Display(Name="应核减房改购房资金")]
+ [Column("HouseReformMoney")]
+ [DataMember]
+ public decimal? HouseReformMoney {get;set;}
+ ///
+ /// 核减后征收补偿资金
+ ///
+
+ [Display(Name="核减后征收补偿资金")]
+ [Column("SubtractCompensation")]
+ [DataMember]
+ public decimal? SubtractCompensation {get;set;}
+ ///
+ /// 核减后征收补偿资金大写
+ ///
+
+ [Display(Name="核减后征收补偿资金大写")]
+ [Column("SubtractCompensation_DX")]
+ [DataMember]
+ public string SubtractCompensation_DX {get;set;}
+ ///
+ /// 成套补贴费
+ ///
+
+ [Display(Name="成套补贴费")]
+ [Column("SetSubsidy")]
+ [DataMember]
+ public decimal? SetSubsidy {get;set;}
+ ///
+ /// 提前搬迁奖励金额
+ ///
+
+ [Display(Name="提前搬迁奖励金额")]
+ [Column("AheadRelocatedRewardMoney")]
+ [DataMember]
+ public decimal? AheadRelocatedRewardMoney {get;set;}
+ ///
+ /// 临时安置补助费
+ ///
+
+ [Display(Name="临时安置补助费")]
+ [Column("TemporaryAllocationFee")]
+ [DataMember]
+ public decimal? TemporaryAllocationFee {get;set;}
+ ///
+ /// 其他事项约定
+ ///
+
+ [Display(Name="其他事项约定")]
+ [Column("OtherPromise")]
+ [DataMember]
+ public string OtherPromise {get;set;}
+ ///
+ /// 备注
+ ///
+
+ [Display(Name="备注")]
+ [Column("Memo")]
+ [DataMember]
+ public string Memo {get;set;}
+ ///
+ /// 合计征收补偿资金
+ ///
+
+ [Display(Name="合计征收补偿资金")]
+ [Column("TotalCompensateMoney")]
+ [DataMember]
+ public decimal? TotalCompensateMoney {get;set;}
+ ///
+ /// 合计征收补偿资金大写
+ ///
+
+ [Display(Name="合计征收补偿资金大写")]
+ [Column("TotalCompensateMoney_DX")]
+ [DataMember]
+ public string TotalCompensateMoney_DX {get;set;}
+ ///
+ /// 征收补偿资金在协议生效几日支付
+ ///
+
+ [Display(Name="征收补偿资金在协议生效几日支付")]
+ [Column("ZSBCZJZXYSXJRZF")]
+ [DataMember]
+ public int? ZSBCZJZXYSXJRZF {get;set;}
+ ///
+ /// 补偿资金余额
+ ///
+
+ [Display(Name="补偿资金余额")]
+ [Column("BCZJYE")]
+ [DataMember]
+ public decimal? BCZJYE {get;set;}
+ ///
+ /// 补偿资金余额在验收几日后支付
+ ///
+
+ [Display(Name="补偿资金余额在验收几日后支付")]
+ [Column("BCZJYEZYSJRHZF")]
+ [DataMember]
+ public int? BCZJYEZYSJRHZF {get;set;}
+ ///
+ /// 私租标志
+ ///
+
+ [Display(Name="私租标志")]
+ [Column("IsPrivateRent")]
+ [DataMember]
+ public bool IsPrivateRent {get;set;}
+ ///
+ /// 协议签订时间
+ ///
+
+ [Display(Name="协议签订时间")]
+ [Column("SignTime")]
+ [DataMember]
+ public DateTime? SignTime {get;set;}
+ ///
+ /// 拆迁人
+ ///
+
+ [Display(Name="拆迁人")]
+ [Column("DemolitionPerson")]
+ [DataMember]
+ public string DemolitionPerson {get;set;}
+ ///
+ /// 拆迁单位
+ ///
+
+ [Display(Name="拆迁单位")]
+ [Column("DemolitionUnit")]
+ [DataMember]
+ public string DemolitionUnit {get;set;}
+ ///
+ /// 经办人
+ ///
+
+ [Display(Name="经办人")]
+ [Column("Operator")]
+ [DataMember]
+ public string Operator {get;set;}
+ ///
+ /// 经办人电话
+ ///
+
+ [Display(Name="经办人电话")]
+ [Column("OperatorPhone")]
+ [DataMember]
+ public string OperatorPhone {get;set;}
+ ///
+ /// 产权单位
+ ///
+
+ [Display(Name="产权单位")]
+ [Column("PropertyRightsUnit")]
+ [DataMember]
+ public string PropertyRightsUnit {get;set;}
+ ///
+ /// 协议类型ID 关联字典表ID
+ ///
+
+ [Display(Name="协议类型ID 关联字典表ID")]
+ [Column("TypeID")]
+ [DataMember]
+ public Guid? TypeID {get;set;}
+ ///
+ /// 协议类型
+ ///
+
+ [Display(Name="协议类型")]
+ [Column("Type")]
+ [DataMember]
+ public string Type {get;set;}
+ ///
+ /// 是否备案
+ ///
+
+ [Display(Name="是否备案")]
+ [Column("IsInRecords")]
+ [DataMember]
+ public bool IsInRecords {get;set;}
+ ///
+ /// 备案人ID
+ ///
+
+ [Display(Name="备案人ID")]
+ [Column("InRecordPersonID")]
+ [DataMember]
+ public Guid? InRecordPersonID {get;set;}
+ ///
+ /// 备案人
+ ///
+
+ [Display(Name="备案人")]
+ [Column("InRecordPerson")]
+ [DataMember]
+ public string InRecordPerson {get;set;}
+ ///
+ /// 备案时间
+ ///
+
+ [Display(Name="备案时间")]
+ [Column("InRecordDate")]
+ [DataMember]
+ public DateTime? InRecordDate {get;set;}
+ ///
+ /// 房改意愿
+ ///
+
+ [Display(Name="房改意愿")]
+ [Column("IsHousingReform")]
+ [DataMember]
+ public bool IsHousingReform {get;set;}
+ ///
+ /// 补偿安置方式ID,调产方式ID 关联字典表ID
+ ///
+
+ [Display(Name="补偿安置方式ID,调产方式ID 关联字典表ID")]
+ [Column("SwitchProductionWayID")]
+ [DataMember]
+ public Guid? SwitchProductionWayID {get;set;}
+ ///
+ /// 补偿安置方式,调产方式
+ ///
+
+ [Display(Name="补偿安置方式,调产方式")]
+ [Column("SwitchProductionWay")]
+ [DataMember]
+ public string SwitchProductionWay {get;set;}
+ ///
+ /// 结合住房使用状况折算后补偿资金
+ ///
+
+ [Display(Name="结合住房使用状况折算后补偿资金")]
+ [Column("JHZFSYZKZSHBCZJ")]
+ [DataMember]
+ public decimal? JHZFSYZKZSHBCZJ {get;set;}
+ ///
+ /// 选择货币补偿增加补偿资金
+ ///
+
+ [Display(Name="选择货币补偿增加补偿资金")]
+ [Column("XZHBBCZJBCZJ")]
+ [DataMember]
+ public decimal? XZHBBCZJBCZJ {get;set;}
+ ///
+ /// 按住房困难标准增加补助资金
+ ///
+
+ [Display(Name="按住房困难标准增加补助资金")]
+ [Column("AZFKNBZZJBZZJ")]
+ [DataMember]
+ public decimal? AZFKNBZZJBZZJ {get;set;}
+ ///
+ /// 按补偿金额折算的产权调换面积
+ ///
+
+ [Display(Name="按补偿金额折算的产权调换面积")]
+ [Column("ABCJEZSDCQDHMJ")]
+ [DataMember]
+ public decimal? ABCJEZSDCQDHMJ {get;set;}
+ ///
+ /// 产权调换增加面积
+ ///
+
+ [Display(Name="产权调换增加面积")]
+ [Column("CQDHZJMJ")]
+ [DataMember]
+ public decimal? CQDHZJMJ {get;set;}
+ ///
+ /// 安置高层可增加公摊补助面积
+ ///
+
+ [Display(Name="安置高层可增加公摊补助面积")]
+ [Column("AZGCKZJGTBZMJ")]
+ [DataMember]
+ public decimal? AZGCKZJGTBZMJ {get;set;}
+ ///
+ /// 上靠增加面积
+ ///
+
+ [Display(Name="上靠增加面积")]
+ [Column("SKZJMJ")]
+ [DataMember]
+ public decimal? SKZJMJ {get;set;}
+ ///
+ /// 乙方产权调换房屋面积合计
+ ///
+
+ [Display(Name="乙方产权调换房屋面积合计")]
+ [Column("TotalAllocationArea")]
+ [DataMember]
+ public decimal? TotalAllocationArea {get;set;}
+ ///
+ /// 一次性搬迁补偿费
+ ///
+
+ [Display(Name="一次性搬迁补偿费")]
+ [Column("OneTimeRelocationCompensation")]
+ [DataMember]
+ public decimal? OneTimeRelocationCompensation {get;set;}
+ ///
+ /// 按困难补助标准计发补偿资金
+ ///
+
+ [Display(Name="按困难补助标准计发补偿资金")]
+ [Column("AKNBZBZJFBCZJ")]
+ [DataMember]
+ public decimal? AKNBZBZJFBCZJ {get;set;}
+ ///
+ /// 提前搬迁奖励比例
+ ///
+
+ [Display(Name="提前搬迁奖励比例")]
+ [Column("TQBQJLBL")]
+ [DataMember]
+ public decimal? TQBQJLBL {get;set;}
+ ///
+ /// 现房一次性临时安置费
+ ///
+
+ [Display(Name="现房一次性临时安置费")]
+ [Column("XFYCQLSAZF")]
+ [DataMember]
+ public decimal? XFYCQLSAZF {get;set;}
+ ///
+ /// 先行支付乙方征收补偿资金日数
+ ///
+
+ [Display(Name="先行支付乙方征收补偿资金日数")]
+ [Column("XYZFYFZSBCZJRS")]
+ [DataMember]
+ public int? XYZFYFZSBCZJRS {get;set;}
+ ///
+ /// 签订协议几日内先行支付乙方征收补偿资金
+ ///
+
+ [Display(Name="签订协议几日内先行支付乙方征收补偿资金")]
+ [Column("XYQDJRNXXZFYFZSBCZJ")]
+ [DataMember]
+ public decimal? XYQDJRNXXZFYFZSBCZJ {get;set;}
+ ///
+ /// 先行支付乙方征收补偿资金的余额
+ ///
+
+ [Display(Name="先行支付乙方征收补偿资金的余额")]
+ [Column("XXZFBCJEYE")]
+ [DataMember]
+ public decimal? XXZFBCJEYE {get;set;}
+ ///
+ /// 乙方保证搬迁日期
+ ///
+
+ [Display(Name="乙方保证搬迁日期")]
+ [Column("EnsureRelocateDate")]
+ [DataMember]
+ public DateTime? EnsureRelocateDate {get;set;}
+ ///
+ /// 公告规定的搬迁期限
+ ///
+
+ [Display(Name="公告规定的搬迁期限")]
+ [Column("GGGDDBQQX")]
+ [DataMember]
+ public string GGGDDBQQX {get;set;}
+ ///
+ /// 签约搬迁奖励在搬迁期限届满后几日支付
+ ///
+
+ [Display(Name="签约搬迁奖励在搬迁期限届满后几日支付")]
+ [Column("QYBQJLZBQQXJMHJRZF")]
+ [DataMember]
+ public int? QYBQJLZBQQXJMHJRZF {get;set;}
+ ///
+ /// 协议生效签约比例
+ ///
+
+ [Display(Name="协议生效签约比例")]
+ [Column("XYSXQYBL")]
+ [DataMember]
+ public decimal? XYSXQYBL {get;set;}
+ ///
+ /// 住房困难补助资金
+ ///
+
+ [Display(Name="住房困难补助资金")]
+ [Column("ZFKNBZZJ")]
+ [DataMember]
+ public decimal? ZFKNBZZJ {get;set;}
+ ///
+ /// 低收入住房困难补偿金额
+ ///
+
+ [Display(Name="低收入住房困难补偿金额")]
+ [Column("DSRZFKNBCJE")]
+ [DataMember]
+ public decimal? DSRZFKNBCJE {get;set;}
+ ///
+ /// 签约搬迁奖励费
+ ///
+
+ [Display(Name="签约搬迁奖励费")]
+ [Column("QYBQJLF")]
+ [DataMember]
+ public decimal? QYBQJLF {get;set;}
+ ///
+ /// 安置房所在区ID 关联字典ID
+ ///
+
+ [Display(Name="安置房所在区ID 关联字典ID")]
+ [Column("AllocationHouseAreaID")]
+ [DataMember]
+ public Guid? AllocationHouseAreaID {get;set;}
+ ///
+ /// 安置房所在区
+ ///
+
+ [Display(Name="安置房所在区")]
+ [Column("AllocationHouseArea")]
+ [DataMember]
+ public string AllocationHouseArea {get;set;}
+ ///
+ /// 安置房坐落
+ ///
+
+ [Display(Name="安置房坐落")]
+ [Column("AllocationHouseAddr")]
+ [DataMember]
+ public string AllocationHouseAddr {get;set;}
+ ///
+ /// 安置房房屋类型ID 关联字典表ID
+ ///
+
+ [Display(Name="安置房房屋类型ID 关联字典表ID")]
+ [Column("AllocationHouseTypeID")]
+ [DataMember]
+ public Guid? AllocationHouseTypeID {get;set;}
+ ///
+ /// 安置房房屋类型
+ ///
+
+ [Display(Name="安置房房屋类型")]
+ [Column("AllocationHouseType")]
+ [DataMember]
+ public string AllocationHouseType {get;set;}
+ ///
+ /// 安置房建筑面积
+ ///
+
+ [Display(Name="安置房建筑面积")]
+ [Column("AllocationHouseBuildArea")]
+ [DataMember]
+ public decimal? AllocationHouseBuildArea {get;set;}
+ ///
+ /// 安置房提供日期
+ ///
+
+ [Display(Name="安置房提供日期")]
+ [Column("AllocationHouseProvideDate")]
+ [DataMember]
+ public DateTime? AllocationHouseProvideDate {get;set;}
+ ///
+ /// 安置房所在区ID 关联字典ID(适用于第二套安置房,现房+期房协议)
+ ///
+
+ [Display(Name="安置房所在区ID 关联字典ID(适用于第二套安置房,现房+期房协议)")]
+ [Column("AllocationHouseAreaID2")]
+ [DataMember]
+ public Guid? AllocationHouseAreaID2 {get;set;}
+ ///
+ /// 安置房所在区(适用于第二套安置房,现房+期房协议)
+ ///
+
+ [Display(Name="安置房所在区(适用于第二套安置房,现房+期房协议)")]
+ [Column("AllocationHouseArea2")]
+ [DataMember]
+ public string AllocationHouseArea2 {get;set;}
+ ///
+ /// 安置房坐落(适用于第二套安置房,现房+期房协议)
+ ///
+
+ [Display(Name="安置房坐落(适用于第二套安置房,现房+期房协议)")]
+ [Column("AllocationHouseAddr2")]
+ [DataMember]
+ public string AllocationHouseAddr2 {get;set;}
+ ///
+ /// 安置房房屋类型ID 关联字典表ID(适用于第二套安置房,现房+期房协议)
+ ///
+
+ [Display(Name="安置房房屋类型ID 关联字典表ID(适用于第二套安置房,现房+期房协议)")]
+ [Column("AllocationHouseTypeID2")]
+ [DataMember]
+ public Guid? AllocationHouseTypeID2 {get;set;}
+ ///
+ /// 安置房房屋类型(适用于第二套安置房,现房+期房协议)
+ ///
+
+ [Display(Name="安置房房屋类型(适用于第二套安置房,现房+期房协议)")]
+ [Column("AllocationHouseType2")]
+ [DataMember]
+ public string AllocationHouseType2 {get;set;}
+ ///
+ /// 安置房建筑面积(适用于第二套安置房,现房+期房协议)
+ ///
+
+ [Display(Name="安置房建筑面积(适用于第二套安置房,现房+期房协议)")]
+ [Column("AllocationHouseBuildArea2")]
+ [DataMember]
+ public decimal? AllocationHouseBuildArea2 {get;set;}
+ ///
+ /// 安置房提供日期(适用于第二套安置房,现房+期房协议)
+ ///
+
+ [Display(Name="安置房提供日期(适用于第二套安置房,现房+期房协议)")]
+ [Column("AllocationHouseProvideDate2")]
+ [DataMember]
+ public DateTime? AllocationHouseProvideDate2 {get;set;}
+ ///
+ /// 期房六月后临时安置费每月金额
+ ///
+
+ [Display(Name="期房六月后临时安置费每月金额")]
+ [Column("QFLYHLSAZFMYJE")]
+ [DataMember]
+ public decimal? QFLYHLSAZFMYJE {get;set;}
+ ///
+ /// 期房临时安置费协议生效几日先行支付
+ ///
+
+ [Display(Name="期房临时安置费协议生效几日先行支付")]
+ [Column("QFLSAZFXYSXJRXZZF")]
+ [DataMember]
+ public int? QFLSAZFXYSXJRXZZF {get;set;}
+ ///
+ /// 期房临时安置先行支付安置费用月数
+ ///
+
+ [Display(Name="期房临时安置先行支付安置费用月数")]
+ [Column("QFLSAZXXZFAZFYYS")]
+ [DataMember]
+ public decimal? QFLSAZXXZFAZFYYS {get;set;}
+ ///
+ /// 期房临时安置先行支付安置费用
+ ///
+
+ [Display(Name="期房临时安置先行支付安置费用")]
+ [Column("QFLSAZXXAZFY")]
+ [DataMember]
+ public decimal? QFLSAZXXAZFY {get;set;}
+ ///
+ /// 是否复核
+ ///
+
+ [Display(Name="是否复核")]
+ [Column("IsReCheck")]
+ [DataMember]
+ public bool IsReCheck {get;set;}
+ ///
+ /// 复核人员
+ ///
+
+ [Display(Name="复核人员")]
+ [Column("ReCheckPerson")]
+ [DataMember]
+ public string ReCheckPerson {get;set;}
+ ///
+ /// 复核日期
+ ///
+
+ [Display(Name="复核日期")]
+ [Column("ReCheckDate")]
+ [DataMember]
+ public DateTime? ReCheckDate {get;set;}
+ ///
+ /// 契税复核标志
+ ///
+
+ [Display(Name="契税复核标志")]
+ [Column("IsDeedTax")]
+ [DataMember]
+ public bool IsDeedTax {get;set;}
+ ///
+ /// 契税抵扣人员
+ ///
+
+ [Display(Name="契税抵扣人员")]
+ [Column("DeedTaxPerson")]
+ [DataMember]
+ public string DeedTaxPerson {get;set;}
+ ///
+ /// 契税抵扣日期
+ ///
+
+ [Display(Name="契税抵扣日期")]
+ [Column("DeedTaxDeductionDate")]
+ [DataMember]
+ public DateTime? DeedTaxDeductionDate {get;set;}
+ ///
+ /// 其他补偿
+ ///
+
+ [Display(Name="其他补偿")]
+ [Column("OtherCompensation")]
+ [DataMember]
+ public string OtherCompensation {get;set;}
+ ///
+ /// 税务人员备注说明
+ ///
+
+ [Display(Name="税务人员备注说明")]
+ [Column("TaxPersonRemark")]
+ [DataMember]
+ public string TaxPersonRemark {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("CreateTime")]
+ [DataMember]
+ public DateTime? CreateTime {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("CreateUserId")]
+ [DataMember]
+ public Guid? CreateUserId {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("CreateUserName")]
+ [DataMember]
+ public string CreateUserName {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("UpdateTime")]
+ [DataMember]
+ public DateTime? UpdateTime {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("UpdateUserId")]
+ [DataMember]
+ public Guid? UpdateUserId {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("UpdateUserName")]
+ [DataMember]
+ public string UpdateUserName {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Remark")]
+ [DataMember]
+ public string Remark {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Files")]
+ [DataMember]
+ public string Files {get;set;}
+ ///
+ /// 危旧房区块ID关联ProjectsBlock表ID
+ ///
+
+ [Display(Name="危旧房区块ID关联ProjectsBlock表ID")]
+ [Column("WJF_BlockID")]
+ [DataMember]
+ public Guid? WJF_BlockID {get;set;}
+ ///
+ /// 危旧房区块名称
+ ///
+
+ [Display(Name="危旧房区块名称")]
+ [Column("WJF_Block")]
+ [DataMember]
+ public string WJF_Block {get;set;}
+ ///
+ /// 乙方法定代表人
+ ///
+
+ [Display(Name="乙方法定代表人")]
+ [Column("PartyBLegalRepresentative")]
+ [DataMember]
+ public string PartyBLegalRepresentative {get;set;}
+ ///
+ /// 产权调换房屋系
+ ///
+
+ [Display(Name="产权调换房屋系")]
+ [Column("CQDHFWX")]
+ [DataMember]
+ public string CQDHFWX {get;set;}
+ ///
+ /// 产权调换有关房屋产权调换事项的约定
+ ///
+
+ [Display(Name="产权调换有关房屋产权调换事项的约定")]
+ [Column("CQDHYGFWCQDHSXDYD")]
+ [DataMember]
+ public string CQDHYGFWCQDHSXDYD {get;set;}
+ ///
+ /// 货币补偿增加补偿资金公式
+ ///
+
+ [Display(Name="货币补偿增加补偿资金公式")]
+ [Column("HBBCZJBCZJGS")]
+ [DataMember]
+ public string HBBCZJBCZJGS {get;set;}
+ ///
+ /// 一次性经济补偿公式
+ ///
+
+ [Display(Name="一次性经济补偿公式")]
+ [Column("YCXJJBCGS")]
+ [DataMember]
+ public string YCXJJBCGS {get;set;}
+ ///
+ /// 房屋征收部门ID(年度计划中读取,可变) 关联RelateUnits表ID
+ ///
+
+ [Display(Name="房屋征收部门ID(年度计划中读取,可变) 关联RelateUnits表ID")]
+ [Column("HouseAcquisitionDepartmentID")]
+ [DataMember]
+ public Guid? HouseAcquisitionDepartmentID {get;set;}
+ ///
+ /// 房屋征收部门(年度计划中读取,可变)
+ ///
+
+ [Display(Name="房屋征收部门(年度计划中读取,可变) ")]
+ [Column("HouseAcquisitionDepartment")]
+ [DataMember]
+ public string HouseAcquisitionDepartment {get;set;}
+ ///
+ /// 征收实施单位ID,多个以逗号分隔
+ ///
+
+ [Display(Name="征收实施单位ID,多个以逗号分隔")]
+ [Column("CollectImplUnit")]
+ [DataMember]
+ public string CollectImplUnit {get;set;}
+ ///
+ /// 征收实施单位名称,多个以逗号分隔
+ ///
+
+ [Display(Name="征收实施单位名称,多个以逗号分隔")]
+ [Column("CollectImplUnitName")]
+ [DataMember]
+ public string CollectImplUnitName {get;set;}
+ ///
+ /// 征收实施单位法人代码证号,多个以逗号分隔
+ ///
+
+ [Display(Name="征收实施单位法人代码证号,多个以逗号分隔")]
+ [Column("CollectImplUnitBusinessLicenseNo")]
+ [DataMember]
+ public string CollectImplUnitBusinessLicenseNo {get;set;}
+ ///
+ /// 丙方联系电话
+ ///
+
+ [Display(Name="丙方联系电话")]
+ [Column("BfPhone")]
+ [DataMember]
+ public string BfPhone {get;set;}
+ ///
+ /// 丙方联系地址
+ ///
+
+ [Display(Name="丙方联系地址")]
+ [Column("BfAdreess")]
+ [DataMember]
+ public string BfAdreess {get;set;}
+ ///
+ /// 丙方货币补偿补助
+ ///
+
+ [Display(Name="丙方货币补偿补助")]
+ [Column("BFHBBCBZ")]
+ [DataMember]
+ public decimal? BFHBBCBZ {get;set;}
+ ///
+ /// 丙方补偿资金
+ ///
+
+ [Display(Name="丙方补偿资金")]
+ [Column("BFHBBCZJ")]
+ [DataMember]
+ public decimal? BFHBBCZJ {get;set;}
+ ///
+ /// 丙方补偿资金余额
+ ///
+
+ [Display(Name="丙方补偿资金余额")]
+ [Column("BFHBBCZJYE")]
+ [DataMember]
+ public decimal? BFHBBCZJYE {get;set;}
+ ///
+ /// 征收部门电话
+ ///
+
+ [Display(Name="征收部门电话")]
+ [Column("ZSPhone")]
+ [DataMember]
+ public string ZSPhone {get;set;}
+ ///
+ /// 征收部门地址
+ ///
+
+ [Display(Name="征收部门地址")]
+ [Column("ZSAddress")]
+ [DataMember]
+ public string ZSAddress {get;set;}
+ ///
+ /// 征收实施单位电话
+ ///
+
+ [Display(Name="征收实施单位电话")]
+ [Column("ZSSSPhone")]
+ [DataMember]
+ public string ZSSSPhone {get;set;}
+ ///
+ /// 征收实施单位地址
+ ///
+
+ [Display(Name="征收实施单位地址")]
+ [Column("ZSSSAddress")]
+ [DataMember]
+ public string ZSSSAddress {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Gfbz")]
+ [DataMember]
+ public string Gfbz {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("AvailableAmount")]
+ [DataMember]
+ public decimal? AvailableAmount {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("DidNotPayMoney")]
+ [DataMember]
+ public decimal? DidNotPayMoney {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Sfyzx")]
+ [DataMember]
+ public string Sfyzx {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Iscancel")]
+ [DataMember]
+ public string Iscancel {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("ZDYBQRQ")]
+ [DataMember]
+ public string ZDYBQRQ {get;set;}
+ ///
+ /// 装修、附属物评估价值/若两者分离表示装修评估价值
+ ///
+
+ [Display(Name="装修、附属物评估价值/若两者分离表示装修评估价值")]
+ [Column("ZXFSPGValue")]
+ [DataMember]
+ public decimal? ZXFSPGValue {get;set;}
+ ///
+ /// 安置房属性
+ ///
+
+ [Display(Name="安置房属性")]
+ [Column("AZFSX")]
+ [DataMember]
+ public string AZFSX {get;set;}
+ ///
+ /// 签约搬迁奖励百分比
+ ///
+
+ [Display(Name="签约搬迁奖励百分比")]
+ [Column("QYBQBL")]
+ [DataMember]
+ public string QYBQBL {get;set;}
+ ///
+ /// 安置房工业土地评估价值
+ ///
+
+ [Display(Name="安置房工业土地评估价值")]
+ [Column("AZFValue")]
+ [DataMember]
+ public decimal? AZFValue {get;set;}
+ ///
+ /// 先行支付乙方征收补偿资金比例
+ ///
+
+ [Display(Name="先行支付乙方征收补偿资金比例")]
+ [Column("AdvanceBCBL")]
+ [DataMember]
+ public string AdvanceBCBL {get;set;}
+ ///
+ /// 临时安置费元/每月
+ ///
+
+ [Display(Name="临时安置费元/每月")]
+ [Column("GiveLSANZFValue")]
+ [DataMember]
+ public decimal? GiveLSANZFValue {get;set;}
+ ///
+ /// 临时安置费月数
+ ///
+
+ [Display(Name="临时安置费月数")]
+ [Column("GiveLSANZFMonth")]
+ [DataMember]
+ public int? GiveLSANZFMonth {get;set;}
+ ///
+ /// 房产证号
+ ///
+
+ [Display(Name="房产证号")]
+ [Column("PropertyRightCardNo")]
+ [DataMember]
+ public string PropertyRightCardNo {get;set;}
+ ///
+ /// 证载建筑面积
+ ///
+
+ [Display(Name="证载建筑面积")]
+ [Column("PropertyRightArea")]
+ [DataMember]
+ public decimal? PropertyRightArea {get;set;}
+ ///
+ /// 商业-证载建筑面积
+ ///
+
+ [Display(Name="商业-证载建筑面积")]
+ [Column("BusinessPropertyArea")]
+ [DataMember]
+ public decimal? BusinessPropertyArea {get;set;}
+ ///
+ /// 办公-证载建筑面积
+ ///
+
+ [Display(Name="办公-证载建筑面积")]
+ [Column("OfficePropertyArea")]
+ [DataMember]
+ public decimal? OfficePropertyArea {get;set;}
+ ///
+ /// 工业-证载建筑面积
+ ///
+
+ [Display(Name="工业-证载建筑面积")]
+ [Column("IndustrialPropertyArea")]
+ [DataMember]
+ public decimal? IndustrialPropertyArea {get;set;}
+ ///
+ /// 仓储-证载建筑面积
+ ///
+
+ [Display(Name="仓储-证载建筑面积")]
+ [Column("StoragePropertyArea")]
+ [DataMember]
+ public decimal? StoragePropertyArea {get;set;}
+ ///
+ /// 仓储-证载建筑面积
+ ///
+
+ [Display(Name="仓储-证载建筑面积")]
+ [Column("CKPropertyArea")]
+ [DataMember]
+ public decimal? CKPropertyArea {get;set;}
+ ///
+ /// 土地证号码
+ ///
+
+ [Display(Name="土地证号码")]
+ [Column("LandCardNo")]
+ [DataMember]
+ public string LandCardNo {get;set;}
+ ///
+ /// 土地核定面积
+ ///
+
+ [Display(Name="土地核定面积")]
+ [Column("LandFinalArea")]
+ [DataMember]
+ public decimal? LandFinalArea {get;set;}
+ ///
+ /// 证件类别
+ ///
+
+ [Display(Name="证件类别")]
+ [Column("CardLb")]
+ [DataMember]
+ public string CardLb {get;set;}
+ ///
+ /// 商业-核定土地面积
+ ///
+
+ [Display(Name="商业-核定土地面积")]
+ [Column("BusinessLandArea")]
+ [DataMember]
+ public decimal? BusinessLandArea {get;set;}
+ ///
+ /// 办公-核定土地面积
+ ///
+
+ [Display(Name="办公-核定土地面积")]
+ [Column("OfficeLandArea")]
+ [DataMember]
+ public decimal? OfficeLandArea {get;set;}
+ ///
+ /// 工业-核定土地面积
+ ///
+
+ [Display(Name="工业-核定土地面积")]
+ [Column("IndustrialLandArea")]
+ [DataMember]
+ public decimal? IndustrialLandArea {get;set;}
+ ///
+ /// 仓储-核定土地面积
+ ///
+
+ [Display(Name="仓储-核定土地面积")]
+ [Column("StorageLandArea")]
+ [DataMember]
+ public decimal? StorageLandArea {get;set;}
+ ///
+ /// 仓储-核定土地面积
+ ///
+
+ [Display(Name="仓储-核定土地面积")]
+ [Column("CKLandArea")]
+ [DataMember]
+ public decimal? CKLandArea {get;set;}
+ ///
+ /// 购房补助区外
+ ///
+
+ [Display(Name="购房补助区外")]
+ [Column("Gfbz_Out")]
+ [DataMember]
+ public string Gfbz_Out {get;set;}
+ ///
+ /// 是否市区
+ ///
+
+ [Display(Name="是否市区")]
+ [Column("IsCity")]
+ [DataMember]
+ public string IsCity {get;set;}
+ ///
+ /// 下级判断
+ ///
+
+ [Display(Name="下级判断")]
+ [Column("IsNext")]
+ [DataMember]
+ public string IsNext {get;set;}
+ ///
+ /// 购买区域
+ ///
+
+ [Display(Name="购买区域")]
+ [Column("BuyArea")]
+ [DataMember]
+ public string BuyArea {get;set;}
+ ///
+ /// 公告规定签约期限
+ ///
+
+ [Display(Name="公告规定签约期限")]
+ [Column("GGGDQYQX")]
+ [DataMember]
+ public string GGGDQYQX {get;set;}
+ ///
+ /// 法定代表人
+ ///
+
+ [Display(Name="法定代表人")]
+ [Column("TheLegalRepresentative")]
+ [DataMember]
+ public string TheLegalRepresentative {get;set;}
+ ///
+ /// 法定代表人联系电话
+ ///
+
+ [Display(Name="法定代表人联系电话")]
+ [Column("TheLegalRepresentativePhone")]
+ [DataMember]
+ public string TheLegalRepresentativePhone {get;set;}
+ ///
+ /// 产权性质
+ ///
+
+ [Display(Name="产权性质")]
+ [Column("NatureOfProperty")]
+ [DataMember]
+ public string NatureOfProperty {get;set;}
+ ///
+ /// 产权性质ID
+ ///
+
+ [Display(Name="产权性质ID")]
+ [Column("NatureOfPropertyID")]
+ [DataMember]
+ public Guid? NatureOfPropertyID {get;set;}
+ ///
+ /// 房屋用途
+ ///
+
+ [Display(Name="房屋用途")]
+ [Column("LandCardUse")]
+ [DataMember]
+ public string LandCardUse {get;set;}
+ ///
+ /// 商业-证载土地面积
+ ///
+
+ [Display(Name="商业-证载土地面积")]
+ [Column("BusinessPropertLandArea")]
+ [DataMember]
+ public decimal? BusinessPropertLandArea {get;set;}
+ ///
+ /// 办公-证载土地面积
+ ///
+
+ [Display(Name="办公-证载土地面积")]
+ [Column("OfficePropertLandArea")]
+ [DataMember]
+ public decimal? OfficePropertLandArea {get;set;}
+ ///
+ /// 工业-证载土地面积
+ ///
+
+ [Display(Name="工业-证载土地面积")]
+ [Column("IndustrialPropertLandArea")]
+ [DataMember]
+ public decimal? IndustrialPropertLandArea {get;set;}
+ ///
+ /// 仓储-证载土地面积
+ ///
+
+ [Display(Name="仓储-证载土地面积")]
+ [Column("StoragePropertLandArea")]
+ [DataMember]
+ public decimal? StoragePropertLandArea {get;set;}
+ ///
+ /// 仓储-证载土地面积
+ ///
+
+ [Display(Name="仓储-证载土地面积")]
+ [Column("CKPropertLandArea")]
+ [DataMember]
+ public decimal? CKPropertLandArea {get;set;}
+ ///
+ /// 签约搬迁奖励费 计算
+ ///
+
+ [Display(Name="签约搬迁奖励费 计算")]
+ [Column("QYBQJLCal")]
+ [DataMember]
+ public decimal? QYBQJLCal {get;set;}
+ ///
+ /// 承租人证件类型
+ ///
+
+ [Display(Name="承租人证件类型")]
+ [Column("LesseeLB")]
+ [DataMember]
+ public string LesseeLB {get;set;}
+ ///
+ /// 土地用途
+ ///
+
+ [Display(Name="土地用途")]
+ [Column("HouseUse")]
+ [DataMember]
+ public string HouseUse {get;set;}
+ ///
+ /// 红线内无证面积
+ ///
+
+ [Display(Name="红线内无证面积")]
+ [Column("RedLine_In")]
+ [DataMember]
+ public decimal? RedLine_In {get;set;}
+ ///
+ /// 红线外无证面积
+ ///
+
+ [Display(Name="红线外无证面积")]
+ [Column("RedLine_Out")]
+ [DataMember]
+ public decimal? RedLine_Out {get;set;}
+ ///
+ /// 房票价值
+ ///
+
+ [Display(Name="房票价值")]
+ [Column("HouseTicketMoney")]
+ [DataMember]
+ public decimal? HouseTicketMoney {get;set;}
+ ///
+ /// 非住宅协议打印历史记录
+ ///
+
+ [Display(Name="非住宅协议打印历史记录")]
+ [Column("XYLODOPText")]
+ [DataMember]
+ public string XYLODOPText {get;set;}
+ ///
+ /// 非住宅协议打印历史记录标志
+ ///
+
+ [Display(Name="非住宅协议打印历史记录标志")]
+ [Column("XYLODOP")]
+ [DataMember]
+ public bool XYLODOP {get;set;}
+ ///
+ /// 核算单打印历史记录
+ ///
+
+ [Display(Name="核算单打印历史记录")]
+ [Column("HSDLODOPText")]
+ [DataMember]
+ public string HSDLODOPText {get;set;}
+ ///
+ /// 核算单打印历史记录标志
+ ///
+
+ [Display(Name="核算单打印历史记录标志")]
+ [Column("HSDLODOP")]
+ [DataMember]
+ public bool HSDLODOP {get;set;}
+ ///
+ /// 超容积土地面积
+ ///
+
+ [Display(Name="超容积土地面积")]
+ [Column("ExceedLandArea")]
+ [DataMember]
+ public decimal? ExceedLandArea {get;set;}
+ ///
+ /// 注销证件天数
+ ///
+
+ [Display(Name="注销证件天数")]
+ [Column("PaperCancel")]
+ [DataMember]
+ public int? PaperCancel {get;set;}
+ ///
+ /// 再次支付金额
+ ///
+
+ [Display(Name="再次支付金额")]
+ [Column("SecondGiveMoney")]
+ [DataMember]
+ public decimal? SecondGiveMoney {get;set;}
+ ///
+ /// 先行支付丙方征收补偿资金比例
+ ///
+
+ [Display(Name="先行支付丙方征收补偿资金比例")]
+ [Column("BFAdvanceBCBL")]
+ [DataMember]
+ public string BFAdvanceBCBL {get;set;}
+ ///
+ /// 车库评估金额
+ ///
+
+ [Display(Name="车库评估金额")]
+ [Column("AssessCKMoney")]
+ [DataMember]
+ public decimal? AssessCKMoney {get;set;}
+ ///
+ /// 结算单张数
+ ///
+
+ [Display(Name="结算单张数")]
+ [Column("ClearingSheetNum")]
+ [DataMember]
+ public int? ClearingSheetNum {get;set;}
+ ///
+ /// 未新增结算单张数
+ ///
+
+ [Display(Name="未新增结算单张数")]
+ [Column("NoAddClearingSheetNum")]
+ [DataMember]
+ public int? NoAddClearingSheetNum {get;set;}
+ ///
+ /// 已新增未备案结算单张数
+ ///
+
+ [Display(Name="已新增未备案结算单张数")]
+ [Column("HaveAddClearingSheetNum")]
+ [DataMember]
+ public int? HaveAddClearingSheetNum {get;set;}
+ ///
+ /// 已备案结算单张数
+ ///
+
+ [Display(Name="已备案结算单张数")]
+ [Column("HaveRecordClearingSheetNum")]
+ [DataMember]
+ public int? HaveRecordClearingSheetNum {get;set;}
+ ///
+ /// 是否产权调换
+ ///
+
+ [Display(Name="是否产权调换")]
+ [Column("IfCQDH")]
+ [DataMember]
+ public bool IfCQDH {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Deductible")]
+ [DataMember]
+ public decimal Deductible {get;set;}
+ ///
+ /// 是否撤销备案中
+ ///
+
+ [Display(Name="是否撤销备案中")]
+ [Column("IsCancelRecord")]
+ [DataMember]
+ public bool IsCancelRecord {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("XyFile")]
+ [DataMember]
+ public string XyFile {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("IsxyFile")]
+ [DataMember]
+ public int? IsxyFile {get;set;}
+
+ }
+
+ /**
+ ///
+ /// 数据表实体类Map:NonResidentialAgreement
+ ///
+ public class NonResidentialAgreementMap : EntityTypeConfiguration
+ {
+ public NonResidentialAgreementMap()
+ {
+ this.ToTable("NonResidentialAgreement");
+ this.HasKey(t => t.ID);
+ this.Property(t => t.ProjectID).HasColumnName("ProjectID").IsRequired();
+ this.Property(t => t.ProjectName).HasColumnName("ProjectName").IsRequired();
+ this.Property(t => t.NonInvestigateTableID).HasColumnName("NonInvestigateTableID");
+ this.Property(t => t.CollectDecisionNoHeadID).HasColumnName("CollectDecisionNoHeadID");
+ this.Property(t => t.CollectDecisionNoHeadName).HasColumnName("CollectDecisionNoHeadName");
+ this.Property(t => t.No1).HasColumnName("No1");
+ this.Property(t => t.No2).HasColumnName("No2");
+ this.Property(t => t.No3).HasColumnName("No3");
+ this.Property(t => t.FilesBasis).HasColumnName("FilesBasis");
+ this.Property(t => t.CollectDecisionNo).HasColumnName("CollectDecisionNo");
+ this.Property(t => t.ExpropriatedName).HasColumnName("ExpropriatedName");
+ this.Property(t => t.ExpropriatedCardNo).HasColumnName("ExpropriatedCardNo");
+ this.Property(t => t.ExpropriatedPhone).HasColumnName("ExpropriatedPhone");
+ this.Property(t => t.ExpropriatedAddr).HasColumnName("ExpropriatedAddr");
+ this.Property(t => t.ExpropriatedNatureID).HasColumnName("ExpropriatedNatureID");
+ this.Property(t => t.ExpropriatedNature).HasColumnName("ExpropriatedNature");
+ this.Property(t => t.AreaID).HasColumnName("AreaID");
+ this.Property(t => t.Area).HasColumnName("Area");
+ this.Property(t => t.HouseAddress).HasColumnName("HouseAddress");
+ this.Property(t => t.LocationLevelID).HasColumnName("LocationLevelID");
+ this.Property(t => t.LocationLevel).HasColumnName("LocationLevel");
+ this.Property(t => t.LandAchieveWay).HasColumnName("LandAchieveWay");
+ this.Property(t => t.StructureID).HasColumnName("StructureID");
+ this.Property(t => t.Structure).HasColumnName("Structure");
+ this.Property(t => t.BuildingArea).HasColumnName("BuildingArea");
+ this.Property(t => t.BusinessArea).HasColumnName("BusinessArea");
+ this.Property(t => t.OfficeArea).HasColumnName("OfficeArea");
+ this.Property(t => t.CKArea).HasColumnName("CKArea");
+ this.Property(t => t.IndustrialArea).HasColumnName("IndustrialArea");
+ this.Property(t => t.StorageArea).HasColumnName("StorageArea");
+ this.Property(t => t.LandArea).HasColumnName("LandArea");
+ this.Property(t => t.UsageID).HasColumnName("UsageID");
+ this.Property(t => t.Usage).HasColumnName("Usage");
+ this.Property(t => t.Population).HasColumnName("Population");
+ this.Property(t => t.IsSuite).HasColumnName("IsSuite");
+ this.Property(t => t.PropertyRightPrson).HasColumnName("PropertyRightPrson");
+ this.Property(t => t.Lessee).HasColumnName("Lessee");
+ this.Property(t => t.LesseeCardNo).HasColumnName("LesseeCardNo");
+ this.Property(t => t.UsePopulation).HasColumnName("UsePopulation");
+ this.Property(t => t.AssessMoney).HasColumnName("AssessMoney");
+ this.Property(t => t.AssessMoney_DX).HasColumnName("AssessMoney_DX");
+ this.Property(t => t.AssessBusinessMoney).HasColumnName("AssessBusinessMoney");
+ this.Property(t => t.AssessOfficeMoney).HasColumnName("AssessOfficeMoney");
+ this.Property(t => t.AssessIndustrialMoney).HasColumnName("AssessIndustrialMoney");
+ this.Property(t => t.AssessStorageMoney).HasColumnName("AssessStorageMoney");
+ this.Property(t => t.PartyBCanGetMoney).HasColumnName("PartyBCanGetMoney");
+ this.Property(t => t.PartyCCanGetMoney).HasColumnName("PartyCCanGetMoney");
+ this.Property(t => t.ClosedProductionLossesFee).HasColumnName("ClosedProductionLossesFee");
+ this.Property(t => t.MajorFacilitiesMovementLossesFee).HasColumnName("MajorFacilitiesMovementLossesFee");
+ this.Property(t => t.SummationShouldCompensateMoney).HasColumnName("SummationShouldCompensateMoney");
+ this.Property(t => t.SummationShouldCompensateMoney_DX).HasColumnName("SummationShouldCompensateMoney_DX");
+ this.Property(t => t.HouseReformMoney).HasColumnName("HouseReformMoney");
+ this.Property(t => t.SubtractCompensation).HasColumnName("SubtractCompensation");
+ this.Property(t => t.SubtractCompensation_DX).HasColumnName("SubtractCompensation_DX");
+ this.Property(t => t.SetSubsidy).HasColumnName("SetSubsidy");
+ this.Property(t => t.AheadRelocatedRewardMoney).HasColumnName("AheadRelocatedRewardMoney");
+ this.Property(t => t.TemporaryAllocationFee).HasColumnName("TemporaryAllocationFee");
+ this.Property(t => t.OtherPromise).HasColumnName("OtherPromise");
+ this.Property(t => t.Memo).HasColumnName("Memo");
+ this.Property(t => t.TotalCompensateMoney).HasColumnName("TotalCompensateMoney");
+ this.Property(t => t.TotalCompensateMoney_DX).HasColumnName("TotalCompensateMoney_DX");
+ this.Property(t => t.ZSBCZJZXYSXJRZF).HasColumnName("ZSBCZJZXYSXJRZF");
+ this.Property(t => t.BCZJYE).HasColumnName("BCZJYE");
+ this.Property(t => t.BCZJYEZYSJRHZF).HasColumnName("BCZJYEZYSJRHZF");
+ this.Property(t => t.IsPrivateRent).HasColumnName("IsPrivateRent");
+ this.Property(t => t.SignTime).HasColumnName("SignTime");
+ this.Property(t => t.DemolitionPerson).HasColumnName("DemolitionPerson");
+ this.Property(t => t.DemolitionUnit).HasColumnName("DemolitionUnit");
+ this.Property(t => t.Operator).HasColumnName("Operator");
+ this.Property(t => t.OperatorPhone).HasColumnName("OperatorPhone");
+ this.Property(t => t.PropertyRightsUnit).HasColumnName("PropertyRightsUnit");
+ this.Property(t => t.TypeID).HasColumnName("TypeID");
+ this.Property(t => t.Type).HasColumnName("Type");
+ this.Property(t => t.IsInRecords).HasColumnName("IsInRecords");
+ this.Property(t => t.InRecordPersonID).HasColumnName("InRecordPersonID");
+ this.Property(t => t.InRecordPerson).HasColumnName("InRecordPerson");
+ this.Property(t => t.InRecordDate).HasColumnName("InRecordDate");
+ this.Property(t => t.IsHousingReform).HasColumnName("IsHousingReform");
+ this.Property(t => t.SwitchProductionWayID).HasColumnName("SwitchProductionWayID");
+ this.Property(t => t.SwitchProductionWay).HasColumnName("SwitchProductionWay");
+ this.Property(t => t.JHZFSYZKZSHBCZJ).HasColumnName("JHZFSYZKZSHBCZJ");
+ this.Property(t => t.XZHBBCZJBCZJ).HasColumnName("XZHBBCZJBCZJ");
+ this.Property(t => t.AZFKNBZZJBZZJ).HasColumnName("AZFKNBZZJBZZJ");
+ this.Property(t => t.ABCJEZSDCQDHMJ).HasColumnName("ABCJEZSDCQDHMJ");
+ this.Property(t => t.CQDHZJMJ).HasColumnName("CQDHZJMJ");
+ this.Property(t => t.AZGCKZJGTBZMJ).HasColumnName("AZGCKZJGTBZMJ");
+ this.Property(t => t.SKZJMJ).HasColumnName("SKZJMJ");
+ this.Property(t => t.TotalAllocationArea).HasColumnName("TotalAllocationArea");
+ this.Property(t => t.OneTimeRelocationCompensation).HasColumnName("OneTimeRelocationCompensation");
+ this.Property(t => t.AKNBZBZJFBCZJ).HasColumnName("AKNBZBZJFBCZJ");
+ this.Property(t => t.TQBQJLBL).HasColumnName("TQBQJLBL");
+ this.Property(t => t.XFYCQLSAZF).HasColumnName("XFYCQLSAZF");
+ this.Property(t => t.XYZFYFZSBCZJRS).HasColumnName("XYZFYFZSBCZJRS");
+ this.Property(t => t.XYQDJRNXXZFYFZSBCZJ).HasColumnName("XYQDJRNXXZFYFZSBCZJ");
+ this.Property(t => t.XXZFBCJEYE).HasColumnName("XXZFBCJEYE");
+ this.Property(t => t.EnsureRelocateDate).HasColumnName("EnsureRelocateDate");
+ this.Property(t => t.GGGDDBQQX).HasColumnName("GGGDDBQQX");
+ this.Property(t => t.QYBQJLZBQQXJMHJRZF).HasColumnName("QYBQJLZBQQXJMHJRZF");
+ this.Property(t => t.XYSXQYBL).HasColumnName("XYSXQYBL");
+ this.Property(t => t.ZFKNBZZJ).HasColumnName("ZFKNBZZJ");
+ this.Property(t => t.DSRZFKNBCJE).HasColumnName("DSRZFKNBCJE");
+ this.Property(t => t.QYBQJLF).HasColumnName("QYBQJLF");
+ this.Property(t => t.AllocationHouseAreaID).HasColumnName("AllocationHouseAreaID");
+ this.Property(t => t.AllocationHouseArea).HasColumnName("AllocationHouseArea");
+ this.Property(t => t.AllocationHouseAddr).HasColumnName("AllocationHouseAddr");
+ this.Property(t => t.AllocationHouseTypeID).HasColumnName("AllocationHouseTypeID");
+ this.Property(t => t.AllocationHouseType).HasColumnName("AllocationHouseType");
+ this.Property(t => t.AllocationHouseBuildArea).HasColumnName("AllocationHouseBuildArea");
+ this.Property(t => t.AllocationHouseProvideDate).HasColumnName("AllocationHouseProvideDate");
+ this.Property(t => t.AllocationHouseAreaID2).HasColumnName("AllocationHouseAreaID2");
+ this.Property(t => t.AllocationHouseArea2).HasColumnName("AllocationHouseArea2");
+ this.Property(t => t.AllocationHouseAddr2).HasColumnName("AllocationHouseAddr2");
+ this.Property(t => t.AllocationHouseTypeID2).HasColumnName("AllocationHouseTypeID2");
+ this.Property(t => t.AllocationHouseType2).HasColumnName("AllocationHouseType2");
+ this.Property(t => t.AllocationHouseBuildArea2).HasColumnName("AllocationHouseBuildArea2");
+ this.Property(t => t.AllocationHouseProvideDate2).HasColumnName("AllocationHouseProvideDate2");
+ this.Property(t => t.QFLYHLSAZFMYJE).HasColumnName("QFLYHLSAZFMYJE");
+ this.Property(t => t.QFLSAZFXYSXJRXZZF).HasColumnName("QFLSAZFXYSXJRXZZF");
+ this.Property(t => t.QFLSAZXXZFAZFYYS).HasColumnName("QFLSAZXXZFAZFYYS");
+ this.Property(t => t.QFLSAZXXAZFY).HasColumnName("QFLSAZXXAZFY");
+ this.Property(t => t.IsReCheck).HasColumnName("IsReCheck");
+ this.Property(t => t.ReCheckPerson).HasColumnName("ReCheckPerson");
+ this.Property(t => t.ReCheckDate).HasColumnName("ReCheckDate");
+ this.Property(t => t.IsDeedTax).HasColumnName("IsDeedTax");
+ this.Property(t => t.DeedTaxPerson).HasColumnName("DeedTaxPerson");
+ this.Property(t => t.DeedTaxDeductionDate).HasColumnName("DeedTaxDeductionDate");
+ this.Property(t => t.OtherCompensation).HasColumnName("OtherCompensation");
+ this.Property(t => t.TaxPersonRemark).HasColumnName("TaxPersonRemark");
+ 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.WJF_BlockID).HasColumnName("WJF_BlockID");
+ this.Property(t => t.WJF_Block).HasColumnName("WJF_Block");
+ this.Property(t => t.PartyBLegalRepresentative).HasColumnName("PartyBLegalRepresentative");
+ this.Property(t => t.CQDHFWX).HasColumnName("CQDHFWX");
+ this.Property(t => t.CQDHYGFWCQDHSXDYD).HasColumnName("CQDHYGFWCQDHSXDYD");
+ this.Property(t => t.HBBCZJBCZJGS).HasColumnName("HBBCZJBCZJGS");
+ this.Property(t => t.YCXJJBCGS).HasColumnName("YCXJJBCGS");
+ this.Property(t => t.HouseAcquisitionDepartmentID).HasColumnName("HouseAcquisitionDepartmentID");
+ this.Property(t => t.HouseAcquisitionDepartment).HasColumnName("HouseAcquisitionDepartment");
+ this.Property(t => t.CollectImplUnit).HasColumnName("CollectImplUnit");
+ this.Property(t => t.CollectImplUnitName).HasColumnName("CollectImplUnitName");
+ this.Property(t => t.CollectImplUnitBusinessLicenseNo).HasColumnName("CollectImplUnitBusinessLicenseNo");
+ this.Property(t => t.BfPhone).HasColumnName("BfPhone");
+ this.Property(t => t.BfAdreess).HasColumnName("BfAdreess");
+ this.Property(t => t.BFHBBCBZ).HasColumnName("BFHBBCBZ");
+ this.Property(t => t.BFHBBCZJ).HasColumnName("BFHBBCZJ");
+ this.Property(t => t.BFHBBCZJYE).HasColumnName("BFHBBCZJYE");
+ this.Property(t => t.ZSPhone).HasColumnName("ZSPhone");
+ this.Property(t => t.ZSAddress).HasColumnName("ZSAddress");
+ this.Property(t => t.ZSSSPhone).HasColumnName("ZSSSPhone");
+ this.Property(t => t.ZSSSAddress).HasColumnName("ZSSSAddress");
+ this.Property(t => t.Gfbz).HasColumnName("Gfbz");
+ this.Property(t => t.AvailableAmount).HasColumnName("AvailableAmount");
+ this.Property(t => t.DidNotPayMoney).HasColumnName("DidNotPayMoney");
+ this.Property(t => t.Sfyzx).HasColumnName("Sfyzx");
+ this.Property(t => t.Iscancel).HasColumnName("Iscancel");
+ this.Property(t => t.ZDYBQRQ).HasColumnName("ZDYBQRQ");
+ this.Property(t => t.ZXFSPGValue).HasColumnName("ZXFSPGValue");
+ this.Property(t => t.AZFSX).HasColumnName("AZFSX");
+ this.Property(t => t.QYBQBL).HasColumnName("QYBQBL");
+ this.Property(t => t.AZFValue).HasColumnName("AZFValue");
+ this.Property(t => t.AdvanceBCBL).HasColumnName("AdvanceBCBL");
+ this.Property(t => t.GiveLSANZFValue).HasColumnName("GiveLSANZFValue");
+ this.Property(t => t.GiveLSANZFMonth).HasColumnName("GiveLSANZFMonth");
+ this.Property(t => t.PropertyRightCardNo).HasColumnName("PropertyRightCardNo");
+ this.Property(t => t.PropertyRightArea).HasColumnName("PropertyRightArea");
+ 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.CKPropertyArea).HasColumnName("CKPropertyArea");
+ this.Property(t => t.LandCardNo).HasColumnName("LandCardNo");
+ this.Property(t => t.LandFinalArea).HasColumnName("LandFinalArea");
+ this.Property(t => t.CardLb).HasColumnName("CardLb");
+ this.Property(t => t.BusinessLandArea).HasColumnName("BusinessLandArea");
+ this.Property(t => t.OfficeLandArea).HasColumnName("OfficeLandArea");
+ this.Property(t => t.IndustrialLandArea).HasColumnName("IndustrialLandArea");
+ this.Property(t => t.StorageLandArea).HasColumnName("StorageLandArea");
+ this.Property(t => t.CKLandArea).HasColumnName("CKLandArea");
+ this.Property(t => t.Gfbz_Out).HasColumnName("Gfbz_Out");
+ this.Property(t => t.IsCity).HasColumnName("IsCity");
+ this.Property(t => t.IsNext).HasColumnName("IsNext");
+ this.Property(t => t.BuyArea).HasColumnName("BuyArea");
+ this.Property(t => t.GGGDQYQX).HasColumnName("GGGDQYQX");
+ this.Property(t => t.TheLegalRepresentative).HasColumnName("TheLegalRepresentative");
+ this.Property(t => t.TheLegalRepresentativePhone).HasColumnName("TheLegalRepresentativePhone");
+ this.Property(t => t.NatureOfProperty).HasColumnName("NatureOfProperty");
+ this.Property(t => t.NatureOfPropertyID).HasColumnName("NatureOfPropertyID");
+ this.Property(t => t.LandCardUse).HasColumnName("LandCardUse");
+ this.Property(t => t.BusinessPropertLandArea).HasColumnName("BusinessPropertLandArea");
+ this.Property(t => t.OfficePropertLandArea).HasColumnName("OfficePropertLandArea");
+ this.Property(t => t.IndustrialPropertLandArea).HasColumnName("IndustrialPropertLandArea");
+ this.Property(t => t.StoragePropertLandArea).HasColumnName("StoragePropertLandArea");
+ this.Property(t => t.CKPropertLandArea).HasColumnName("CKPropertLandArea");
+ this.Property(t => t.QYBQJLCal).HasColumnName("QYBQJLCal");
+ this.Property(t => t.LesseeLB).HasColumnName("LesseeLB");
+ 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.HouseTicketMoney).HasColumnName("HouseTicketMoney");
+ this.Property(t => t.XYLODOPText).HasColumnName("XYLODOPText");
+ this.Property(t => t.XYLODOP).HasColumnName("XYLODOP").IsRequired();
+ this.Property(t => t.HSDLODOPText).HasColumnName("HSDLODOPText");
+ this.Property(t => t.HSDLODOP).HasColumnName("HSDLODOP").IsRequired();
+ this.Property(t => t.ExceedLandArea).HasColumnName("ExceedLandArea");
+ this.Property(t => t.PaperCancel).HasColumnName("PaperCancel");
+ this.Property(t => t.SecondGiveMoney).HasColumnName("SecondGiveMoney");
+ this.Property(t => t.BFAdvanceBCBL).HasColumnName("BFAdvanceBCBL");
+ this.Property(t => t.AssessCKMoney).HasColumnName("AssessCKMoney");
+ this.Property(t => t.ClearingSheetNum).HasColumnName("ClearingSheetNum");
+ this.Property(t => t.NoAddClearingSheetNum).HasColumnName("NoAddClearingSheetNum");
+ this.Property(t => t.HaveAddClearingSheetNum).HasColumnName("HaveAddClearingSheetNum");
+ this.Property(t => t.HaveRecordClearingSheetNum).HasColumnName("HaveRecordClearingSheetNum");
+ this.Property(t => t.IfCQDH).HasColumnName("IfCQDH");
+ this.Property(t => t.Deductible).HasColumnName("Deductible").IsRequired();
+ this.Property(t => t.IsCancelRecord).HasColumnName("IsCancelRecord").IsRequired();
+ this.Property(t => t.XyFile).HasColumnName("XyFile");
+ this.Property(t => t.IsxyFile).HasColumnName("IsxyFile");
+ }
+ }**/
+
+ }
+
+ //----------NonResidentialAgreement结束----------
+
+
\ No newline at end of file
diff --git a/Ewide.Nbzs.Entity/DataBase/NonResidentialInvestigateTable.cs b/Ewide.Nbzs.Entity/DataBase/NonResidentialInvestigateTable.cs
new file mode 100644
index 0000000..75c05dd
--- /dev/null
+++ b/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
+ {
+ ///
+ /// 数据表实体类:NonResidentialInvestigateTable
+ ///
+ [Table("NonResidentialInvestigateTable")]
+ public partial class NonResidentialInvestigateTable: BaseEntity {
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Key]
+ [Column("ID")]
+ [DataMember]
+ public Guid ID {get;set;}
+ ///
+ /// 非住宅调查表编号
+ ///
+
+ [Display(Name="非住宅调查表编号")]
+ [Column("No")]
+ [DataMember]
+ public string No {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("ProjectId")]
+ [DataMember]
+ public Guid ProjectId {get;set;}
+ ///
+ /// 项目名称
+ ///
+
+ [Display(Name="项目名称")]
+ [Column("ProjectName")]
+ [DataMember]
+ public string ProjectName {get;set;}
+ ///
+ /// 产权人
+ ///
+
+ [Display(Name="产权人")]
+ [Column("PropertyRightPrson")]
+ [DataMember]
+ public string PropertyRightPrson {get;set;}
+ ///
+ /// 身份证,证件号码
+ ///
+
+ [Display(Name="身份证,证件号码")]
+ [Column("PropertyRightPrsonCardNo")]
+ [DataMember]
+ public string PropertyRightPrsonCardNo {get;set;}
+ ///
+ /// 法定代表人
+ ///
+
+ [Display(Name="法定代表人")]
+ [Column("TheLegalRepresentative")]
+ [DataMember]
+ public string TheLegalRepresentative {get;set;}
+ ///
+ /// 法定代表人联系电话
+ ///
+
+ [Display(Name="法定代表人联系电话")]
+ [Column("TheLegalRepresentativePhone")]
+ [DataMember]
+ public string TheLegalRepresentativePhone {get;set;}
+ ///
+ /// 承租人
+ ///
+
+ [Display(Name="承租人")]
+ [Column("Lessee")]
+ [DataMember]
+ public string Lessee {get;set;}
+ ///
+ /// 承租人证件号码
+ ///
+
+ [Display(Name="承租人证件号码")]
+ [Column("LesseeCardNo")]
+ [DataMember]
+ public string LesseeCardNo {get;set;}
+ ///
+ /// 联系电话
+ ///
+
+ [Display(Name="联系电话")]
+ [Column("Phone")]
+ [DataMember]
+ public string Phone {get;set;}
+ ///
+ /// 营业执照号
+ ///
+
+ [Display(Name="营业执照号")]
+ [Column("BusinessLicenseNo")]
+ [DataMember]
+ public string BusinessLicenseNo {get;set;}
+ ///
+ /// 房屋坐落
+ ///
+
+ [Display(Name="房屋坐落")]
+ [Column("HouseAddress")]
+ [DataMember]
+ public string HouseAddress {get;set;}
+ ///
+ /// 产权性质ID
+ ///
+
+ [Display(Name="产权性质ID")]
+ [Column("NatureOfPropertyID")]
+ [DataMember]
+ public string NatureOfPropertyID {get;set;}
+ ///
+ /// 产权性质
+ ///
+
+ [Display(Name="产权性质")]
+ [Column("NatureOfProperty")]
+ [DataMember]
+ public string NatureOfProperty {get;set;}
+ ///
+ /// 权证建筑面积
+ ///
+
+ [Display(Name="权证建筑面积")]
+ [Column("BuildingArea")]
+ [DataMember]
+ public decimal? BuildingArea {get;set;}
+ ///
+ /// 使用情况ID 关联字典表ID
+ ///
+
+ [Display(Name="使用情况ID 关联字典表ID")]
+ [Column("UsageID")]
+ [DataMember]
+ public Guid? UsageID {get;set;}
+ ///
+ /// 使用状况
+ ///
+
+ [Display(Name="使用状况")]
+ [Column("UsageSituation")]
+ [DataMember]
+ public string UsageSituation {get;set;}
+ ///
+ /// 土地证号
+ ///
+
+ [Display(Name="土地证号")]
+ [Column("LandCardNo")]
+ [DataMember]
+ public string LandCardNo {get;set;}
+ ///
+ /// 土地证记载面积
+ ///
+
+ [Display(Name="土地证记载面积")]
+ [Column("LandCardArea")]
+ [DataMember]
+ public decimal? LandCardArea {get;set;}
+ ///
+ /// 土地证记载用途/房屋用途
+ ///
+
+ [Display(Name="土地证记载用途/房屋用途")]
+ [Column("LandCardUse")]
+ [DataMember]
+ public string LandCardUse {get;set;}
+ ///
+ /// 土地取得方式
+ ///
+
+ [Display(Name="土地取得方式")]
+ [Column("LandAchieveWay")]
+ [DataMember]
+ public string LandAchieveWay {get;set;}
+ ///
+ /// 商业-房号
+ ///
+
+ [Display(Name="商业-房号")]
+ [Column("BusinessHouseNo")]
+ [DataMember]
+ public string BusinessHouseNo {get;set;}
+ ///
+ /// 商业-结构等级
+ ///
+
+ [Display(Name="商业-结构等级")]
+ [Column("BusinessStructureLevel")]
+ [DataMember]
+ public string BusinessStructureLevel {get;set;}
+ ///
+ /// 商业-建筑面积
+ ///
+
+ [Display(Name="商业-建筑面积")]
+ [Column("BusinessBuildArea")]
+ [DataMember]
+ public decimal? BusinessBuildArea {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("LandAcquisitionBCWillingness")]
+ [DataMember]
+ public string LandAcquisitionBCWillingness {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Razon")]
+ [DataMember]
+ public string Razon {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("LandAcquisitionWillingness")]
+ [DataMember]
+ public string LandAcquisitionWillingness {get;set;}
+ ///
+ /// 办公-房号
+ ///
+
+ [Display(Name="办公-房号")]
+ [Column("OfficeHouseNo")]
+ [DataMember]
+ public string OfficeHouseNo {get;set;}
+ ///
+ /// 放工-结构等级
+ ///
+
+ [Display(Name="放工-结构等级")]
+ [Column("OfficeStructureLevel")]
+ [DataMember]
+ public string OfficeStructureLevel {get;set;}
+ ///
+ /// 办公-建筑面积
+ ///
+
+ [Display(Name="办公-建筑面积")]
+ [Column("OfficeBuildArea")]
+ [DataMember]
+ public decimal? OfficeBuildArea {get;set;}
+ ///
+ /// 工业-房号
+ ///
+
+ [Display(Name="工业-房号")]
+ [Column("IndustrialHouseNo")]
+ [DataMember]
+ public string IndustrialHouseNo {get;set;}
+ ///
+ /// 工业-结构等级
+ ///
+
+ [Display(Name="工业-结构等级")]
+ [Column("IndustrialStructureLevel")]
+ [DataMember]
+ public string IndustrialStructureLevel {get;set;}
+ ///
+ /// 工业-建筑面积
+ ///
+
+ [Display(Name="工业-建筑面积")]
+ [Column("IndustrialBuildArea")]
+ [DataMember]
+ public decimal? IndustrialBuildArea {get;set;}
+ ///
+ /// 仓储-房号
+ ///
+
+ [Display(Name="仓储-房号")]
+ [Column("StorageHouseNo")]
+ [DataMember]
+ public string StorageHouseNo {get;set;}
+ ///
+ /// 仓储-结构等级
+ ///
+
+ [Display(Name="仓储-结构等级")]
+ [Column("StorageStructureLevel")]
+ [DataMember]
+ public string StorageStructureLevel {get;set;}
+ ///
+ /// 仓储-建筑面积
+ ///
+
+ [Display(Name="仓储-建筑面积")]
+ [Column("StorageBuildArea")]
+ [DataMember]
+ public decimal? StorageBuildArea {get;set;}
+ ///
+ /// 房屋用途中其他的名称
+ ///
+
+ [Display(Name="房屋用途中其他的名称")]
+ [Column("OtherName")]
+ [DataMember]
+ public string OtherName {get;set;}
+ ///
+ /// 其他-房号
+ ///
+
+ [Display(Name="其他-房号")]
+ [Column("OtherHouseNo")]
+ [DataMember]
+ public string OtherHouseNo {get;set;}
+ ///
+ /// 其他-结构等级
+ ///
+
+ [Display(Name="其他-结构等级")]
+ [Column("OtherStructureLevel")]
+ [DataMember]
+ public string OtherStructureLevel {get;set;}
+ ///
+ /// 其他-建筑面积
+ ///
+
+ [Display(Name="其他-建筑面积")]
+ [Column("OtherBuildArea")]
+ [DataMember]
+ public decimal? OtherBuildArea {get;set;}
+ ///
+ /// 未登记-坐落
+ ///
+
+ [Display(Name="未登记-坐落")]
+ [Column("UnReg_Address")]
+ [DataMember]
+ public string UnReg_Address {get;set;}
+ ///
+ /// 未登记-建筑面积
+ ///
+
+ [Display(Name="未登记-建筑面积")]
+ [Column("UnReg_BuildArea")]
+ [DataMember]
+ public string UnReg_BuildArea {get;set;}
+ ///
+ /// 未登记-建造年份
+ ///
+
+ [Display(Name="未登记-建造年份")]
+ [Column("UnReg_BuildYear")]
+ [DataMember]
+ public string UnReg_BuildYear {get;set;}
+ ///
+ /// 未登记-实际用途
+ ///
+
+ [Display(Name="未登记-实际用途")]
+ [Column("UnReg_PracticalUse")]
+ [DataMember]
+ public string UnReg_PracticalUse {get;set;}
+ ///
+ /// 房屋征收相关文书送达地址
+ ///
+
+ [Display(Name="房屋征收相关文书送达地址")]
+ [Column("DocumentToAddress")]
+ [DataMember]
+ public string DocumentToAddress {get;set;}
+ ///
+ /// 收件联系人
+ ///
+
+ [Display(Name="收件联系人")]
+ [Column("ReceiveContactPerson")]
+ [DataMember]
+ public string ReceiveContactPerson {get;set;}
+ ///
+ /// 收件联系手机
+ ///
+
+ [Display(Name="收件联系手机")]
+ [Column("ReceiveContactPhone")]
+ [DataMember]
+ public string ReceiveContactPhone {get;set;}
+ ///
+ /// 调查人
+ ///
+
+ [Display(Name="调查人")]
+ [Column("InvestigateUserId")]
+ [DataMember]
+ public Guid? InvestigateUserId {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("InvestigateUserName")]
+ [DataMember]
+ public string InvestigateUserName {get;set;}
+ ///
+ /// 调查时间
+ ///
+
+ [Display(Name="调查时间")]
+ [Column("InvestigateDate")]
+ [DataMember]
+ public DateTime? InvestigateDate {get;set;}
+ ///
+ /// 业主(产权人)签字
+ ///
+
+ [Display(Name="业主(产权人)签字")]
+ [Column("PropertyRightPrsonSign")]
+ [DataMember]
+ public string PropertyRightPrsonSign {get;set;}
+ ///
+ /// 业主(产权人)签字时间
+ ///
+
+ [Display(Name="业主(产权人)签字时间")]
+ [Column("PropertyRightPrsonSignDate")]
+ [DataMember]
+ public DateTime? PropertyRightPrsonSignDate {get;set;}
+ ///
+ /// 是否发布到公开系统
+ ///
+
+ [Display(Name="是否发布到公开系统")]
+ [Column("IsReleaseToOpenSys")]
+ [DataMember]
+ public bool IsReleaseToOpenSys {get;set;}
+ ///
+ /// 发布到公开系统时间
+ ///
+
+ [Display(Name=" 发布到公开系统时间")]
+ [Column("ReleaseToOpenSysDate")]
+ [DataMember]
+ public DateTime? ReleaseToOpenSysDate {get;set;}
+ ///
+ /// 发布到公开系统人员ID
+ ///
+
+ [Display(Name="发布到公开系统人员ID")]
+ [Column("ReleaseToOpenSysUserId")]
+ [DataMember]
+ public Guid? ReleaseToOpenSysUserId {get;set;}
+ ///
+ /// 登记人ID
+ ///
+
+ [Display(Name="登记人ID")]
+ [Column("RegisterUserId")]
+ [DataMember]
+ public Guid? RegisterUserId {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("RegisterUserName")]
+ [DataMember]
+ public string RegisterUserName {get;set;}
+ ///
+ /// 登记日期
+ ///
+
+ [Display(Name="登记日期")]
+ [Column("RegisterDate")]
+ [DataMember]
+ public DateTime? RegisterDate {get;set;}
+ ///
+ /// 修改人员
+ ///
+
+ [Display(Name="修改人员")]
+ [Column("UpdateUserId")]
+ [DataMember]
+ public Guid? UpdateUserId {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("UpdateUserName")]
+ [DataMember]
+ public string UpdateUserName {get;set;}
+ ///
+ /// 修改日期
+ ///
+
+ [Display(Name="修改日期")]
+ [Column("UpdateDate")]
+ [DataMember]
+ public DateTime? UpdateDate {get;set;}
+ ///
+ /// 备注
+ ///
+
+ [Display(Name="备注")]
+ [Column("Remark")]
+ [DataMember]
+ public string Remark {get;set;}
+ ///
+ /// 非住宅调查表附件
+ ///
+
+ [Display(Name="非住宅调查表附件")]
+ [Column("Files")]
+ [DataMember]
+ public string Files {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Sfqy")]
+ [DataMember]
+ public int Sfqy {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("JztdArea")]
+ [DataMember]
+ public decimal? JztdArea {get;set;}
+ ///
+ /// 证件类别
+ ///
+
+ [Display(Name="证件类别")]
+ [Column("CodeLB")]
+ [DataMember]
+ public string CodeLB {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("IsOpen")]
+ [DataMember]
+ public int IsOpen {get;set;}
+ ///
+ /// 房产证号
+ ///
+
+ [Display(Name="房产证号")]
+ [Column("PropertyRightCardNo")]
+ [DataMember]
+ public string PropertyRightCardNo {get;set;}
+ ///
+ /// 证载面积
+ ///
+
+ [Display(Name="证载面积")]
+ [Column("PropertyRightArea")]
+ [DataMember]
+ public decimal? PropertyRightArea {get;set;}
+ ///
+ /// 土地核定面积
+ ///
+
+ [Display(Name="土地核定面积")]
+ [Column("LandFinalArea")]
+ [DataMember]
+ public decimal? LandFinalArea {get;set;}
+ ///
+ /// 商业-证载建筑面积
+ ///
+
+ [Display(Name="商业-证载建筑面积")]
+ [Column("BusinessPropertyArea")]
+ [DataMember]
+ public decimal? BusinessPropertyArea {get;set;}
+ ///
+ /// 办公-证载建筑面积
+ ///
+
+ [Display(Name="办公-证载建筑面积")]
+ [Column("OfficePropertyArea")]
+ [DataMember]
+ public decimal? OfficePropertyArea {get;set;}
+ ///
+ /// 工业-证载建筑面积
+ ///
+
+ [Display(Name="工业-证载建筑面积")]
+ [Column("IndustrialPropertyArea")]
+ [DataMember]
+ public decimal? IndustrialPropertyArea {get;set;}
+ ///
+ /// 仓储-证载建筑面积
+ ///
+
+ [Display(Name="仓储-证载建筑面积")]
+ [Column("StoragePropertyArea")]
+ [DataMember]
+ public decimal? StoragePropertyArea {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("LesseeLB")]
+ [DataMember]
+ public string LesseeLB {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("IsLessee")]
+ [DataMember]
+ public string IsLessee {get;set;}
+ ///
+ /// 土地证记载用途
+ ///
+
+ [Display(Name="土地证记载用途")]
+ [Column("HouseUse")]
+ [DataMember]
+ public string HouseUse {get;set;}
+ ///
+ /// 红线内无证面积
+ ///
+
+ [Display(Name="红线内无证面积")]
+ [Column("RedLine_In")]
+ [DataMember]
+ public decimal? RedLine_In {get;set;}
+ ///
+ /// 红线外无证面积
+ ///
+
+ [Display(Name="红线外无证面积")]
+ [Column("RedLine_Out")]
+ [DataMember]
+ public decimal? RedLine_Out {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Sfth")]
+ [DataMember]
+ public string Sfth {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Thbh")]
+ [DataMember]
+ public string Thbh {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("ThGuid")]
+ [DataMember]
+ public string ThGuid {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("SFTJ")]
+ [DataMember]
+ public int SFTJ {get;set;}
+ ///
+ /// 储藏室
+ ///
+
+ [Display(Name="储藏室")]
+ [Column("StoreroomArea")]
+ [DataMember]
+ public decimal? StoreroomArea {get;set;}
+ ///
+ /// 批次号
+ ///
+
+ [Display(Name="批次号")]
+ [Column("BatchNumber")]
+ [DataMember]
+ public string BatchNumber {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("GroupID")]
+ [DataMember]
+ public Guid? GroupID {get;set;}
+
+ }
+
+ /**
+ ///
+ /// 数据表实体类Map:NonResidentialInvestigateTable
+ ///
+ public class NonResidentialInvestigateTableMap : EntityTypeConfiguration
+ {
+ 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结束----------
+
+
\ No newline at end of file
diff --git a/Ewide.Nbzs.Entity/DataBase/PoliciesRegulations.cs b/Ewide.Nbzs.Entity/DataBase/PoliciesRegulations.cs
new file mode 100644
index 0000000..74bdde0
--- /dev/null
+++ b/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
+ {
+ ///
+ /// 数据表实体类:PoliciesRegulations
+ ///
+ [Table("PoliciesRegulations")]
+ public partial class PoliciesRegulations: BaseEntity {
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Key]
+ [Column("ID")]
+ [DataMember]
+ public Guid ID {get;set;}
+ ///
+ /// 项目id 关联Projects表ID
+ ///
+
+ [Display(Name="项目id 关联Projects表ID")]
+ [Column("ProjectID")]
+ [DataMember]
+ public Guid? ProjectID {get;set;}
+ ///
+ /// 项目名称
+ ///
+
+ [Display(Name="项目名称")]
+ [Column("ProjectName")]
+ [DataMember]
+ public string ProjectName {get;set;}
+ ///
+ /// 所属区域ID
+ ///
+
+ [Display(Name="所属区域ID")]
+ [Column("AreaID")]
+ [DataMember]
+ public Guid? AreaID {get;set;}
+ ///
+ /// 所属区域
+ ///
+
+ [Display(Name="所属区域")]
+ [Column("Area")]
+ [DataMember]
+ public string Area {get;set;}
+ ///
+ /// 标题
+ ///
+
+ [Display(Name="标题")]
+ [Column("Title")]
+ [DataMember]
+ public string Title {get;set;}
+ ///
+ /// 征文内容
+ ///
+
+ [Display(Name="征文内容")]
+ [Column("Contents")]
+ [DataMember]
+ public string Contents {get;set;}
+ ///
+ /// 是否公开
+ ///
+
+ [Display(Name="是否公开")]
+ [Column("IsPublic")]
+ [DataMember]
+ public bool IsPublic {get;set;}
+ ///
+ /// 发布时间
+ ///
+
+ [Display(Name="发布时间")]
+ [Column("PublicTime")]
+ [DataMember]
+ public DateTime? PublicTime {get;set;}
+ ///
+ /// 使用截止时间
+ ///
+
+ [Display(Name="使用截止时间")]
+ [Column("PublicTimeEnd")]
+ [DataMember]
+ public DateTime? PublicTimeEnd {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("CreateUserName")]
+ [DataMember]
+ public string CreateUserName {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("UpdateTime")]
+ [DataMember]
+ public DateTime? UpdateTime {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("UpdateUserId")]
+ [DataMember]
+ public Guid? UpdateUserId {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("UpdateUserName")]
+ [DataMember]
+ public string UpdateUserName {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Remark")]
+ [DataMember]
+ public string Remark {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Files")]
+ [DataMember]
+ public string Files {get;set;}
+
+ }
+
+ /**
+ ///
+ /// 数据表实体类Map:PoliciesRegulations
+ ///
+ public class PoliciesRegulationsMap : EntityTypeConfiguration
+ {
+ public PoliciesRegulationsMap()
+ {
+ this.ToTable("PoliciesRegulations");
+ this.HasKey(t => t.ID);
+ this.Property(t => t.ProjectID).HasColumnName("ProjectID");
+ this.Property(t => t.ProjectName).HasColumnName("ProjectName");
+ this.Property(t => t.AreaID).HasColumnName("AreaID");
+ this.Property(t => t.Area).HasColumnName("Area");
+ this.Property(t => t.Title).HasColumnName("Title");
+ this.Property(t => t.Contents).HasColumnName("Contents");
+ this.Property(t => t.IsPublic).HasColumnName("IsPublic");
+ this.Property(t => t.PublicTime).HasColumnName("PublicTime");
+ this.Property(t => t.PublicTimeEnd).HasColumnName("PublicTimeEnd");
+ this.Property(t => t.CreateTime).HasColumnName("CreateTime");
+ this.Property(t => t.CreateUserId).HasColumnName("CreateUserId");
+ this.Property(t => t.CreateUserName).HasColumnName("CreateUserName");
+ this.Property(t => t.UpdateTime).HasColumnName("UpdateTime");
+ this.Property(t => t.UpdateUserId).HasColumnName("UpdateUserId");
+ this.Property(t => t.UpdateUserName).HasColumnName("UpdateUserName");
+ this.Property(t => t.Remark).HasColumnName("Remark");
+ this.Property(t => t.Files).HasColumnName("Files");
+ this.Property(t => t.Sort).HasColumnName("Sort").IsRequired();
+ }
+ }**/
+
+ }
+
+ //----------PoliciesRegulations结束----------
+
+
\ No newline at end of file
diff --git a/Ewide.Nbzs.Entity/DataBase/Projects.cs b/Ewide.Nbzs.Entity/DataBase/Projects.cs
new file mode 100644
index 0000000..acfe3b7
--- /dev/null
+++ b/Ewide.Nbzs.Entity/DataBase/Projects.cs
@@ -0,0 +1,1956 @@
+ //----------Projects开始----------
+
+ 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
+ {
+ ///
+ /// 数据表实体类:Projects
+ ///
+ [Table("Projects")]
+ public partial class Projects: BaseEntity {
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Key]
+ [Column("ID")]
+ [DataMember]
+ public Guid ID {get;set;}
+ ///
+ /// 计划ID 关联Plans表ID
+ ///
+
+ [Display(Name="计划ID 关联Plans表ID")]
+ [Column("PlanID")]
+ [DataMember]
+ public Guid? PlanID {get;set;}
+ ///
+ /// 项目名称(年度计划中读取)
+ ///
+
+ [Display(Name="项目名称(年度计划中读取)")]
+ [Column("Name")]
+ [DataMember]
+ public string Name {get;set;}
+ ///
+ /// 编号
+ ///
+
+ [Display(Name="编号")]
+ [Column("No")]
+ [DataMember]
+ public string No {get;set;}
+ ///
+ /// 是否测试项目(指定的测试人员才能看到)
+ ///
+
+ [Display(Name="是否测试项目(指定的测试人员才能看到)")]
+ [Column("IsTest")]
+ [DataMember]
+ public bool IsTest {get;set;}
+ ///
+ /// 所属区域ID-关联数据字典Dictionary表ID(年度计划中读取)
+ ///
+
+ [Display(Name="所属区域ID-关联数据字典Dictionary表ID(年度计划中读取)")]
+ [Column("AreaID")]
+ [DataMember]
+ public Guid? AreaID {get;set;}
+ ///
+ /// 所属区域
+ ///
+
+ [Display(Name="所属区域")]
+ [Column("Area")]
+ [DataMember]
+ public string Area {get;set;}
+ ///
+ /// 征收类型ID 关联字典表ID(“一般公共利益、旧城区改建、危旧房改造”三选一),从计划中读取,取计划表PublicInterest
+ ///
+
+ [Display(Name="征收类型ID 关联字典表ID(“一般公共利益、旧城区改建、危旧房改造”三选一),从计划中读取,取计划表PublicInterest")]
+ [Column("CollectTypeID")]
+ [DataMember]
+ public Guid? CollectTypeID {get;set;}
+ ///
+ /// 征收类型:“一般公共利益、旧城区改建、危旧房改造”三选一
+ ///
+
+ [Display(Name="征收类型:“一般公共利益、旧城区改建、危旧房改造”三选一")]
+ [Column("CollectType")]
+ [DataMember]
+ public string CollectType {get;set;}
+ ///
+ /// 建设活动主体(手动编辑)
+ ///
+
+ [Display(Name="建设活动主体(手动编辑)")]
+ [Column("ConstructionActivitiesSubject")]
+ [DataMember]
+ public string ConstructionActivitiesSubject {get;set;}
+ ///
+ /// 征收决定号前置标识ID 取字典表ID
+ ///
+
+ [Display(Name="征收决定号前置标识ID 取字典表ID")]
+ [Column("CollectDecisionNoHeadID")]
+ [DataMember]
+ public Guid? CollectDecisionNoHeadID {get;set;}
+ ///
+ /// 征收决定号前置标识
+ ///
+
+ [Display(Name="征收决定号前置标识")]
+ [Column("CollectDecisionNoHeadName")]
+ [DataMember]
+ public string CollectDecisionNoHeadName {get;set;}
+ ///
+ /// 征收决定号第一部分
+ ///
+
+ [Display(Name="征收决定号第一部分")]
+ [Column("CollectDecisionNo1")]
+ [DataMember]
+ public decimal? CollectDecisionNo1 {get;set;}
+ ///
+ /// 征收决定号第二部分
+ ///
+
+ [Display(Name="征收决定号第二部分")]
+ [Column("CollectDecisionNo2")]
+ [DataMember]
+ public decimal? CollectDecisionNo2 {get;set;}
+ ///
+ /// 征收总户数(参考现系统功能,下两项为数字时,为他们的和,否则需要手动输入)
+ ///
+
+ [Display(Name="征收总户数(参考现系统功能,下两项为数字时,为他们的和,否则需要手动输入)")]
+ [Column("CollectAllNum")]
+ [DataMember]
+ public int CollectAllNum {get;set;}
+ ///
+ /// 住宅征收户数
+ ///
+
+ [Display(Name="住宅征收户数")]
+ [Column("ResidentialCollectCount")]
+ [DataMember]
+ public int ResidentialCollectCount {get;set;}
+ ///
+ /// 非住宅征收户数
+ ///
+
+ [Display(Name="非住宅征收户数")]
+ [Column("NonResidentialCollectCount")]
+ [DataMember]
+ public int NonResidentialCollectCount {get;set;}
+ ///
+ /// 住宅征收面积(参考现系统功能,下两项为数字时,为他们的和,否则需要手动输入)
+ ///
+
+ [Display(Name="住宅征收面积(参考现系统功能,下两项为数字时,为他们的和,否则需要手动输入)")]
+ [Column("CollectAllArea")]
+ [DataMember]
+ public decimal? CollectAllArea {get;set;}
+ ///
+ /// 住宅征收面积
+ ///
+
+ [Display(Name="住宅征收面积")]
+ [Column("ResidentialCollectArea")]
+ [DataMember]
+ public decimal? ResidentialCollectArea {get;set;}
+ ///
+ /// 非住宅征收面积
+ ///
+
+ [Display(Name="非住宅征收面积")]
+ [Column("NonResidentialCollectArea")]
+ [DataMember]
+ public decimal? NonResidentialCollectArea {get;set;}
+ ///
+ /// 预算资金
+ ///
+
+ [Display(Name="预算资金")]
+ [Column("BudgetMoney")]
+ [DataMember]
+ public decimal? BudgetMoney {get;set;}
+ ///
+ /// 一次性补偿搬迁标准
+ ///
+
+ [Display(Name="一次性补偿搬迁标准")]
+ [Column("OneTimeCompensationStandardRelocation")]
+ [DataMember]
+ public decimal? OneTimeCompensationStandardRelocation {get;set;}
+ ///
+ /// 临时安置费
+ ///
+
+ [Display(Name="临时安置费")]
+ [Column("TemporaryRelocationAllowance")]
+ [DataMember]
+ public decimal? TemporaryRelocationAllowance {get;set;}
+ ///
+ /// 征收范围(年度计划中读取)
+ ///
+
+ [Display(Name="征收范围(年度计划中读取)")]
+ [Column("CollectRange")]
+ [DataMember]
+ public string CollectRange {get;set;}
+ ///
+ /// 备案申请资料提交情况(上传,参考老系统)
+ ///
+
+ [Display(Name="备案申请资料提交情况(上传,参考老系统)")]
+ [Column("DataSubmittedApplications")]
+ [DataMember]
+ public string DataSubmittedApplications {get;set;}
+ ///
+ /// 房屋征收部门ID(年度计划中读取,可变) 关联RelateUnits表ID
+ ///
+
+ [Display(Name="房屋征收部门ID(年度计划中读取,可变) 关联RelateUnits表ID")]
+ [Column("HouseAcquisitionDepartmentID")]
+ [DataMember]
+ public Guid? HouseAcquisitionDepartmentID {get;set;}
+ ///
+ /// 房屋征收部门(年度计划中读取,可变)
+ ///
+
+ [Display(Name="房屋征收部门(年度计划中读取,可变) ")]
+ [Column("HouseAcquisitionDepartment")]
+ [DataMember]
+ public string HouseAcquisitionDepartment {get;set;}
+ ///
+ /// 房屋征收部门法定代表人
+ ///
+
+ [Display(Name="房屋征收部门法定代表人")]
+ [Column("HADLegalRepresentative")]
+ [DataMember]
+ public string HADLegalRepresentative {get;set;}
+ ///
+ /// 房屋征收部门营业执照编号
+ ///
+
+ [Display(Name="房屋征收部门营业执照编号")]
+ [Column("HADBusinessLicenseNo")]
+ [DataMember]
+ public string HADBusinessLicenseNo {get;set;}
+ ///
+ /// 征收评估机构ID 关联EvaluationCompany表ID
+ ///
+
+ [Display(Name="征收评估机构ID 关联EvaluationCompany表ID")]
+ [Column("EvaluationCompanyID")]
+ [DataMember]
+ public string EvaluationCompanyID {get;set;}
+ ///
+ /// 征收评估机构 关联EvaluationCompany表ID
+ ///
+
+ [Display(Name="征收评估机构 关联EvaluationCompany表ID")]
+ [Column("EvaluationCompany")]
+ [DataMember]
+ public string EvaluationCompany {get;set;}
+ ///
+ /// 资质等级 取自评估机构
+ ///
+
+ [Display(Name="资质等级 取自评估机构")]
+ [Column("QualificationLevel")]
+ [DataMember]
+ public string QualificationLevel {get;set;}
+ ///
+ /// 被征收房屋评估比准价
+ ///
+
+ [Display(Name="被征收房屋评估比准价")]
+ [Column("HouseEvaluationApprovePrice")]
+ [DataMember]
+ public decimal? HouseEvaluationApprovePrice {get;set;}
+ ///
+ /// 安置住房评估比准价
+ ///
+
+ [Display(Name="安置住房评估比准价")]
+ [Column("AllocationHouseEvaluationApprovePrice")]
+ [DataMember]
+ public decimal? AllocationHouseEvaluationApprovePrice {get;set;}
+ ///
+ /// 安置房源所有套数
+ ///
+
+ [Display(Name="安置房源所有套数")]
+ [Column("AllocationHouseAllNum")]
+ [DataMember]
+ public int? AllocationHouseAllNum {get;set;}
+ ///
+ /// 安置房源已用套数
+ ///
+
+ [Display(Name="安置房源已用套数")]
+ [Column("AllocationHouseUsedNum")]
+ [DataMember]
+ public int? AllocationHouseUsedNum {get;set;}
+ ///
+ /// 安置房源剩余套数
+ ///
+
+ [Display(Name="安置房源剩余套数")]
+ [Column("AllocationHouseRemainingNum")]
+ [DataMember]
+ public int? AllocationHouseRemainingNum {get;set;}
+ ///
+ /// 安置房源现房所有套数
+ ///
+
+ [Display(Name="安置房源现房所有套数")]
+ [Column("AllocationHouseXFAllNum")]
+ [DataMember]
+ public int? AllocationHouseXFAllNum {get;set;}
+ ///
+ /// 安置房源现房已用套数
+ ///
+
+ [Display(Name="安置房源现房已用套数")]
+ [Column("AllocationHouseXFUsedNum")]
+ [DataMember]
+ public int? AllocationHouseXFUsedNum {get;set;}
+ ///
+ /// 安置房源现房剩余套数
+ ///
+
+ [Display(Name="安置房源现房剩余套数")]
+ [Column("AllocationHouseXFRemainingNum")]
+ [DataMember]
+ public int? AllocationHouseXFRemainingNum {get;set;}
+ ///
+ /// 安置房源期房所有套数
+ ///
+
+ [Display(Name="安置房源期房所有套数")]
+ [Column("AllocationHouseQFAllNum")]
+ [DataMember]
+ public int? AllocationHouseQFAllNum {get;set;}
+ ///
+ /// 安置房源期房已用套数
+ ///
+
+ [Display(Name="安置房源期房已用套数")]
+ [Column("AllocationHouseQFUsedNum")]
+ [DataMember]
+ public int? AllocationHouseQFUsedNum {get;set;}
+ ///
+ /// 安置房源期房剩余套数
+ ///
+
+ [Display(Name="安置房源期房剩余套数")]
+ [Column("AllocationHouseQFRemainingNum")]
+ [DataMember]
+ public int? AllocationHouseQFRemainingNum {get;set;}
+ ///
+ /// 联系电话
+ ///
+
+ [Display(Name="联系电话")]
+ [Column("Phone")]
+ [DataMember]
+ public string Phone {get;set;}
+ ///
+ /// 签约期限
+ ///
+
+ [Display(Name="签约期限")]
+ [Column("ContractPeriod")]
+ [DataMember]
+ public DateTime? ContractPeriod {get;set;}
+ ///
+ /// 搬迁期限
+ ///
+
+ [Display(Name="搬迁期限")]
+ [Column("TheRelocationPeriod")]
+ [DataMember]
+ public DateTime? TheRelocationPeriod {get;set;}
+ ///
+ /// 征收起始日期
+ ///
+
+ [Display(Name="征收起始日期")]
+ [Column("TheRelocationPeriod1")]
+ [DataMember]
+ public DateTime? TheRelocationPeriod1 {get;set;}
+ ///
+ /// 征收期限
+ ///
+
+ [Display(Name="征收期限")]
+ [Column("ContractPeriod1")]
+ [DataMember]
+ public DateTime? ContractPeriod1 {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("RenewTime")]
+ [DataMember]
+ public DateTime? RenewTime {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("RenewTime1")]
+ [DataMember]
+ public DateTime? RenewTime1 {get;set;}
+ ///
+ /// 其他方式征收户数
+ ///
+
+ [Display(Name="其他方式征收户数")]
+ [Column("OtherWayCollectNum")]
+ [DataMember]
+ public int OtherWayCollectNum {get;set;}
+ ///
+ /// 其他方式情况说明
+ ///
+
+ [Display(Name="其他方式情况说明")]
+ [Column("OtherWaySituation")]
+ [DataMember]
+ public string OtherWaySituation {get;set;}
+ ///
+ /// 是否在中心城内
+ ///
+
+ [Display(Name="是否在中心城内")]
+ [Column("IsInCityCenter")]
+ [DataMember]
+ public bool IsInCityCenter {get;set;}
+ ///
+ /// 协议生效比例
+ ///
+
+ [Display(Name="协议生效比例")]
+ [Column("AgreementTakeEffectRatio")]
+ [DataMember]
+ public decimal? AgreementTakeEffectRatio {get;set;}
+ ///
+ /// 意愿征询比例
+ ///
+
+ [Display(Name="意愿征询比例")]
+ [Column("IntendToConsultRatio")]
+ [DataMember]
+ public decimal? IntendToConsultRatio {get;set;}
+ ///
+ /// 项目签约比例
+ ///
+
+ [Display(Name="项目签约比例")]
+ [Column("ProjectSignRatio")]
+ [DataMember]
+ public decimal? ProjectSignRatio {get;set;}
+ ///
+ /// 意见书反馈期限
+ ///
+
+ [Display(Name="意见书反馈期限")]
+ [Column("OpinionFeedbackDeadline")]
+ [DataMember]
+ public DateTime? OpinionFeedbackDeadline {get;set;}
+ ///
+ /// 反馈部门
+ ///
+
+ [Display(Name="反馈部门")]
+ [Column("FeedbackDepartment")]
+ [DataMember]
+ public string FeedbackDepartment {get;set;}
+ ///
+ /// 反馈地址
+ ///
+
+ [Display(Name="反馈地址 ")]
+ [Column("FeedbackAddr")]
+ [DataMember]
+ public string FeedbackAddr {get;set;}
+ ///
+ /// 反馈电话
+ ///
+
+ [Display(Name="反馈电话")]
+ [Column("FeedbackPhone")]
+ [DataMember]
+ public string FeedbackPhone {get;set;}
+ ///
+ /// 临时安置补偿费标准
+ ///
+
+ [Display(Name="临时安置补偿费标准")]
+ [Column("TemporaryResettlementCompensationStandard")]
+ [DataMember]
+ public decimal? TemporaryResettlementCompensationStandard {get;set;}
+ ///
+ /// 项目启动是否完成
+ ///
+
+ [Display(Name="项目启动是否完成")]
+ [Column("ProjectIsFinish")]
+ [DataMember]
+ public bool ProjectIsFinish {get;set;}
+ ///
+ /// 项目启动完成时间
+ ///
+
+ [Display(Name="项目启动完成时间")]
+ [Column("ProjectFinishDate")]
+ [DataMember]
+ public DateTime? ProjectFinishDate {get;set;}
+ ///
+ /// 项目启动完成人ID
+ ///
+
+ [Display(Name="项目启动完成人ID")]
+ [Column("ProjectFinishUserId")]
+ [DataMember]
+ public Guid? ProjectFinishUserId {get;set;}
+ ///
+ /// 项目启动完成人
+ ///
+
+ [Display(Name="项目启动完成人")]
+ [Column("ProjectFinishUserName")]
+ [DataMember]
+ public string ProjectFinishUserName {get;set;}
+ ///
+ /// 调查表是否完成
+ ///
+
+ [Display(Name="调查表是否完成")]
+ [Column("InvestigateTIsFinish")]
+ [DataMember]
+ public bool InvestigateTIsFinish {get;set;}
+ ///
+ /// 调查表完成时间
+ ///
+
+ [Display(Name="调查表完成时间")]
+ [Column("InvestigateTDate")]
+ [DataMember]
+ public DateTime? InvestigateTDate {get;set;}
+ ///
+ /// 调查表完成人ID
+ ///
+
+ [Display(Name="调查表完成人ID")]
+ [Column("InvestigateTUserId")]
+ [DataMember]
+ public Guid? InvestigateTUserId {get;set;}
+ ///
+ /// 调查表完成人
+ ///
+
+ [Display(Name="调查表完成人")]
+ [Column("InvestigateTUserName")]
+ [DataMember]
+ public string InvestigateTUserName {get;set;}
+ ///
+ /// 意愿征询是否完成
+ ///
+
+ [Display(Name="意愿征询是否完成")]
+ [Column("IntendToConsultIsFinish")]
+ [DataMember]
+ public bool IntendToConsultIsFinish {get;set;}
+ ///
+ /// 意愿征询完成时间
+ ///
+
+ [Display(Name="意愿征询完成时间")]
+ [Column("IntendToConsultFinishDate")]
+ [DataMember]
+ public DateTime? IntendToConsultFinishDate {get;set;}
+ ///
+ /// 意愿征询完成人ID
+ ///
+
+ [Display(Name="意愿征询完成人ID")]
+ [Column("IntendToConsultFinishUserId")]
+ [DataMember]
+ public Guid? IntendToConsultFinishUserId {get;set;}
+ ///
+ /// 意愿征询完成人
+ ///
+
+ [Display(Name="意愿征询完成人")]
+ [Column("IntendToConsultFinishUserName")]
+ [DataMember]
+ public string IntendToConsultFinishUserName {get;set;}
+ ///
+ /// 预评估是否完成
+ ///
+
+ [Display(Name="预评估是否完成")]
+ [Column("PreAssessIsFinish")]
+ [DataMember]
+ public bool PreAssessIsFinish {get;set;}
+ ///
+ /// 预评估完成时间
+ ///
+
+ [Display(Name="预评估完成时间")]
+ [Column("PreAssessDate")]
+ [DataMember]
+ public DateTime? PreAssessDate {get;set;}
+ ///
+ /// 预评估完成人ID
+ ///
+
+ [Display(Name="预评估完成人ID")]
+ [Column("PreAssessUserId")]
+ [DataMember]
+ public Guid? PreAssessUserId {get;set;}
+ ///
+ /// 预评估完成人
+ ///
+
+ [Display(Name="预评估完成人")]
+ [Column("PreAssessUserName")]
+ [DataMember]
+ public string PreAssessUserName {get;set;}
+ ///
+ /// 补偿方案征求意见是否完成
+ ///
+
+ [Display(Name="补偿方案征求意见是否完成")]
+ [Column("CompensationSchemeForAdviceIsFinish")]
+ [DataMember]
+ public bool CompensationSchemeForAdviceIsFinish {get;set;}
+ ///
+ /// 补偿方案征求意见完成时间
+ ///
+
+ [Display(Name="补偿方案征求意见完成时间")]
+ [Column("CompensationSchemeForAdviceDate")]
+ [DataMember]
+ public DateTime? CompensationSchemeForAdviceDate {get;set;}
+ ///
+ /// 补偿方案征求意见完成人ID
+ ///
+
+ [Display(Name="补偿方案征求意见完成人ID")]
+ [Column("CompensationSchemeForAdviceUserId")]
+ [DataMember]
+ public Guid? CompensationSchemeForAdviceUserId {get;set;}
+ ///
+ /// 补偿方案征求意见完成人
+ ///
+
+ [Display(Name="补偿方案征求意见完成人")]
+ [Column("CompensationSchemeForAdviceUserName")]
+ [DataMember]
+ public string CompensationSchemeForAdviceUserName {get;set;}
+ ///
+ /// 补偿方案审核是否完成
+ ///
+
+ [Display(Name="补偿方案审核是否完成")]
+ [Column("CompensationSchemeAuditIsFinish")]
+ [DataMember]
+ public bool CompensationSchemeAuditIsFinish {get;set;}
+ ///
+ /// 补偿方案审核完成时间
+ ///
+
+ [Display(Name="补偿方案审核完成时间")]
+ [Column("CompensationSchemeAuditDate")]
+ [DataMember]
+ public DateTime? CompensationSchemeAuditDate {get;set;}
+ ///
+ /// 补偿方案审核完成人ID
+ ///
+
+ [Display(Name="补偿方案审核完成人ID")]
+ [Column("CompensationSchemeAuditUserId")]
+ [DataMember]
+ public Guid? CompensationSchemeAuditUserId {get;set;}
+ ///
+ /// 补偿方案审核完成人
+ ///
+
+ [Display(Name="补偿方案审核完成人")]
+ [Column("CompensationSchemeAuditUserName")]
+ [DataMember]
+ public string CompensationSchemeAuditUserName {get;set;}
+ ///
+ /// 征收决定是否完成
+ ///
+
+ [Display(Name="征收决定是否完成")]
+ [Column("CollectDecisionIsFinish")]
+ [DataMember]
+ public bool CollectDecisionIsFinish {get;set;}
+ ///
+ /// 征收决定完成时间
+ ///
+
+ [Display(Name="征收决定完成时间")]
+ [Column("CollectDecisionDate")]
+ [DataMember]
+ public DateTime? CollectDecisionDate {get;set;}
+ ///
+ /// 征收决定完成人ID
+ ///
+
+ [Display(Name="征收决定完成人ID")]
+ [Column("CollectDecisionUserId")]
+ [DataMember]
+ public Guid? CollectDecisionUserId {get;set;}
+ ///
+ /// 征收决定完成人
+ ///
+
+ [Display(Name="征收决定完成人")]
+ [Column("CollectDecisionUserName")]
+ [DataMember]
+ public string CollectDecisionUserName {get;set;}
+ ///
+ /// 评估机构选定是否完成
+ ///
+
+ [Display(Name="评估机构选定是否完成")]
+ [Column("EvaluationUnitSelectedIsFinish")]
+ [DataMember]
+ public bool EvaluationUnitSelectedIsFinish {get;set;}
+ ///
+ /// 评估机构选定完成时间
+ ///
+
+ [Display(Name="评估机构选定完成时间")]
+ [Column("EvaluationUnitSelectedDate")]
+ [DataMember]
+ public DateTime? EvaluationUnitSelectedDate {get;set;}
+ ///
+ /// 评估机构选定完成人ID
+ ///
+
+ [Display(Name="评估机构选定完成人ID")]
+ [Column("EvaluationUnitSelectedUserId")]
+ [DataMember]
+ public Guid? EvaluationUnitSelectedUserId {get;set;}
+ ///
+ /// 评估机构选定完成人
+ ///
+
+ [Display(Name="评估机构选定完成人")]
+ [Column("EvaluationUnitSelectedUserName")]
+ [DataMember]
+ public string EvaluationUnitSelectedUserName {get;set;}
+ ///
+ /// 评估比准价备案是否完成
+ ///
+
+ [Display(Name="评估比准价备案是否完成")]
+ [Column("EvaluationPriceInRecordIsFinish")]
+ [DataMember]
+ public bool EvaluationPriceInRecordIsFinish {get;set;}
+ ///
+ /// 评估比准价备案完成时间
+ ///
+
+ [Display(Name="评估比准价备案完成时间")]
+ [Column("EvaluationPriceInRecordDate")]
+ [DataMember]
+ public DateTime? EvaluationPriceInRecordDate {get;set;}
+ ///
+ /// 评估比准价备案完成人ID
+ ///
+
+ [Display(Name="评估比准价备案完成人ID")]
+ [Column("EvaluationPriceInRecordUserId")]
+ [DataMember]
+ public Guid? EvaluationPriceInRecordUserId {get;set;}
+ ///
+ /// 评估比准价备案完成人
+ ///
+
+ [Display(Name="评估比准价备案完成人")]
+ [Column("EvaluationPriceInRecordUserName")]
+ [DataMember]
+ public string EvaluationPriceInRecordUserName {get;set;}
+ ///
+ /// 评估阶段是否完成
+ ///
+
+ [Display(Name="评估阶段是否完成")]
+ [Column("EvaluationIsFinish")]
+ [DataMember]
+ public bool EvaluationIsFinish {get;set;}
+ ///
+ /// 评估阶段完成时间
+ ///
+
+ [Display(Name="评估阶段完成时间")]
+ [Column("EvaluationDate")]
+ [DataMember]
+ public DateTime? EvaluationDate {get;set;}
+ ///
+ /// 评估阶段完成人ID
+ ///
+
+ [Display(Name="评估阶段完成人ID")]
+ [Column("EvaluationUserId")]
+ [DataMember]
+ public Guid? EvaluationUserId {get;set;}
+ ///
+ /// 评估阶段完成人
+ ///
+
+ [Display(Name="评估阶段完成人")]
+ [Column("EvaluationUserName")]
+ [DataMember]
+ public string EvaluationUserName {get;set;}
+ ///
+ /// 评估公示阶段是否完成
+ ///
+
+ [Display(Name="评估公示阶段是否完成")]
+ [Column("EvaluationPublicIsFinish")]
+ [DataMember]
+ public bool EvaluationPublicIsFinish {get;set;}
+ ///
+ /// 评估公示阶段完成时间
+ ///
+
+ [Display(Name="评估公示阶段完成时间")]
+ [Column("EvaluationPublicDate")]
+ [DataMember]
+ public DateTime? EvaluationPublicDate {get;set;}
+ ///
+ /// 评估公示阶段完成人ID
+ ///
+
+ [Display(Name="评估公示阶段完成人ID")]
+ [Column("EvaluationPublicUserId")]
+ [DataMember]
+ public Guid? EvaluationPublicUserId {get;set;}
+ ///
+ /// 评估公示阶段完成人
+ ///
+
+ [Display(Name="评估公示阶段完成人")]
+ [Column("EvaluationPublicUserName")]
+ [DataMember]
+ public string EvaluationPublicUserName {get;set;}
+ ///
+ /// 补偿协议签订阶段是否完成
+ ///
+
+ [Display(Name="补偿协议签订阶段是否完成")]
+ [Column("CompensationAgreeSignIsFinish")]
+ [DataMember]
+ public bool CompensationAgreeSignIsFinish {get;set;}
+ ///
+ /// 补偿协议签订阶段完成时间
+ ///
+
+ [Display(Name="补偿协议签订阶段完成时间")]
+ [Column("CompensationAgreeSignDate")]
+ [DataMember]
+ public DateTime? CompensationAgreeSignDate {get;set;}
+ ///
+ /// 补偿协议签订阶段完成人ID
+ ///
+
+ [Display(Name="补偿协议签订阶段完成人ID")]
+ [Column("CompensationAgreeSignUserId")]
+ [DataMember]
+ public Guid? CompensationAgreeSignUserId {get;set;}
+ ///
+ /// 补偿协议签订阶段完成人
+ ///
+
+ [Display(Name="补偿协议签订阶段完成人")]
+ [Column("CompensationAgreeSignUserName")]
+ [DataMember]
+ public string CompensationAgreeSignUserName {get;set;}
+ ///
+ /// 补偿决定阶段是否完成
+ ///
+
+ [Display(Name="补偿决定阶段是否完成")]
+ [Column("CompensationDecisionIsFinish")]
+ [DataMember]
+ public bool CompensationDecisionIsFinish {get;set;}
+ ///
+ /// 补偿决定阶段完成时间
+ ///
+
+ [Display(Name="补偿决定阶段完成时间")]
+ [Column("CompensationDecisionDate")]
+ [DataMember]
+ public DateTime? CompensationDecisionDate {get;set;}
+ ///
+ /// 补偿决定阶段完成人ID
+ ///
+
+ [Display(Name="补偿决定阶段完成人ID")]
+ [Column("CompensationDecisionUserId")]
+ [DataMember]
+ public Guid? CompensationDecisionUserId {get;set;}
+ ///
+ /// 补偿决定阶段完成人
+ ///
+
+ [Display(Name="补偿决定阶段完成人")]
+ [Column("CompensationDecisionUserName")]
+ [DataMember]
+ public string CompensationDecisionUserName {get;set;}
+ ///
+ /// 强制执行阶段是否完成
+ ///
+
+ [Display(Name="强制执行阶段是否完成")]
+ [Column("MandatoryExecIsFinish")]
+ [DataMember]
+ public bool MandatoryExecIsFinish {get;set;}
+ ///
+ /// 强制执行阶段完成时间
+ ///
+
+ [Display(Name="强制执行阶段完成时间")]
+ [Column("MandatoryExecDate")]
+ [DataMember]
+ public DateTime? MandatoryExecDate {get;set;}
+ ///
+ /// 强制执行阶段完成人ID
+ ///
+
+ [Display(Name="强制执行阶段完成人ID")]
+ [Column("MandatoryExecUserId")]
+ [DataMember]
+ public Guid? MandatoryExecUserId {get;set;}
+ ///
+ /// 强制执行阶段完成人
+ ///
+
+ [Display(Name="强制执行阶段完成人")]
+ [Column("MandatoryExecUserName")]
+ [DataMember]
+ public string MandatoryExecUserName {get;set;}
+ ///
+ /// 项目报结是否完成
+ ///
+
+ [Display(Name="项目报结是否完成")]
+ [Column("ProjectOverIsFinish")]
+ [DataMember]
+ public string ProjectOverIsFinish {get;set;}
+ ///
+ /// 项目报结完成时间
+ ///
+
+ [Display(Name="项目报结完成时间")]
+ [Column("ProjectOverDate")]
+ [DataMember]
+ public DateTime? ProjectOverDate {get;set;}
+ ///
+ /// 项目报结完成人ID
+ ///
+
+ [Display(Name="项目报结完成人ID")]
+ [Column("ProjectOverUserId")]
+ [DataMember]
+ public Guid? ProjectOverUserId {get;set;}
+ ///
+ /// 项目报结完成人
+ ///
+
+ [Display(Name="项目报结完成人")]
+ [Column("ProjectOverUserName")]
+ [DataMember]
+ public string ProjectOverUserName {get;set;}
+ ///
+ /// 创建人
+ ///
+
+ [Display(Name="创建人")]
+ [Column("CreateUserUserName")]
+ [DataMember]
+ public string CreateUserUserName {get;set;}
+ ///
+ /// 备案时间
+ ///
+
+ [Display(Name="备案时间")]
+ [Column("CreateRecordTime")]
+ [DataMember]
+ public DateTime? CreateRecordTime {get;set;}
+ ///
+ /// 备案人ID
+ ///
+
+ [Display(Name="备案人ID")]
+ [Column("CreateRecordUserId")]
+ [DataMember]
+ public Guid? CreateRecordUserId {get;set;}
+ ///
+ /// 备案人
+ ///
+
+ [Display(Name="备案人")]
+ [Column("CreateRecordUserName")]
+ [DataMember]
+ public string CreateRecordUserName {get;set;}
+ ///
+ /// 征收决定公告日期
+ ///
+
+ [Display(Name="征收决定公告日期")]
+ [Column("CollectDecisionNoticeDate")]
+ [DataMember]
+ public DateTime? CollectDecisionNoticeDate {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("GfBz")]
+ [DataMember]
+ public string GfBz {get;set;}
+ ///
+ /// 项目附件
+ ///
+
+ [Display(Name="项目附件")]
+ [Column("Files")]
+ [DataMember]
+ public string Files {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("XmFiles")]
+ [DataMember]
+ public string XmFiles {get;set;}
+ ///
+ /// 项目状态,到那个节点
+ ///
+
+ [Display(Name="项目状态,到那个节点")]
+ [Column("Status")]
+ [DataMember]
+ public int Status {get;set;}
+ ///
+ /// 征收实施单位ID,多个以逗号分隔
+ ///
+
+ [Display(Name="征收实施单位ID,多个以逗号分隔")]
+ [Column("CollectImplUnit")]
+ [DataMember]
+ public string CollectImplUnit {get;set;}
+ ///
+ /// 征收实施单位名称,多个以逗号分隔
+ ///
+
+ [Display(Name="征收实施单位名称,多个以逗号分隔")]
+ [Column("CollectImplUnitName")]
+ [DataMember]
+ public string CollectImplUnitName {get;set;}
+ ///
+ /// 征收实施单位法人代码证号,多个以逗号分隔
+ ///
+
+ [Display(Name="征收实施单位法人代码证号,多个以逗号分隔")]
+ [Column("CollectImplUnitBusinessLicenseNo")]
+ [DataMember]
+ public string CollectImplUnitBusinessLicenseNo {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("ZhosuseNo")]
+ [DataMember]
+ public string ZhosuseNo {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("ZStreet")]
+ [DataMember]
+ public string ZStreet {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("GovName")]
+ [DataMember]
+ public string GovName {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("CourtName")]
+ [DataMember]
+ public string CourtName {get;set;}
+ ///
+ /// 公开系统排序
+ ///
+
+ [Display(Name="公开系统排序")]
+ [Column("GkxtPx")]
+ [DataMember]
+ public string GkxtPx {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("ApplyFiles")]
+ [DataMember]
+ public string ApplyFiles {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("LSBC")]
+ [DataMember]
+ public decimal? LSBC {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("HBBC")]
+ [DataMember]
+ public decimal? HBBC {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("YCXBC")]
+ [DataMember]
+ public decimal? YCXBC {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("CQMJZGX")]
+ [DataMember]
+ public decimal? CQMJZGX {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("CQBC")]
+ [DataMember]
+ public decimal? CQBC {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("QYBC")]
+ [DataMember]
+ public decimal? QYBC {get;set;}
+ ///
+ /// 搬迁补偿
+ ///
+
+ [Display(Name="搬迁补偿")]
+ [Column("BQBC")]
+ [DataMember]
+ public decimal BQBC {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("YCXZDX")]
+ [DataMember]
+ public decimal? YCXZDX {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("LSZDX")]
+ [DataMember]
+ public decimal? LSZDX {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("QYZDX")]
+ [DataMember]
+ public decimal? QYZDX {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("BQZDX")]
+ [DataMember]
+ public decimal BQZDX {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("FHBBC200")]
+ [DataMember]
+ public decimal? FHBBC200 {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("FHBBC25")]
+ [DataMember]
+ public decimal? FHBBC25 {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("FHBBC500")]
+ [DataMember]
+ public decimal? FHBBC500 {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("FHBBCOther")]
+ [DataMember]
+ public decimal? FHBBCOther {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("FYCLSSY")]
+ [DataMember]
+ public decimal? FYCLSSY {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("FYCLSBG")]
+ [DataMember]
+ public decimal? FYCLSBG {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("FYCLSGY")]
+ [DataMember]
+ public decimal? FYCLSGY {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("FYCLSCC")]
+ [DataMember]
+ public decimal? FYCLSCC {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("SYMJBZ")]
+ [DataMember]
+ public decimal? SYMJBZ {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("BGMJBZ")]
+ [DataMember]
+ public decimal? BGMJBZ {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("GYMJBZ")]
+ [DataMember]
+ public decimal? GYMJBZ {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("CCMJBZ")]
+ [DataMember]
+ public decimal? CCMJBZ {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("BGRJL")]
+ [DataMember]
+ public decimal? BGRJL {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("GYRJL")]
+ [DataMember]
+ public decimal? GYRJL {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("CCRJL")]
+ [DataMember]
+ public decimal? CCRJL {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("FTCTY")]
+ [DataMember]
+ public decimal? FTCTY {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("YGRegulations")]
+ [DataMember]
+ public string YGRegulations {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("FGfbz")]
+ [DataMember]
+ public string FGfbz {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("FQYBC")]
+ [DataMember]
+ public decimal? FQYBC {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("CQMJZDX")]
+ [DataMember]
+ public decimal? CQMJZDX {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("ZSJDBQQXZDY")]
+ [DataMember]
+ public string ZSJDBQQXZDY {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("BQRQZDY")]
+ [DataMember]
+ public string BQRQZDY {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("BQRQZDY1")]
+ [DataMember]
+ public string BQRQZDY1 {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("PStatus")]
+ [DataMember]
+ public int PStatus {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("PGJGSended")]
+ [DataMember]
+ public bool PGJGSended {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("ZSJDSended")]
+ [DataMember]
+ public bool ZSJDSended {get;set;}
+ ///
+ /// 增加面积比例
+ ///
+
+ [Display(Name="增加面积比例")]
+ [Column("AddMjBL")]
+ [DataMember]
+ public decimal? AddMjBL {get;set;}
+ ///
+ /// 增加面积最小值
+ ///
+
+ [Display(Name="增加面积最小值")]
+ [Column("AddMjMin")]
+ [DataMember]
+ public decimal? AddMjMin {get;set;}
+ ///
+ /// 增加面积最大值
+ ///
+
+ [Display(Name="增加面积最大值")]
+ [Column("AddMjMax")]
+ [DataMember]
+ public decimal? AddMjMax {get;set;}
+ ///
+ /// 增加面积结算金额比例
+ ///
+
+ [Display(Name="增加面积结算金额比例")]
+ [Column("AddMjJsBL")]
+ [DataMember]
+ public decimal? AddMjJsBL {get;set;}
+ ///
+ /// 项目状态
+ ///
+
+ [Display(Name="项目状态")]
+ [Column("PSMarks")]
+ [DataMember]
+ public string PSMarks {get;set;}
+ ///
+ /// 增加面积结算基准价格
+ ///
+
+ [Display(Name="增加面积结算基准价格")]
+ [Column("AddMjJSJZJ")]
+ [DataMember]
+ public decimal? AddMjJSJZJ {get;set;}
+ ///
+ /// 购房补助区外
+ ///
+
+ [Display(Name="购房补助区外")]
+ [Column("Gfbz_Out")]
+ [DataMember]
+ public string Gfbz_Out {get;set;}
+ ///
+ /// 非购房补助区外
+ ///
+
+ [Display(Name="非购房补助区外")]
+ [Column("FGfbz_Out")]
+ [DataMember]
+ public string FGfbz_Out {get;set;}
+ ///
+ /// 是否市区
+ ///
+
+ [Display(Name="是否市区")]
+ [Column("IsCity")]
+ [DataMember]
+ public string IsCity {get;set;}
+ ///
+ /// 下级判断
+ ///
+
+ [Display(Name="下级判断")]
+ [Column("IsNext")]
+ [DataMember]
+ public string IsNext {get;set;}
+ ///
+ /// 购买区域
+ ///
+
+ [Display(Name="购买区域")]
+ [Column("BuyArea")]
+ [DataMember]
+ public string BuyArea {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("QYBL")]
+ [DataMember]
+ public string QYBL {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("HBHL")]
+ [DataMember]
+ public string HBHL {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Num")]
+ [DataMember]
+ public int Num {get;set;}
+ ///
+ /// 补助面积结算金额比例
+ ///
+
+ [Display(Name="补助面积结算金额比例")]
+ [Column("BZMJJSBL")]
+ [DataMember]
+ public decimal? BZMJJSBL {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("QzhName")]
+ [DataMember]
+ public string QzhName {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("XmIsTrue")]
+ [DataMember]
+ public string XmIsTrue {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("IsPublic")]
+ [DataMember]
+ public string IsPublic {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("EdContent")]
+ [DataMember]
+ public string EdContent {get;set;}
+ ///
+ /// 规定期限内房票补偿比例
+ ///
+
+ [Display(Name="规定期限内房票补偿比例")]
+ [Column("HouseTicket")]
+ [DataMember]
+ public decimal? HouseTicket {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("OverFiles")]
+ [DataMember]
+ public string OverFiles {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Px")]
+ [DataMember]
+ public int? Px {get;set;}
+ ///
+ /// 超容积率土地面积计算容积率标准
+ ///
+
+ [Display(Name="超容积率土地面积计算容积率标准")]
+ [Column("ExceedLandAreaRatio")]
+ [DataMember]
+ public decimal? ExceedLandAreaRatio {get;set;}
+ ///
+ /// 非住宅搬迁期限类型
+ ///
+
+ [Display(Name="非住宅搬迁期限类型")]
+ [Column("FZZ_ZSJDBQQXZDY")]
+ [DataMember]
+ public string FZZ_ZSJDBQQXZDY {get;set;}
+ ///
+ /// 非住宅搬迁期限小限
+ ///
+
+ [Display(Name="非住宅搬迁期限小限")]
+ [Column("FZZ_BQRQZDY1")]
+ [DataMember]
+ public string FZZ_BQRQZDY1 {get;set;}
+ ///
+ /// 非住宅搬迁期限大限
+ ///
+
+ [Display(Name="非住宅搬迁期限大限")]
+ [Column("FZZ_BQRQZDY")]
+ [DataMember]
+ public string FZZ_BQRQZDY {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("CKLS")]
+ [DataMember]
+ public decimal? CKLS {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("CKMJBZ")]
+ [DataMember]
+ public decimal? CKMJBZ {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("CKYJL")]
+ [DataMember]
+ public decimal? CKYJL {get;set;}
+ ///
+ /// 预计作出征收决定时间
+ ///
+
+ [Display(Name="预计作出征收决定时间")]
+ [Column("YjTime")]
+ [DataMember]
+ public DateTime? YjTime {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("XmBazt")]
+ [DataMember]
+ public int XmBazt {get;set;}
+ ///
+ /// 临时过渡费补助标准
+ ///
+
+ [Display(Name="临时过渡费补助标准")]
+ [Column("TemporaryMoneyReward")]
+ [DataMember]
+ public decimal? TemporaryMoneyReward {get;set;}
+ ///
+ /// 放弃住宅购房补助货币补偿
+ ///
+
+ [Display(Name="放弃住宅购房补助货币补偿")]
+ [Column("CompensationAfterWaiverSubsidy")]
+ [DataMember]
+ public decimal CompensationAfterWaiverSubsidy {get;set;}
+ ///
+ /// 放弃非住宅购房补助货币补偿
+ ///
+
+ [Display(Name="放弃非住宅购房补助货币补偿")]
+ [Column("NonCompensationAfterWaiverSubsidy")]
+ [DataMember]
+ public decimal NonCompensationAfterWaiverSubsidy {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("ResidentialSignNum")]
+ [DataMember]
+ public int ResidentialSignNum {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("NonResidentialSignNum")]
+ [DataMember]
+ public int NonResidentialSignNum {get;set;}
+ ///
+ /// 评估报告
+ ///
+
+ [Display(Name="评估报告")]
+ [Column("AssessmentReport")]
+ [DataMember]
+ public string AssessmentReport {get;set;}
+
+ }
+
+ /**
+ ///
+ /// 数据表实体类Map:Projects
+ ///
+ public class ProjectsMap : EntityTypeConfiguration
+ {
+ public ProjectsMap()
+ {
+ this.ToTable("Projects");
+ this.HasKey(t => t.ID);
+ this.Property(t => t.PlanID).HasColumnName("PlanID");
+ this.Property(t => t.Name).HasColumnName("Name");
+ this.Property(t => t.No).HasColumnName("No");
+ this.Property(t => t.IsTest).HasColumnName("IsTest").IsRequired();
+ this.Property(t => t.AreaID).HasColumnName("AreaID");
+ this.Property(t => t.Area).HasColumnName("Area");
+ this.Property(t => t.CollectTypeID).HasColumnName("CollectTypeID");
+ this.Property(t => t.CollectType).HasColumnName("CollectType");
+ this.Property(t => t.ConstructionActivitiesSubject).HasColumnName("ConstructionActivitiesSubject");
+ this.Property(t => t.CollectDecisionNoHeadID).HasColumnName("CollectDecisionNoHeadID");
+ this.Property(t => t.CollectDecisionNoHeadName).HasColumnName("CollectDecisionNoHeadName");
+ this.Property(t => t.CollectDecisionNo1).HasColumnName("CollectDecisionNo1");
+ this.Property(t => t.CollectDecisionNo2).HasColumnName("CollectDecisionNo2");
+ this.Property(t => t.CollectAllNum).HasColumnName("CollectAllNum").IsRequired();
+ this.Property(t => t.ResidentialCollectCount).HasColumnName("ResidentialCollectCount").IsRequired();
+ this.Property(t => t.NonResidentialCollectCount).HasColumnName("NonResidentialCollectCount").IsRequired();
+ this.Property(t => t.CollectAllArea).HasColumnName("CollectAllArea");
+ this.Property(t => t.ResidentialCollectArea).HasColumnName("ResidentialCollectArea");
+ this.Property(t => t.NonResidentialCollectArea).HasColumnName("NonResidentialCollectArea");
+ this.Property(t => t.BudgetMoney).HasColumnName("BudgetMoney");
+ this.Property(t => t.OneTimeCompensationStandardRelocation).HasColumnName("OneTimeCompensationStandardRelocation");
+ this.Property(t => t.TemporaryRelocationAllowance).HasColumnName("TemporaryRelocationAllowance");
+ this.Property(t => t.CollectRange).HasColumnName("CollectRange");
+ this.Property(t => t.DataSubmittedApplications).HasColumnName("DataSubmittedApplications");
+ this.Property(t => t.HouseAcquisitionDepartmentID).HasColumnName("HouseAcquisitionDepartmentID");
+ this.Property(t => t.HouseAcquisitionDepartment).HasColumnName("HouseAcquisitionDepartment");
+ this.Property(t => t.HADLegalRepresentative).HasColumnName("HADLegalRepresentative");
+ this.Property(t => t.HADBusinessLicenseNo).HasColumnName("HADBusinessLicenseNo");
+ this.Property(t => t.EvaluationCompanyID).HasColumnName("EvaluationCompanyID");
+ this.Property(t => t.EvaluationCompany).HasColumnName("EvaluationCompany");
+ this.Property(t => t.QualificationLevel).HasColumnName("QualificationLevel");
+ this.Property(t => t.HouseEvaluationApprovePrice).HasColumnName("HouseEvaluationApprovePrice");
+ this.Property(t => t.AllocationHouseEvaluationApprovePrice).HasColumnName("AllocationHouseEvaluationApprovePrice");
+ this.Property(t => t.AllocationHouseAllNum).HasColumnName("AllocationHouseAllNum");
+ this.Property(t => t.AllocationHouseUsedNum).HasColumnName("AllocationHouseUsedNum");
+ this.Property(t => t.AllocationHouseRemainingNum).HasColumnName("AllocationHouseRemainingNum");
+ this.Property(t => t.AllocationHouseXFAllNum).HasColumnName("AllocationHouseXFAllNum");
+ this.Property(t => t.AllocationHouseXFUsedNum).HasColumnName("AllocationHouseXFUsedNum");
+ this.Property(t => t.AllocationHouseXFRemainingNum).HasColumnName("AllocationHouseXFRemainingNum");
+ this.Property(t => t.AllocationHouseQFAllNum).HasColumnName("AllocationHouseQFAllNum");
+ this.Property(t => t.AllocationHouseQFUsedNum).HasColumnName("AllocationHouseQFUsedNum");
+ this.Property(t => t.AllocationHouseQFRemainingNum).HasColumnName("AllocationHouseQFRemainingNum");
+ this.Property(t => t.Phone).HasColumnName("Phone");
+ this.Property(t => t.ContractPeriod).HasColumnName("ContractPeriod");
+ this.Property(t => t.TheRelocationPeriod).HasColumnName("TheRelocationPeriod");
+ this.Property(t => t.TheRelocationPeriod1).HasColumnName("TheRelocationPeriod1");
+ this.Property(t => t.ContractPeriod1).HasColumnName("ContractPeriod1");
+ this.Property(t => t.RenewTime).HasColumnName("RenewTime");
+ this.Property(t => t.RenewTime1).HasColumnName("RenewTime1");
+ this.Property(t => t.OtherWayCollectNum).HasColumnName("OtherWayCollectNum").IsRequired();
+ this.Property(t => t.OtherWaySituation).HasColumnName("OtherWaySituation");
+ this.Property(t => t.IsInCityCenter).HasColumnName("IsInCityCenter");
+ this.Property(t => t.AgreementTakeEffectRatio).HasColumnName("AgreementTakeEffectRatio");
+ this.Property(t => t.IntendToConsultRatio).HasColumnName("IntendToConsultRatio");
+ this.Property(t => t.ProjectSignRatio).HasColumnName("ProjectSignRatio");
+ this.Property(t => t.OpinionFeedbackDeadline).HasColumnName("OpinionFeedbackDeadline");
+ this.Property(t => t.FeedbackDepartment).HasColumnName("FeedbackDepartment");
+ this.Property(t => t.FeedbackAddr).HasColumnName("FeedbackAddr");
+ this.Property(t => t.FeedbackPhone).HasColumnName("FeedbackPhone");
+ this.Property(t => t.TemporaryResettlementCompensationStandard).HasColumnName("TemporaryResettlementCompensationStandard");
+ this.Property(t => t.ProjectIsFinish).HasColumnName("ProjectIsFinish");
+ this.Property(t => t.ProjectFinishDate).HasColumnName("ProjectFinishDate");
+ this.Property(t => t.ProjectFinishUserId).HasColumnName("ProjectFinishUserId");
+ this.Property(t => t.ProjectFinishUserName).HasColumnName("ProjectFinishUserName");
+ this.Property(t => t.InvestigateTIsFinish).HasColumnName("InvestigateTIsFinish");
+ this.Property(t => t.InvestigateTDate).HasColumnName("InvestigateTDate");
+ this.Property(t => t.InvestigateTUserId).HasColumnName("InvestigateTUserId");
+ this.Property(t => t.InvestigateTUserName).HasColumnName("InvestigateTUserName");
+ this.Property(t => t.IntendToConsultIsFinish).HasColumnName("IntendToConsultIsFinish");
+ this.Property(t => t.IntendToConsultFinishDate).HasColumnName("IntendToConsultFinishDate");
+ this.Property(t => t.IntendToConsultFinishUserId).HasColumnName("IntendToConsultFinishUserId");
+ this.Property(t => t.IntendToConsultFinishUserName).HasColumnName("IntendToConsultFinishUserName");
+ this.Property(t => t.PreAssessIsFinish).HasColumnName("PreAssessIsFinish");
+ this.Property(t => t.PreAssessDate).HasColumnName("PreAssessDate");
+ this.Property(t => t.PreAssessUserId).HasColumnName("PreAssessUserId");
+ this.Property(t => t.PreAssessUserName).HasColumnName("PreAssessUserName");
+ this.Property(t => t.CompensationSchemeForAdviceIsFinish).HasColumnName("CompensationSchemeForAdviceIsFinish");
+ this.Property(t => t.CompensationSchemeForAdviceDate).HasColumnName("CompensationSchemeForAdviceDate");
+ this.Property(t => t.CompensationSchemeForAdviceUserId).HasColumnName("CompensationSchemeForAdviceUserId");
+ this.Property(t => t.CompensationSchemeForAdviceUserName).HasColumnName("CompensationSchemeForAdviceUserName");
+ this.Property(t => t.CompensationSchemeAuditIsFinish).HasColumnName("CompensationSchemeAuditIsFinish");
+ this.Property(t => t.CompensationSchemeAuditDate).HasColumnName("CompensationSchemeAuditDate");
+ this.Property(t => t.CompensationSchemeAuditUserId).HasColumnName("CompensationSchemeAuditUserId");
+ this.Property(t => t.CompensationSchemeAuditUserName).HasColumnName("CompensationSchemeAuditUserName");
+ this.Property(t => t.CollectDecisionIsFinish).HasColumnName("CollectDecisionIsFinish");
+ this.Property(t => t.CollectDecisionDate).HasColumnName("CollectDecisionDate");
+ this.Property(t => t.CollectDecisionUserId).HasColumnName("CollectDecisionUserId");
+ this.Property(t => t.CollectDecisionUserName).HasColumnName("CollectDecisionUserName");
+ this.Property(t => t.EvaluationUnitSelectedIsFinish).HasColumnName("EvaluationUnitSelectedIsFinish");
+ this.Property(t => t.EvaluationUnitSelectedDate).HasColumnName("EvaluationUnitSelectedDate");
+ this.Property(t => t.EvaluationUnitSelectedUserId).HasColumnName("EvaluationUnitSelectedUserId");
+ this.Property(t => t.EvaluationUnitSelectedUserName).HasColumnName("EvaluationUnitSelectedUserName");
+ this.Property(t => t.EvaluationPriceInRecordIsFinish).HasColumnName("EvaluationPriceInRecordIsFinish");
+ this.Property(t => t.EvaluationPriceInRecordDate).HasColumnName("EvaluationPriceInRecordDate");
+ this.Property(t => t.EvaluationPriceInRecordUserId).HasColumnName("EvaluationPriceInRecordUserId");
+ this.Property(t => t.EvaluationPriceInRecordUserName).HasColumnName("EvaluationPriceInRecordUserName");
+ this.Property(t => t.EvaluationIsFinish).HasColumnName("EvaluationIsFinish");
+ this.Property(t => t.EvaluationDate).HasColumnName("EvaluationDate");
+ this.Property(t => t.EvaluationUserId).HasColumnName("EvaluationUserId");
+ this.Property(t => t.EvaluationUserName).HasColumnName("EvaluationUserName");
+ this.Property(t => t.EvaluationPublicIsFinish).HasColumnName("EvaluationPublicIsFinish");
+ this.Property(t => t.EvaluationPublicDate).HasColumnName("EvaluationPublicDate");
+ this.Property(t => t.EvaluationPublicUserId).HasColumnName("EvaluationPublicUserId");
+ this.Property(t => t.EvaluationPublicUserName).HasColumnName("EvaluationPublicUserName");
+ this.Property(t => t.CompensationAgreeSignIsFinish).HasColumnName("CompensationAgreeSignIsFinish");
+ this.Property(t => t.CompensationAgreeSignDate).HasColumnName("CompensationAgreeSignDate");
+ this.Property(t => t.CompensationAgreeSignUserId).HasColumnName("CompensationAgreeSignUserId");
+ this.Property(t => t.CompensationAgreeSignUserName).HasColumnName("CompensationAgreeSignUserName");
+ this.Property(t => t.CompensationDecisionIsFinish).HasColumnName("CompensationDecisionIsFinish");
+ this.Property(t => t.CompensationDecisionDate).HasColumnName("CompensationDecisionDate");
+ this.Property(t => t.CompensationDecisionUserId).HasColumnName("CompensationDecisionUserId");
+ this.Property(t => t.CompensationDecisionUserName).HasColumnName("CompensationDecisionUserName");
+ this.Property(t => t.MandatoryExecIsFinish).HasColumnName("MandatoryExecIsFinish");
+ this.Property(t => t.MandatoryExecDate).HasColumnName("MandatoryExecDate");
+ this.Property(t => t.MandatoryExecUserId).HasColumnName("MandatoryExecUserId");
+ this.Property(t => t.MandatoryExecUserName).HasColumnName("MandatoryExecUserName");
+ this.Property(t => t.ProjectOverIsFinish).HasColumnName("ProjectOverIsFinish");
+ this.Property(t => t.ProjectOverDate).HasColumnName("ProjectOverDate");
+ this.Property(t => t.ProjectOverUserId).HasColumnName("ProjectOverUserId");
+ this.Property(t => t.ProjectOverUserName).HasColumnName("ProjectOverUserName");
+ this.Property(t => t.CreateTime).HasColumnName("CreateTime");
+ this.Property(t => t.CreateUserId).HasColumnName("CreateUserId");
+ this.Property(t => t.CreateUserUserName).HasColumnName("CreateUserUserName");
+ this.Property(t => t.CreateRecordTime).HasColumnName("CreateRecordTime");
+ this.Property(t => t.CreateRecordUserId).HasColumnName("CreateRecordUserId");
+ this.Property(t => t.CreateRecordUserName).HasColumnName("CreateRecordUserName");
+ this.Property(t => t.CollectDecisionNoticeDate).HasColumnName("CollectDecisionNoticeDate");
+ this.Property(t => t.GfBz).HasColumnName("GfBz");
+ this.Property(t => t.Files).HasColumnName("Files");
+ this.Property(t => t.XmFiles).HasColumnName("XmFiles");
+ this.Property(t => t.IsDeleted).HasColumnName("IsDeleted");
+ this.Property(t => t.Status).HasColumnName("Status").IsRequired();
+ this.Property(t => t.CollectImplUnit).HasColumnName("CollectImplUnit");
+ this.Property(t => t.CollectImplUnitName).HasColumnName("CollectImplUnitName");
+ this.Property(t => t.CollectImplUnitBusinessLicenseNo).HasColumnName("CollectImplUnitBusinessLicenseNo");
+ this.Property(t => t.ZhosuseNo).HasColumnName("ZhosuseNo");
+ this.Property(t => t.ZStreet).HasColumnName("ZStreet");
+ this.Property(t => t.GovName).HasColumnName("GovName");
+ this.Property(t => t.CourtName).HasColumnName("CourtName");
+ this.Property(t => t.GkxtPx).HasColumnName("GkxtPx");
+ this.Property(t => t.ApplyFiles).HasColumnName("ApplyFiles");
+ this.Property(t => t.LSBC).HasColumnName("LSBC");
+ this.Property(t => t.HBBC).HasColumnName("HBBC");
+ this.Property(t => t.YCXBC).HasColumnName("YCXBC");
+ this.Property(t => t.CQMJZGX).HasColumnName("CQMJZGX");
+ this.Property(t => t.CQBC).HasColumnName("CQBC");
+ this.Property(t => t.QYBC).HasColumnName("QYBC");
+ this.Property(t => t.BQBC).HasColumnName("BQBC").IsRequired();
+ this.Property(t => t.YCXZDX).HasColumnName("YCXZDX");
+ this.Property(t => t.LSZDX).HasColumnName("LSZDX");
+ this.Property(t => t.QYZDX).HasColumnName("QYZDX");
+ this.Property(t => t.BQZDX).HasColumnName("BQZDX").IsRequired();
+ this.Property(t => t.FHBBC200).HasColumnName("FHBBC200");
+ this.Property(t => t.FHBBC25).HasColumnName("FHBBC25");
+ this.Property(t => t.FHBBC500).HasColumnName("FHBBC500");
+ this.Property(t => t.FHBBCOther).HasColumnName("FHBBCOther");
+ this.Property(t => t.FYCLSSY).HasColumnName("FYCLSSY");
+ this.Property(t => t.FYCLSBG).HasColumnName("FYCLSBG");
+ this.Property(t => t.FYCLSGY).HasColumnName("FYCLSGY");
+ this.Property(t => t.FYCLSCC).HasColumnName("FYCLSCC");
+ this.Property(t => t.SYMJBZ).HasColumnName("SYMJBZ");
+ this.Property(t => t.BGMJBZ).HasColumnName("BGMJBZ");
+ this.Property(t => t.GYMJBZ).HasColumnName("GYMJBZ");
+ this.Property(t => t.CCMJBZ).HasColumnName("CCMJBZ");
+ this.Property(t => t.BGRJL).HasColumnName("BGRJL");
+ this.Property(t => t.GYRJL).HasColumnName("GYRJL");
+ this.Property(t => t.CCRJL).HasColumnName("CCRJL");
+ this.Property(t => t.FTCTY).HasColumnName("FTCTY");
+ this.Property(t => t.YGRegulations).HasColumnName("YGRegulations");
+ this.Property(t => t.FGfbz).HasColumnName("FGfbz");
+ this.Property(t => t.FQYBC).HasColumnName("FQYBC");
+ this.Property(t => t.CQMJZDX).HasColumnName("CQMJZDX");
+ this.Property(t => t.ZSJDBQQXZDY).HasColumnName("ZSJDBQQXZDY");
+ this.Property(t => t.BQRQZDY).HasColumnName("BQRQZDY");
+ this.Property(t => t.BQRQZDY1).HasColumnName("BQRQZDY1");
+ this.Property(t => t.PStatus).HasColumnName("PStatus").IsRequired();
+ this.Property(t => t.PGJGSended).HasColumnName("PGJGSended").IsRequired();
+ this.Property(t => t.ZSJDSended).HasColumnName("ZSJDSended").IsRequired();
+ this.Property(t => t.AddMjBL).HasColumnName("AddMjBL");
+ this.Property(t => t.AddMjMin).HasColumnName("AddMjMin");
+ this.Property(t => t.AddMjMax).HasColumnName("AddMjMax");
+ this.Property(t => t.AddMjJsBL).HasColumnName("AddMjJsBL");
+ this.Property(t => t.PSMarks).HasColumnName("PSMarks");
+ this.Property(t => t.AddMjJSJZJ).HasColumnName("AddMjJSJZJ");
+ this.Property(t => t.Gfbz_Out).HasColumnName("Gfbz_Out");
+ this.Property(t => t.FGfbz_Out).HasColumnName("FGfbz_Out");
+ this.Property(t => t.IsCity).HasColumnName("IsCity");
+ this.Property(t => t.IsNext).HasColumnName("IsNext");
+ this.Property(t => t.BuyArea).HasColumnName("BuyArea");
+ this.Property(t => t.QYBL).HasColumnName("QYBL").IsRequired();
+ this.Property(t => t.HBHL).HasColumnName("HBHL").IsRequired();
+ this.Property(t => t.Num).HasColumnName("Num").IsRequired();
+ this.Property(t => t.BZMJJSBL).HasColumnName("BZMJJSBL");
+ this.Property(t => t.QzhName).HasColumnName("QzhName");
+ this.Property(t => t.XmIsTrue).HasColumnName("XmIsTrue");
+ this.Property(t => t.IsPublic).HasColumnName("IsPublic").IsRequired();
+ this.Property(t => t.EdContent).HasColumnName("EdContent");
+ this.Property(t => t.HouseTicket).HasColumnName("HouseTicket");
+ this.Property(t => t.OverFiles).HasColumnName("OverFiles");
+ this.Property(t => t.Px).HasColumnName("Px");
+ this.Property(t => t.ExceedLandAreaRatio).HasColumnName("ExceedLandAreaRatio");
+ this.Property(t => t.FZZ_ZSJDBQQXZDY).HasColumnName("FZZ_ZSJDBQQXZDY");
+ this.Property(t => t.FZZ_BQRQZDY1).HasColumnName("FZZ_BQRQZDY1");
+ this.Property(t => t.FZZ_BQRQZDY).HasColumnName("FZZ_BQRQZDY");
+ this.Property(t => t.CKLS).HasColumnName("CKLS");
+ this.Property(t => t.CKMJBZ).HasColumnName("CKMJBZ");
+ this.Property(t => t.CKYJL).HasColumnName("CKYJL");
+ this.Property(t => t.YjTime).HasColumnName("YjTime");
+ this.Property(t => t.XmBazt).HasColumnName("XmBazt").IsRequired();
+ this.Property(t => t.TemporaryMoneyReward).HasColumnName("TemporaryMoneyReward");
+ this.Property(t => t.CompensationAfterWaiverSubsidy).HasColumnName("CompensationAfterWaiverSubsidy").IsRequired();
+ this.Property(t => t.NonCompensationAfterWaiverSubsidy).HasColumnName("NonCompensationAfterWaiverSubsidy").IsRequired();
+ this.Property(t => t.ResidentialSignNum).HasColumnName("ResidentialSignNum").IsRequired();
+ this.Property(t => t.NonResidentialSignNum).HasColumnName("NonResidentialSignNum").IsRequired();
+ this.Property(t => t.AssessmentReport).HasColumnName("AssessmentReport");
+ }
+ }**/
+
+ }
+
+ //----------Projects结束----------
+
+
\ No newline at end of file
diff --git a/Ewide.Nbzs.Entity/DataBase/ResidentialAgreement.cs b/Ewide.Nbzs.Entity/DataBase/ResidentialAgreement.cs
new file mode 100644
index 0000000..04cb843
--- /dev/null
+++ b/Ewide.Nbzs.Entity/DataBase/ResidentialAgreement.cs
@@ -0,0 +1,2052 @@
+ //----------ResidentialAgreement开始----------
+
+ 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
+ {
+ ///
+ /// 数据表实体类:ResidentialAgreement
+ ///
+ [Table("ResidentialAgreement")]
+ public partial class ResidentialAgreement: BaseEntity {
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Key]
+ [Column("ID")]
+ [DataMember]
+ public Guid ID {get;set;}
+ ///
+ /// 项目id 关联Projects表ID
+ ///
+
+ [Display(Name="项目id 关联Projects表ID")]
+ [Column("ProjectID")]
+ [DataMember]
+ public Guid ProjectID {get;set;}
+ ///
+ /// 项目名称
+ ///
+
+ [Display(Name="项目名称")]
+ [Column("ProjectName")]
+ [DataMember]
+ public string ProjectName {get;set;}
+ ///
+ /// 调查表ID
+ ///
+
+ [Display(Name="调查表ID")]
+ [Column("InvestigateTableID")]
+ [DataMember]
+ public Guid? InvestigateTableID {get;set;}
+ ///
+ /// 征收决定号前置标识ID 取字典表ID
+ ///
+
+ [Display(Name="征收决定号前置标识ID 取字典表ID")]
+ [Column("CollectDecisionNoHeadID")]
+ [DataMember]
+ public Guid? CollectDecisionNoHeadID {get;set;}
+ ///
+ /// 征收决定号前置标识
+ ///
+
+ [Display(Name="征收决定号前置标识")]
+ [Column("CollectDecisionNoHeadName")]
+ [DataMember]
+ public string CollectDecisionNoHeadName {get;set;}
+ ///
+ /// 协议编号第一部分
+ ///
+
+ [Display(Name="协议编号第一部分")]
+ [Column("No1")]
+ [DataMember]
+ public string No1 {get;set;}
+ ///
+ /// 协议编号第二部分
+ ///
+
+ [Display(Name="协议编号第二部分")]
+ [Column("No2")]
+ [DataMember]
+ public string No2 {get;set;}
+ ///
+ /// 协议编号第三部分
+ ///
+
+ [Display(Name="协议编号第三部分")]
+ [Column("No3")]
+ [DataMember]
+ public string No3 {get;set;}
+ ///
+ /// 乙方ID,关联字典ID,记录乙方是被征收人还是承租人
+ ///
+
+ [Display(Name="乙方ID,关联字典ID,记录乙方是被征收人还是承租人")]
+ [Column("PartyBID")]
+ [DataMember]
+ public Guid? PartyBID {get;set;}
+ ///
+ /// 乙方名称:是被征收人还是承租人
+ ///
+
+ [Display(Name="乙方名称:是被征收人还是承租人")]
+ [Column("PartyBName")]
+ [DataMember]
+ public string PartyBName {get;set;}
+ ///
+ /// 协议中文件依据,按照XX等有关规定
+ ///
+
+ [Display(Name="协议中文件依据,按照XX等有关规定")]
+ [Column("FilesBasis")]
+ [DataMember]
+ public string FilesBasis {get;set;}
+ ///
+ /// 征收决定号
+ ///
+
+ [Display(Name="征收决定号")]
+ [Column("CollectDecisionNo")]
+ [DataMember]
+ public string CollectDecisionNo {get;set;}
+ ///
+ /// 被征收人姓名
+ ///
+
+ [Display(Name="被征收人姓名")]
+ [Column("ExpropriatedName")]
+ [DataMember]
+ public string ExpropriatedName {get;set;}
+ ///
+ /// 被征收人身份证
+ ///
+
+ [Display(Name="被征收人身份证")]
+ [Column("ExpropriatedCardNo")]
+ [DataMember]
+ public string ExpropriatedCardNo {get;set;}
+ ///
+ /// 被拆迁人电话
+ ///
+
+ [Display(Name="被拆迁人电话")]
+ [Column("ExpropriatedPhone")]
+ [DataMember]
+ public string ExpropriatedPhone {get;set;}
+ ///
+ /// 被拆迁人地址
+ ///
+
+ [Display(Name="被拆迁人地址")]
+ [Column("ExpropriatedAddr")]
+ [DataMember]
+ public string ExpropriatedAddr {get;set;}
+ ///
+ /// 被征收人性质ID 关联数据字典表ID
+ ///
+
+ [Display(Name="被征收人性质ID 关联数据字典表ID")]
+ [Column("ExpropriatedNatureID")]
+ [DataMember]
+ public Guid? ExpropriatedNatureID {get;set;}
+ ///
+ /// 被征收人性质
+ ///
+
+ [Display(Name="被征收人性质")]
+ [Column("ExpropriatedNature")]
+ [DataMember]
+ public string ExpropriatedNature {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Gfbz")]
+ [DataMember]
+ public string Gfbz {get;set;}
+ ///
+ /// 区域ID 关联字典表ID
+ ///
+
+ [Display(Name="区域ID 关联字典表ID ")]
+ [Column("AreaID")]
+ [DataMember]
+ public Guid? AreaID {get;set;}
+ ///
+ /// 区域
+ ///
+
+ [Display(Name="区域")]
+ [Column("Area")]
+ [DataMember]
+ public string Area {get;set;}
+ ///
+ /// 被征收房屋地址
+ ///
+
+ [Display(Name="被征收房屋地址")]
+ [Column("HouseAddress")]
+ [DataMember]
+ public string HouseAddress {get;set;}
+ ///
+ /// 地段等级ID 字典表ID
+ ///
+
+ [Display(Name="地段等级ID 字典表ID")]
+ [Column("LocationLevelID")]
+ [DataMember]
+ public Guid? LocationLevelID {get;set;}
+ ///
+ /// 地段等级
+ ///
+
+ [Display(Name="地段等级")]
+ [Column("LocationLevel")]
+ [DataMember]
+ public string LocationLevel {get;set;}
+ ///
+ /// 结构ID 字典表ID
+ ///
+
+ [Display(Name="结构ID 字典表ID")]
+ [Column("StructureID")]
+ [DataMember]
+ public string StructureID {get;set;}
+ ///
+ /// 结构
+ ///
+
+ [Display(Name="结构")]
+ [Column("Structure")]
+ [DataMember]
+ public string Structure {get;set;}
+ ///
+ /// 建筑面积
+ ///
+
+ [Display(Name="建筑面积")]
+ [Column("BuildingArea")]
+ [DataMember]
+ public float BuildingArea {get;set;}
+ ///
+ /// 使用情况ID 关联字典表ID
+ ///
+
+ [Display(Name="使用情况ID 关联字典表ID")]
+ [Column("UsageID")]
+ [DataMember]
+ public Guid? UsageID {get;set;}
+ ///
+ /// 使用情况、使用状况
+ ///
+
+ [Display(Name="使用情况、使用状况")]
+ [Column("Usage")]
+ [DataMember]
+ public string Usage {get;set;}
+ ///
+ /// 户籍人口数量
+ ///
+
+ [Display(Name="户籍人口数量")]
+ [Column("Population")]
+ [DataMember]
+ public int? Population {get;set;}
+ ///
+ /// 是否成套房
+ ///
+
+ [Display(Name="是否成套房")]
+ [Column("IsSuite")]
+ [DataMember]
+ public bool IsSuite {get;set;}
+ ///
+ /// 产权人
+ ///
+
+ [Display(Name="产权人")]
+ [Column("PropertyRightPrson")]
+ [DataMember]
+ public string PropertyRightPrson {get;set;}
+ ///
+ /// 承租人
+ ///
+
+ [Display(Name="承租人")]
+ [Column("Lessee")]
+ [DataMember]
+ public string Lessee {get;set;}
+ ///
+ /// 承租人身份证号码
+ ///
+
+ [Display(Name="承租人身份证号码")]
+ [Column("LesseeCardNo")]
+ [DataMember]
+ public string LesseeCardNo {get;set;}
+ ///
+ /// 使用人口
+ ///
+
+ [Display(Name="使用人口")]
+ [Column("UsePopulation")]
+ [DataMember]
+ public int? UsePopulation {get;set;}
+ ///
+ /// 评估金额
+ ///
+
+ [Display(Name="评估金额")]
+ [Column("AssessMoney")]
+ [DataMember]
+ public decimal? AssessMoney {get;set;}
+ ///
+ /// 评估金额_大写
+ ///
+
+ [Display(Name="评估金额_大写")]
+ [Column("AssessMoney_DX")]
+ [DataMember]
+ public string AssessMoney_DX {get;set;}
+ ///
+ /// 合计应发补偿金额
+ ///
+
+ [Display(Name="合计应发补偿金额")]
+ [Column("SummationShouldCompensateMoney")]
+ [DataMember]
+ public decimal? SummationShouldCompensateMoney {get;set;}
+ ///
+ /// 合计应发补偿金额大写
+ ///
+
+ [Display(Name="合计应发补偿金额大写")]
+ [Column("SummationShouldCompensateMoney_DX")]
+ [DataMember]
+ public string SummationShouldCompensateMoney_DX {get;set;}
+ ///
+ /// 还未支付金额
+ ///
+
+ [Display(Name="还未支付金额")]
+ [Column("DidNotPayMoney")]
+ [DataMember]
+ public decimal? DidNotPayMoney {get;set;}
+ ///
+ /// 支付状态,0是未支付,1还未支付完,2是支付完
+ ///
+
+ [Display(Name="支付状态,0是未支付,1还未支付完,2是支付完")]
+ [Column("PayStatus")]
+ [DataMember]
+ public int? PayStatus {get;set;}
+ ///
+ /// 应核减房改购房资金
+ ///
+
+ [Display(Name="应核减房改购房资金")]
+ [Column("HouseReformMoney")]
+ [DataMember]
+ public decimal? HouseReformMoney {get;set;}
+ ///
+ /// 核减后征收补偿资金
+ ///
+
+ [Display(Name="核减后征收补偿资金")]
+ [Column("SubtractCompensation")]
+ [DataMember]
+ public decimal? SubtractCompensation {get;set;}
+ ///
+ /// 核减后征收补偿资金大写
+ ///
+
+ [Display(Name="核减后征收补偿资金大写")]
+ [Column("SubtractCompensation_DX")]
+ [DataMember]
+ public string SubtractCompensation_DX {get;set;}
+ ///
+ /// 成套补贴费
+ ///
+
+ [Display(Name="成套补贴费")]
+ [Column("SetSubsidy")]
+ [DataMember]
+ public decimal? SetSubsidy {get;set;}
+ ///
+ /// 提前搬迁奖励金额
+ ///
+
+ [Display(Name="提前搬迁奖励金额")]
+ [Column("AheadRelocatedRewardMoney")]
+ [DataMember]
+ public decimal? AheadRelocatedRewardMoney {get;set;}
+ ///
+ /// 临时安置补助费
+ ///
+
+ [Display(Name="临时安置补助费")]
+ [Column("TemporaryAllocationFee")]
+ [DataMember]
+ public decimal? TemporaryAllocationFee {get;set;}
+ ///
+ /// 其他事项约定
+ ///
+
+ [Display(Name="其他事项约定")]
+ [Column("OtherPromise")]
+ [DataMember]
+ public string OtherPromise {get;set;}
+ ///
+ /// 备注
+ ///
+
+ [Display(Name="备注")]
+ [Column("Memo")]
+ [DataMember]
+ public string Memo {get;set;}
+ ///
+ /// 合计征收补偿资金
+ ///
+
+ [Display(Name="合计征收补偿资金")]
+ [Column("TotalCompensateMoney")]
+ [DataMember]
+ public decimal? TotalCompensateMoney {get;set;}
+ ///
+ /// 合计征收补偿资金大写
+ ///
+
+ [Display(Name="合计征收补偿资金大写")]
+ [Column("TotalCompensateMoney_DX")]
+ [DataMember]
+ public string TotalCompensateMoney_DX {get;set;}
+ ///
+ /// 私租标志
+ ///
+
+ [Display(Name="私租标志")]
+ [Column("IsPrivateRent")]
+ [DataMember]
+ public bool IsPrivateRent {get;set;}
+ ///
+ /// 协议签订时间
+ ///
+
+ [Display(Name="协议签订时间")]
+ [Column("SignTime")]
+ [DataMember]
+ public DateTime? SignTime {get;set;}
+ ///
+ /// 拆迁人
+ ///
+
+ [Display(Name="拆迁人")]
+ [Column("DemolitionPerson")]
+ [DataMember]
+ public string DemolitionPerson {get;set;}
+ ///
+ /// 拆迁单位
+ ///
+
+ [Display(Name="拆迁单位")]
+ [Column("DemolitionUnit")]
+ [DataMember]
+ public string DemolitionUnit {get;set;}
+ ///
+ /// 经办人
+ ///
+
+ [Display(Name="经办人")]
+ [Column("Operator")]
+ [DataMember]
+ public string Operator {get;set;}
+ ///
+ /// 经办人电话
+ ///
+
+ [Display(Name="经办人电话")]
+ [Column("OperatorPhone")]
+ [DataMember]
+ public string OperatorPhone {get;set;}
+ ///
+ /// 产权单位
+ ///
+
+ [Display(Name="产权单位")]
+ [Column("PropertyRightsUnit")]
+ [DataMember]
+ public string PropertyRightsUnit {get;set;}
+ ///
+ /// 协议类型ID 关联字典表ID
+ ///
+
+ [Display(Name="协议类型ID 关联字典表ID")]
+ [Column("TypeID")]
+ [DataMember]
+ public Guid? TypeID {get;set;}
+ ///
+ /// 协议类型
+ ///
+
+ [Display(Name="协议类型")]
+ [Column("Type")]
+ [DataMember]
+ public string Type {get;set;}
+ ///
+ /// 是否备案
+ ///
+
+ [Display(Name="是否备案")]
+ [Column("IsInRecords")]
+ [DataMember]
+ public bool IsInRecords {get;set;}
+ ///
+ /// 备案人ID
+ ///
+
+ [Display(Name="备案人ID")]
+ [Column("InRecordPersonID")]
+ [DataMember]
+ public Guid? InRecordPersonID {get;set;}
+ ///
+ /// 备案人
+ ///
+
+ [Display(Name="备案人")]
+ [Column("InRecordPerson")]
+ [DataMember]
+ public string InRecordPerson {get;set;}
+ ///
+ /// 备案时间
+ ///
+
+ [Display(Name="备案时间")]
+ [Column("InRecordDate")]
+ [DataMember]
+ public DateTime? InRecordDate {get;set;}
+ ///
+ /// 房改意愿
+ ///
+
+ [Display(Name="房改意愿")]
+ [Column("IsHousingReform")]
+ [DataMember]
+ public bool IsHousingReform {get;set;}
+ ///
+ /// 补偿安置方式ID,调产方式ID 关联字典表ID
+ ///
+
+ [Display(Name="补偿安置方式ID,调产方式ID 关联字典表ID")]
+ [Column("SwitchProductionWayID")]
+ [DataMember]
+ public Guid? SwitchProductionWayID {get;set;}
+ ///
+ /// 补偿安置方式,调产方式
+ ///
+
+ [Display(Name="补偿安置方式,调产方式")]
+ [Column("SwitchProductionWay")]
+ [DataMember]
+ public string SwitchProductionWay {get;set;}
+ ///
+ /// 结合住房使用状况折算后补偿资金
+ ///
+
+ [Display(Name="结合住房使用状况折算后补偿资金")]
+ [Column("JHZFSYZKZSHBCZJ")]
+ [DataMember]
+ public decimal? JHZFSYZKZSHBCZJ {get;set;}
+ ///
+ /// 选择货币补偿增加补偿资金/房票协议时为房票补助
+ ///
+
+ [Display(Name="选择货币补偿增加补偿资金/房票协议时为房票补助")]
+ [Column("XZHBBCZJBCZJ")]
+ [DataMember]
+ public decimal? XZHBBCZJBCZJ {get;set;}
+ ///
+ /// 按住房困难标准增加补助资金
+ ///
+
+ [Display(Name="按住房困难标准增加补助资金")]
+ [Column("AZFKNBZZJBZZJ")]
+ [DataMember]
+ public decimal? AZFKNBZZJBZZJ {get;set;}
+ ///
+ /// 按补偿金额折算的产权调换面积
+ ///
+
+ [Display(Name="按补偿金额折算的产权调换面积")]
+ [Column("ABCJEZSDCQDHMJ")]
+ [DataMember]
+ public decimal? ABCJEZSDCQDHMJ {get;set;}
+ ///
+ /// 产权调换面积补助
+ ///
+
+ [Display(Name="产权调换面积补助")]
+ [Column("CQDHMJBZ")]
+ [DataMember]
+ public decimal? CQDHMJBZ {get;set;}
+ ///
+ /// 产权调换增加面积
+ ///
+
+ [Display(Name="产权调换增加面积")]
+ [Column("CQDHZJMJ")]
+ [DataMember]
+ public decimal? CQDHZJMJ {get;set;}
+ ///
+ /// 安置高层可增加公摊补助面积
+ ///
+
+ [Display(Name="安置高层可增加公摊补助面积")]
+ [Column("AZGCKZJGTBZMJ")]
+ [DataMember]
+ public decimal? AZGCKZJGTBZMJ {get;set;}
+ ///
+ /// 上靠增加面积
+ ///
+
+ [Display(Name="上靠增加面积")]
+ [Column("SKZJMJ")]
+ [DataMember]
+ public decimal? SKZJMJ {get;set;}
+ ///
+ /// 乙方产权调换房屋面积合计
+ ///
+
+ [Display(Name="乙方产权调换房屋面积合计")]
+ [Column("TotalAllocationArea")]
+ [DataMember]
+ public decimal? TotalAllocationArea {get;set;}
+ ///
+ /// 一次性搬迁补偿费
+ ///
+
+ [Display(Name="一次性搬迁补偿费")]
+ [Column("OneTimeRelocationCompensation")]
+ [DataMember]
+ public decimal? OneTimeRelocationCompensation {get;set;}
+ ///
+ /// 按困难补助标准计发补偿资金
+ ///
+
+ [Display(Name="按困难补助标准计发补偿资金")]
+ [Column("AKNBZBZJFBCZJ")]
+ [DataMember]
+ public decimal? AKNBZBZJFBCZJ {get;set;}
+ ///
+ /// 提前搬迁奖励比例
+ ///
+
+ [Display(Name="提前搬迁奖励比例")]
+ [Column("TQBQJLBL")]
+ [DataMember]
+ public decimal? TQBQJLBL {get;set;}
+ ///
+ /// 现房一次性临时安置费
+ ///
+
+ [Display(Name="现房一次性临时安置费")]
+ [Column("XFYCQLSAZF")]
+ [DataMember]
+ public decimal? XFYCQLSAZF {get;set;}
+ ///
+ /// 先行支付乙方征收补偿资金日数
+ ///
+
+ [Display(Name="先行支付乙方征收补偿资金日数")]
+ [Column("XYZFYFZSBCZJRS")]
+ [DataMember]
+ public int? XYZFYFZSBCZJRS {get;set;}
+ ///
+ /// 签订协议几日内先行支付乙方征收补偿资金
+ ///
+
+ [Display(Name="签订协议几日内先行支付乙方征收补偿资金")]
+ [Column("XYQDJRNXXZFYFZSBCZJ")]
+ [DataMember]
+ public decimal? XYQDJRNXXZFYFZSBCZJ {get;set;}
+ ///
+ /// 先行支付乙方征收补偿资金的余额
+ ///
+
+ [Display(Name="先行支付乙方征收补偿资金的余额")]
+ [Column("XXZFBCJEYE")]
+ [DataMember]
+ public decimal? XXZFBCJEYE {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("qtzfrq")]
+ [DataMember]
+ public string qtzfrq {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("qtqfrq")]
+ [DataMember]
+ public string qtqfrq {get;set;}
+ ///
+ /// 乙方保证搬迁日期
+ ///
+
+ [Display(Name="乙方保证搬迁日期")]
+ [Column("EnsureRelocateDate")]
+ [DataMember]
+ public DateTime? EnsureRelocateDate {get;set;}
+ ///
+ /// 公告规定的搬迁期限
+ ///
+
+ [Display(Name="公告规定的搬迁期限")]
+ [Column("GGGDDBQQX")]
+ [DataMember]
+ public string GGGDDBQQX {get;set;}
+ ///
+ /// 签约搬迁奖励在搬迁期限届满后几日支付
+ ///
+
+ [Display(Name="签约搬迁奖励在搬迁期限届满后几日支付")]
+ [Column("QYBQJLZBQQXJMHJRZF")]
+ [DataMember]
+ public int? QYBQJLZBQQXJMHJRZF {get;set;}
+ ///
+ /// 协议生效签约比例
+ ///
+
+ [Display(Name="协议生效签约比例")]
+ [Column("XYSXQYBL")]
+ [DataMember]
+ public string XYSXQYBL {get;set;}
+ ///
+ /// 住房困难补助资金
+ ///
+
+ [Display(Name="住房困难补助资金")]
+ [Column("ZFKNBZZJ")]
+ [DataMember]
+ public decimal? ZFKNBZZJ {get;set;}
+ ///
+ /// 低收入住房困难补偿金额
+ ///
+
+ [Display(Name="低收入住房困难补偿金额")]
+ [Column("DSRZFKNBCJE")]
+ [DataMember]
+ public decimal? DSRZFKNBCJE {get;set;}
+ ///
+ /// 签约搬迁奖励费
+ ///
+
+ [Display(Name="签约搬迁奖励费")]
+ [Column("QYBQJLF")]
+ [DataMember]
+ public decimal? QYBQJLF {get;set;}
+ ///
+ /// 安置房所在区ID 关联字典ID
+ ///
+
+ [Display(Name="安置房所在区ID 关联字典ID")]
+ [Column("AllocationHouseAreaID")]
+ [DataMember]
+ public Guid? AllocationHouseAreaID {get;set;}
+ ///
+ /// 安置房所在区
+ ///
+
+ [Display(Name="安置房所在区")]
+ [Column("AllocationHouseArea")]
+ [DataMember]
+ public string AllocationHouseArea {get;set;}
+ ///
+ /// 安置房坐落
+ ///
+
+ [Display(Name="安置房坐落")]
+ [Column("AllocationHouseAddr")]
+ [DataMember]
+ public string AllocationHouseAddr {get;set;}
+ ///
+ /// 安置房房屋类型ID 关联字典表ID
+ ///
+
+ [Display(Name="安置房房屋类型ID 关联字典表ID")]
+ [Column("AllocationHouseTypeID")]
+ [DataMember]
+ public Guid? AllocationHouseTypeID {get;set;}
+ ///
+ /// 安置房房屋类型
+ ///
+
+ [Display(Name="安置房房屋类型")]
+ [Column("AllocationHouseType")]
+ [DataMember]
+ public string AllocationHouseType {get;set;}
+ ///
+ /// 安置房建筑面积
+ ///
+
+ [Display(Name="安置房建筑面积")]
+ [Column("AllocationHouseBuildArea")]
+ [DataMember]
+ public decimal? AllocationHouseBuildArea {get;set;}
+ ///
+ /// 安置房提供日期
+ ///
+
+ [Display(Name="安置房提供日期")]
+ [Column("AllocationHouseProvideDate")]
+ [DataMember]
+ public string AllocationHouseProvideDate {get;set;}
+ ///
+ /// 安置房所在区ID 关联字典ID(适用于第二套安置房,现房+期房协议)
+ ///
+
+ [Display(Name="安置房所在区ID 关联字典ID(适用于第二套安置房,现房+期房协议)")]
+ [Column("AllocationHouseAreaID2")]
+ [DataMember]
+ public Guid? AllocationHouseAreaID2 {get;set;}
+ ///
+ /// 安置房所在区(适用于第二套安置房,现房+期房协议)
+ ///
+
+ [Display(Name="安置房所在区(适用于第二套安置房,现房+期房协议)")]
+ [Column("AllocationHouseArea2")]
+ [DataMember]
+ public string AllocationHouseArea2 {get;set;}
+ ///
+ /// 安置房坐落(适用于第二套安置房,现房+期房协议)
+ ///
+
+ [Display(Name="安置房坐落(适用于第二套安置房,现房+期房协议)")]
+ [Column("AllocationHouseAddr2")]
+ [DataMember]
+ public string AllocationHouseAddr2 {get;set;}
+ ///
+ /// 安置房房屋类型ID 关联字典表ID(适用于第二套安置房,现房+期房协议)
+ ///
+
+ [Display(Name="安置房房屋类型ID 关联字典表ID(适用于第二套安置房,现房+期房协议)")]
+ [Column("AllocationHouseTypeID2")]
+ [DataMember]
+ public Guid? AllocationHouseTypeID2 {get;set;}
+ ///
+ /// 安置房房屋类型(适用于第二套安置房,现房+期房协议)
+ ///
+
+ [Display(Name="安置房房屋类型(适用于第二套安置房,现房+期房协议)")]
+ [Column("AllocationHouseType2")]
+ [DataMember]
+ public string AllocationHouseType2 {get;set;}
+ ///
+ /// 安置房建筑面积(适用于第二套安置房,现房+期房协议)/北仑区现房协议为最大建筑面积
+ ///
+
+ [Display(Name="安置房建筑面积(适用于第二套安置房,现房+期房协议)/北仑区现房协议为最大建筑面积")]
+ [Column("AllocationHouseBuildArea2")]
+ [DataMember]
+ public decimal? AllocationHouseBuildArea2 {get;set;}
+ ///
+ /// 安置房提供日期(适用于第二套安置房,现房+期房协议)
+ ///
+
+ [Display(Name="安置房提供日期(适用于第二套安置房,现房+期房协议)")]
+ [Column("AllocationHouseProvideDate2")]
+ [DataMember]
+ public string AllocationHouseProvideDate2 {get;set;}
+ ///
+ /// 期房六月后临时安置费每月金额
+ ///
+
+ [Display(Name="期房六月后临时安置费每月金额")]
+ [Column("QFLYHLSAZFMYJE")]
+ [DataMember]
+ public decimal? QFLYHLSAZFMYJE {get;set;}
+ ///
+ /// 期房临时安置费协议生效几日先行支付
+ ///
+
+ [Display(Name="期房临时安置费协议生效几日先行支付")]
+ [Column("QFLSAZFXYSXJRXZZF")]
+ [DataMember]
+ public int? QFLSAZFXYSXJRXZZF {get;set;}
+ ///
+ /// 期房临时安置先行支付安置费用月数
+ ///
+
+ [Display(Name="期房临时安置先行支付安置费用月数")]
+ [Column("QFLSAZXXZFAZFYYS")]
+ [DataMember]
+ public decimal? QFLSAZXXZFAZFYYS {get;set;}
+ ///
+ /// 期房临时安置先行支付安置费用
+ ///
+
+ [Display(Name="期房临时安置先行支付安置费用")]
+ [Column("QFLSAZXXAZFY")]
+ [DataMember]
+ public decimal? QFLSAZXXAZFY {get;set;}
+ ///
+ /// 是否复核
+ ///
+
+ [Display(Name="是否复核")]
+ [Column("IsReCheck")]
+ [DataMember]
+ public bool IsReCheck {get;set;}
+ ///
+ /// 复核人员
+ ///
+
+ [Display(Name="复核人员")]
+ [Column("ReCheckPerson")]
+ [DataMember]
+ public string ReCheckPerson {get;set;}
+ ///
+ /// 复核日期
+ ///
+
+ [Display(Name="复核日期")]
+ [Column("ReCheckDate")]
+ [DataMember]
+ public DateTime? ReCheckDate {get;set;}
+ ///
+ /// 契税复核标志
+ ///
+
+ [Display(Name="契税复核标志")]
+ [Column("IsDeedTax")]
+ [DataMember]
+ public bool IsDeedTax {get;set;}
+ ///
+ /// 契税抵扣人员
+ ///
+
+ [Display(Name="契税抵扣人员")]
+ [Column("DeedTaxPerson")]
+ [DataMember]
+ public string DeedTaxPerson {get;set;}
+ ///
+ /// 契税抵扣日期
+ ///
+
+ [Display(Name="契税抵扣日期")]
+ [Column("DeedTaxDeductionDate")]
+ [DataMember]
+ public DateTime? DeedTaxDeductionDate {get;set;}
+ ///
+ /// 其他补偿
+ ///
+
+ [Display(Name="其他补偿")]
+ [Column("OtherCompensation")]
+ [DataMember]
+ public string OtherCompensation {get;set;}
+ ///
+ /// 税务人员备注说明
+ ///
+
+ [Display(Name="税务人员备注说明")]
+ [Column("TaxPersonRemark")]
+ [DataMember]
+ public string TaxPersonRemark {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("CreateTime")]
+ [DataMember]
+ public DateTime? CreateTime {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("CreateUserId")]
+ [DataMember]
+ public Guid? CreateUserId {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("CreateUserName")]
+ [DataMember]
+ public string CreateUserName {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("UpdateTime")]
+ [DataMember]
+ public DateTime? UpdateTime {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("UpdateUserId")]
+ [DataMember]
+ public Guid? UpdateUserId {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("UpdateUserName")]
+ [DataMember]
+ public string UpdateUserName {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Remark")]
+ [DataMember]
+ public string Remark {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Files")]
+ [DataMember]
+ public string Files {get;set;}
+ ///
+ /// 临时安置补偿费标准
+ ///
+
+ [Display(Name="临时安置补偿费标准")]
+ [Column("LSAZBCFBZ")]
+ [DataMember]
+ public decimal? LSAZBCFBZ {get;set;}
+ ///
+ /// 危旧房区块ID关联ProjectsBlock表ID
+ ///
+
+ [Display(Name="危旧房区块ID关联ProjectsBlock表ID")]
+ [Column("WJF_BlockID")]
+ [DataMember]
+ public Guid? WJF_BlockID {get;set;}
+ ///
+ /// 危旧房区块名称
+ ///
+
+ [Display(Name="危旧房区块名称")]
+ [Column("WJF_Block")]
+ [DataMember]
+ public string WJF_Block {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("HouseAcquisitionDepartment")]
+ [DataMember]
+ public string HouseAcquisitionDepartment {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("CollectImplUnitName")]
+ [DataMember]
+ public string CollectImplUnitName {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("AvailableAmount")]
+ [DataMember]
+ public decimal? AvailableAmount {get;set;}
+ ///
+ /// 征收部门电话
+ ///
+
+ [Display(Name="征收部门电话")]
+ [Column("ZSPhone")]
+ [DataMember]
+ public string ZSPhone {get;set;}
+ ///
+ /// 征收部门地址
+ ///
+
+ [Display(Name="征收部门地址")]
+ [Column("ZSAddress")]
+ [DataMember]
+ public string ZSAddress {get;set;}
+ ///
+ /// 征收实施单位电话
+ ///
+
+ [Display(Name="征收实施单位电话")]
+ [Column("ZSSSPhone")]
+ [DataMember]
+ public string ZSSSPhone {get;set;}
+ ///
+ /// 征收实施单位地址
+ ///
+
+ [Display(Name="征收实施单位地址")]
+ [Column("ZSSSAddress")]
+ [DataMember]
+ public string ZSSSAddress {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("HousingManagementID")]
+ [DataMember]
+ public Guid? HousingManagementID {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Village")]
+ [DataMember]
+ public string Village {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Sfyzx")]
+ [DataMember]
+ public string Sfyzx {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Cancellation")]
+ [DataMember]
+ public int? Cancellation {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("ZDYBQRQ")]
+ [DataMember]
+ public string ZDYBQRQ {get;set;}
+ ///
+ /// 被征收人证件类别
+ ///
+
+ [Display(Name="被征收人证件类别")]
+ [Column("CardLb")]
+ [DataMember]
+ public string CardLb {get;set;}
+ ///
+ /// 土地使用权面积
+ ///
+
+ [Display(Name="土地使用权面积")]
+ [Column("LandUseArea")]
+ [DataMember]
+ public decimal? LandUseArea {get;set;}
+ ///
+ /// 房屋评估价格
+ ///
+
+ [Display(Name="房屋评估价格")]
+ [Column("FWPGValue")]
+ [DataMember]
+ public decimal? FWPGValue {get;set;}
+ ///
+ /// 装修、附属物评估价值/若两者分离表示装修评估价值
+ ///
+
+ [Display(Name="装修、附属物评估价值/若两者分离表示装修评估价值")]
+ [Column("ZXFSPGValue")]
+ [DataMember]
+ public decimal? ZXFSPGValue {get;set;}
+ ///
+ /// 征收补偿金额比例
+ ///
+
+ [Display(Name="征收补偿金额比例")]
+ [Column("BCValueBL")]
+ [DataMember]
+ public decimal? BCValueBL {get;set;}
+ ///
+ /// 安置房属性
+ ///
+
+ [Display(Name="安置房属性")]
+ [Column("AZFSX")]
+ [DataMember]
+ public string AZFSX {get;set;}
+ ///
+ /// 支付临时安置费月数
+ ///
+
+ [Display(Name="支付临时安置费月数")]
+ [Column("GiveLSAZFMonth")]
+ [DataMember]
+ public int? GiveLSAZFMonth {get;set;}
+ ///
+ /// 支付临时安置费元/每月
+ ///
+
+ [Display(Name="支付临时安置费元/每月")]
+ [Column("GiveLSANZFValue")]
+ [DataMember]
+ public decimal? GiveLSANZFValue {get;set;}
+ ///
+ /// 补偿资金余额支付天数
+ ///
+
+ [Display(Name="补偿资金余额支付天数")]
+ [Column("BCZJYEGiveTime")]
+ [DataMember]
+ public int? BCZJYEGiveTime {get;set;}
+ ///
+ /// 安置住房评估比准价
+ ///
+
+ [Display(Name="安置住房评估比准价")]
+ [Column("AllocationHouseEvaluationApprovePrice")]
+ [DataMember]
+ public decimal? AllocationHouseEvaluationApprovePrice {get;set;}
+ ///
+ /// 房产证号
+ ///
+
+ [Display(Name="房产证号")]
+ [Column("PropertyRightCardNo")]
+ [DataMember]
+ public string PropertyRightCardNo {get;set;}
+ ///
+ /// 权证建筑面积
+ ///
+
+ [Display(Name="权证建筑面积")]
+ [Column("PropertyArea")]
+ [DataMember]
+ public decimal? PropertyArea {get;set;}
+ ///
+ /// 土地证号码
+ ///
+
+ [Display(Name="土地证号码")]
+ [Column("LandCardNo")]
+ [DataMember]
+ public string LandCardNo {get;set;}
+ ///
+ /// 证载土地面积
+ ///
+
+ [Display(Name="证载土地面积")]
+ [Column("LandCardArea")]
+ [DataMember]
+ public decimal? LandCardArea {get;set;}
+ ///
+ /// 核定土地面积
+ ///
+
+ [Display(Name="核定土地面积")]
+ [Column("LandFinalArea")]
+ [DataMember]
+ public decimal? LandFinalArea {get;set;}
+ ///
+ /// 总评估价值
+ ///
+
+ [Display(Name="总评估价值")]
+ [Column("AmoutPGMoney")]
+ [DataMember]
+ public decimal? AmoutPGMoney {get;set;}
+ ///
+ /// 换算面积结算
+ ///
+
+ [Display(Name="换算面积结算")]
+ [Column("HSMJJS")]
+ [DataMember]
+ public decimal? HSMJJS {get;set;}
+ ///
+ /// 增加面积结算
+ ///
+
+ [Display(Name="增加面积结算")]
+ [Column("AddMJJS")]
+ [DataMember]
+ public decimal? AddMJJS {get;set;}
+ ///
+ /// 上靠面积结算/北仑产权调换现房时为最大上靠面积
+ ///
+
+ [Display(Name="上靠面积结算/北仑产权调换现房时为最大上靠面积")]
+ [Column("SKMJJS")]
+ [DataMember]
+ public decimal? SKMJJS {get;set;}
+ ///
+ /// 特殊数据结算
+ ///
+
+ [Display(Name="特殊数据结算")]
+ [Column("TSMJJS")]
+ [DataMember]
+ public decimal? TSMJJS {get;set;}
+ ///
+ /// 合计支付金额/北仑产权调换现房时为最大建筑面积
+ ///
+
+ [Display(Name="合计支付金额/北仑产权调换现房时为最大建筑面积")]
+ [Column("TotalJS")]
+ [DataMember]
+ public decimal? TotalJS {get;set;}
+ ///
+ /// 购房补助区外
+ ///
+
+ [Display(Name="购房补助区外")]
+ [Column("Gfbz_Out")]
+ [DataMember]
+ public string Gfbz_Out {get;set;}
+ ///
+ /// 是否市区
+ ///
+
+ [Display(Name="是否市区")]
+ [Column("IsCity")]
+ [DataMember]
+ public string IsCity {get;set;}
+ ///
+ /// 下级判断
+ ///
+
+ [Display(Name="下级判断")]
+ [Column("IsNext")]
+ [DataMember]
+ public string IsNext {get;set;}
+ ///
+ /// 购买区域
+ ///
+
+ [Display(Name="购买区域")]
+ [Column("BuyArea")]
+ [DataMember]
+ public string BuyArea {get;set;}
+ ///
+ /// 公告规定签约期限
+ ///
+
+ [Display(Name="公告规定签约期限")]
+ [Column("GGGDQYQX")]
+ [DataMember]
+ public string GGGDQYQX {get;set;}
+ ///
+ /// 承租人证件类型
+ ///
+
+ [Display(Name="承租人证件类型")]
+ [Column("LesseeLB")]
+ [DataMember]
+ public string LesseeLB {get;set;}
+ ///
+ /// 产权性质
+ ///
+
+ [Display(Name="产权性质")]
+ [Column("NatureOfProperty")]
+ [DataMember]
+ public string NatureOfProperty {get;set;}
+ ///
+ /// 产权性质ID
+ ///
+
+ [Display(Name="产权性质ID")]
+ [Column("NatureOfPropertyID")]
+ [DataMember]
+ public Guid? NatureOfPropertyID {get;set;}
+ ///
+ /// 住房困难补偿金类型金额
+ ///
+
+ [Display(Name="住房困难补偿金类型金额")]
+ [Column("zfknzj")]
+ [DataMember]
+ public string zfknzj {get;set;}
+ ///
+ /// 住房困难补偿金类型名字 住房困难补助金额,0;低收入住房困难补偿金额,1
+ ///
+
+ [Display(Name="住房困难补偿金类型名字 住房困难补助金额,0;低收入住房困难补偿金额,1")]
+ [Column("zfknName")]
+ [DataMember]
+ public string zfknName {get;set;}
+ ///
+ /// 签约搬迁奖励费 计算
+ ///
+
+ [Display(Name="签约搬迁奖励费 计算")]
+ [Column("QYBQJLCal")]
+ [DataMember]
+ public decimal? QYBQJLCal {get;set;}
+ ///
+ /// 补助面积结算
+ ///
+
+ [Display(Name="补助面积结算")]
+ [Column("BZMJJS")]
+ [DataMember]
+ public decimal? BZMJJS {get;set;}
+ ///
+ /// 安置房单价
+ ///
+
+ [Display(Name="安置房单价")]
+ [Column("AZFDJ")]
+ [DataMember]
+ public string AZFDJ {get;set;}
+ ///
+ /// 是否符合房改
+ ///
+
+ [Display(Name="是否符合房改")]
+ [Column("IsFitGF")]
+ [DataMember]
+ public string IsFitGF {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("LandWay")]
+ [DataMember]
+ public string LandWay {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("LandUse")]
+ [DataMember]
+ public string LandUse {get;set;}
+ ///
+ /// 房屋用途
+ ///
+
+ [Display(Name="房屋用途")]
+ [Column("HouseUse")]
+ [DataMember]
+ public string HouseUse {get;set;}
+ ///
+ /// 阁楼面积
+ ///
+
+ [Display(Name="阁楼面积")]
+ [Column("AtticArea")]
+ [DataMember]
+ public decimal? AtticArea {get;set;}
+ ///
+ /// 附属用房面积
+ ///
+
+ [Display(Name="附属用房面积")]
+ [Column("AttachedArea")]
+ [DataMember]
+ public decimal? AttachedArea {get;set;}
+ ///
+ /// 红线内无证面积
+ ///
+
+ [Display(Name="红线内无证面积")]
+ [Column("RedLine_In")]
+ [DataMember]
+ public decimal? RedLine_In {get;set;}
+ ///
+ /// 红线外无证面积
+ ///
+
+ [Display(Name="红线外无证面积")]
+ [Column("RedLine_Out")]
+ [DataMember]
+ public decimal? RedLine_Out {get;set;}
+ ///
+ /// 附属评估价值
+ ///
+
+ [Display(Name="附属评估价值")]
+ [Column("FSPGValue")]
+ [DataMember]
+ public decimal? FSPGValue {get;set;}
+ ///
+ /// 阁楼补偿费
+ ///
+
+ [Display(Name="阁楼补偿费")]
+ [Column("AtticAssessedValue")]
+ [DataMember]
+ public decimal? AtticAssessedValue {get;set;}
+ ///
+ /// 超容积率土地补偿费
+ ///
+
+ [Display(Name="超容积率土地补偿费")]
+ [Column("ExceedLandMoney")]
+ [DataMember]
+ public decimal? ExceedLandMoney {get;set;}
+ ///
+ /// 房票金额
+ ///
+
+ [Display(Name="房票金额")]
+ [Column("HouseTicketMoney")]
+ [DataMember]
+ public decimal? HouseTicketMoney {get;set;}
+ ///
+ /// 是否房票协议 0:否 ;1:是
+ ///
+
+ [Display(Name="是否房票协议 0:否 ;1:是")]
+ [Column("IfHouseTick")]
+ [DataMember]
+ public string IfHouseTick {get;set;}
+ ///
+ /// 上靠面积最大值
+ ///
+
+ [Display(Name="上靠面积最大值")]
+ [Column("SKZJMJ_Max")]
+ [DataMember]
+ public decimal? SKZJMJ_Max {get;set;}
+ ///
+ /// 合计产权调换面积最大值
+ ///
+
+ [Display(Name="合计产权调换面积最大值")]
+ [Column("TotalAllocationArea_Max")]
+ [DataMember]
+ public decimal? TotalAllocationArea_Max {get;set;}
+ ///
+ /// 额外面积
+ ///
+
+ [Display(Name="额外面积")]
+ [Column("ExtraArea")]
+ [DataMember]
+ public decimal? ExtraArea {get;set;}
+ ///
+ /// 额外面积属性 0为少 1为超
+ ///
+
+ [Display(Name="额外面积属性 0为少 1为超")]
+ [Column("ExtraType")]
+ [DataMember]
+ public string ExtraType {get;set;}
+ ///
+ /// 公摊补助面积结算
+ ///
+
+ [Display(Name="公摊补助面积结算")]
+ [Column("GTBZMJJS")]
+ [DataMember]
+ public decimal? GTBZMJJS {get;set;}
+ ///
+ /// 安置房建筑面积最大限
+ ///
+
+ [Display(Name="安置房建筑面积最大限")]
+ [Column("AllocationHouseBuildArea_Max")]
+ [DataMember]
+ public decimal? AllocationHouseBuildArea_Max {get;set;}
+ ///
+ /// 房票给与时间
+ ///
+
+ [Display(Name="房票给与时间")]
+ [Column("HouseTicketGive")]
+ [DataMember]
+ public int? HouseTicketGive {get;set;}
+ ///
+ /// 住宅协议打印历史记录
+ ///
+
+ [Display(Name="住宅协议打印历史记录")]
+ [Column("XYLODOPText")]
+ [DataMember]
+ public string XYLODOPText {get;set;}
+ ///
+ /// 住宅协议打印历史记录标志
+ ///
+
+ [Display(Name="住宅协议打印历史记录标志")]
+ [Column("XYLODOP")]
+ [DataMember]
+ public bool XYLODOP {get;set;}
+ ///
+ /// 核算单打印历史记录
+ ///
+
+ [Display(Name="核算单打印历史记录")]
+ [Column("HSDLODOPText")]
+ [DataMember]
+ public string HSDLODOPText {get;set;}
+ ///
+ /// 核算单打印历史记录标志
+ ///
+
+ [Display(Name="核算单打印历史记录标志")]
+ [Column("HSDLODOP")]
+ [DataMember]
+ public bool HSDLODOP {get;set;}
+ ///
+ /// 超容积土地面积
+ ///
+
+ [Display(Name="超容积土地面积")]
+ [Column("ExceedLandArea")]
+ [DataMember]
+ public decimal? ExceedLandArea {get;set;}
+ ///
+ /// 提前搬迁奖励大
+ ///
+
+ [Display(Name="提前搬迁奖励大")]
+ [Column("MoveRewardBig")]
+ [DataMember]
+ public decimal? MoveRewardBig {get;set;}
+ ///
+ /// 提前搬迁奖励小
+ ///
+
+ [Display(Name="提前搬迁奖励小")]
+ [Column("MoveRewardSmall")]
+ [DataMember]
+ public decimal? MoveRewardSmall {get;set;}
+ ///
+ /// 结算单张数
+ ///
+
+ [Display(Name="结算单张数")]
+ [Column("ClearingSheetNum")]
+ [DataMember]
+ public int? ClearingSheetNum {get;set;}
+ ///
+ /// 未新增结算单张数
+ ///
+
+ [Display(Name="未新增结算单张数")]
+ [Column("NoAddClearingSheetNum")]
+ [DataMember]
+ public int? NoAddClearingSheetNum {get;set;}
+ ///
+ /// 已新增未备案结算单张数
+ ///
+
+ [Display(Name="已新增未备案结算单张数")]
+ [Column("HaveAddClearingSheetNum")]
+ [DataMember]
+ public int? HaveAddClearingSheetNum {get;set;}
+ ///
+ /// 已备案结算单张数
+ ///
+
+ [Display(Name="已备案结算单张数")]
+ [Column("HaveRecordClearingSheetNum")]
+ [DataMember]
+ public int? HaveRecordClearingSheetNum {get;set;}
+ ///
+ /// 是否产权调换
+ ///
+
+ [Display(Name="是否产权调换")]
+ [Column("IfCQDH")]
+ [DataMember]
+ public bool IfCQDH {get;set;}
+ ///
+ /// 临时安置费补助标准
+ ///
+
+ [Display(Name="临时安置费补助标准")]
+ [Column("QFLSBZ_Month")]
+ [DataMember]
+ public decimal? QFLSBZ_Month {get;set;}
+ ///
+ /// 临时安置费补助
+ ///
+
+ [Display(Name="临时安置费补助")]
+ [Column("QFLSBZ")]
+ [DataMember]
+ public decimal? QFLSBZ {get;set;}
+ ///
+ /// 出租出借私房产权人
+ ///
+
+ [Display(Name="出租出借私房产权人")]
+ [Column("PropertyUser1")]
+ [DataMember]
+ public string PropertyUser1 {get;set;}
+ ///
+ /// 出租出借私房承租人
+ ///
+
+ [Display(Name="出租出借私房承租人")]
+ [Column("Lessee1")]
+ [DataMember]
+ public string Lessee1 {get;set;}
+ ///
+ /// 评估金额是否计算比例
+ ///
+
+ [Display(Name="评估金额是否计算比例")]
+ [Column("AssessMoneyIfCalute")]
+ [DataMember]
+ public int AssessMoneyIfCalute {get;set;}
+ ///
+ /// 计算比例后的评估金额
+ ///
+
+ [Display(Name="计算比例后的评估金额")]
+ [Column("AssessMoneyAfterCalute")]
+ [DataMember]
+ public decimal? AssessMoneyAfterCalute {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Deductible")]
+ [DataMember]
+ public decimal Deductible {get;set;}
+ ///
+ /// 是否撤销备案中
+ ///
+
+ [Display(Name="是否撤销备案中")]
+ [Column("IsCancelRecord")]
+ [DataMember]
+ public bool IsCancelRecord {get;set;}
+ ///
+ /// 装修、附属物评估价值(1.15倍)
+ ///
+
+ [Display(Name="装修、附属物评估价值(1.15倍)")]
+ [Column("ZXFSPGMoney")]
+ [DataMember]
+ public decimal? ZXFSPGMoney {get;set;}
+ ///
+ /// 实际安置房面积
+ ///
+
+ [Display(Name="实际安置房面积")]
+ [Column("AcutualPlaHouseArea")]
+ [DataMember]
+ public decimal? AcutualPlaHouseArea {get;set;}
+ ///
+ /// 其中货币补偿部分面积
+ ///
+
+ [Display(Name="其中货币补偿部分面积")]
+ [Column("ActualCurrSectionArea")]
+ [DataMember]
+ public decimal? ActualCurrSectionArea {get;set;}
+ ///
+ /// 其中产权调换部分面积
+ ///
+
+ [Display(Name="其中产权调换部分面积")]
+ [Column("ActualPorpSwapSectionArea")]
+ [DataMember]
+ public decimal? ActualPorpSwapSectionArea {get;set;}
+ ///
+ /// 其中货币补偿部分评估价值
+ ///
+
+ [Display(Name="其中货币补偿部分评估价值 ")]
+ [Column("ActualCurrSectionEval")]
+ [DataMember]
+ public decimal? ActualCurrSectionEval {get;set;}
+ ///
+ /// 货币补偿补助
+ ///
+
+ [Display(Name="货币补偿补助")]
+ [Column("CurrSubsidy")]
+ [DataMember]
+ public decimal? CurrSubsidy {get;set;}
+ ///
+ /// 协议打印文件
+ ///
+
+ [Display(Name="协议打印文件")]
+ [Column("XyFile")]
+ [DataMember]
+ public string XyFile {get;set;}
+ ///
+ /// 是否存在协议打印文件
+ ///
+
+ [Display(Name="是否存在协议打印文件")]
+ [Column("IsxyFile")]
+ [DataMember]
+ public int? IsxyFile {get;set;}
+
+ }
+
+ /**
+ ///
+ /// 数据表实体类Map:ResidentialAgreement
+ ///
+ public class ResidentialAgreementMap : EntityTypeConfiguration
+ {
+ public ResidentialAgreementMap()
+ {
+ this.ToTable("ResidentialAgreement");
+ this.HasKey(t => t.ID);
+ this.Property(t => t.ProjectID).HasColumnName("ProjectID").IsRequired();
+ this.Property(t => t.ProjectName).HasColumnName("ProjectName").IsRequired();
+ this.Property(t => t.InvestigateTableID).HasColumnName("InvestigateTableID");
+ this.Property(t => t.CollectDecisionNoHeadID).HasColumnName("CollectDecisionNoHeadID");
+ this.Property(t => t.CollectDecisionNoHeadName).HasColumnName("CollectDecisionNoHeadName");
+ this.Property(t => t.No1).HasColumnName("No1");
+ this.Property(t => t.No2).HasColumnName("No2");
+ this.Property(t => t.No3).HasColumnName("No3");
+ this.Property(t => t.PartyBID).HasColumnName("PartyBID");
+ this.Property(t => t.PartyBName).HasColumnName("PartyBName");
+ this.Property(t => t.FilesBasis).HasColumnName("FilesBasis");
+ this.Property(t => t.CollectDecisionNo).HasColumnName("CollectDecisionNo");
+ this.Property(t => t.ExpropriatedName).HasColumnName("ExpropriatedName");
+ this.Property(t => t.ExpropriatedCardNo).HasColumnName("ExpropriatedCardNo");
+ this.Property(t => t.ExpropriatedPhone).HasColumnName("ExpropriatedPhone");
+ this.Property(t => t.ExpropriatedAddr).HasColumnName("ExpropriatedAddr");
+ this.Property(t => t.ExpropriatedNatureID).HasColumnName("ExpropriatedNatureID");
+ this.Property(t => t.ExpropriatedNature).HasColumnName("ExpropriatedNature");
+ this.Property(t => t.Gfbz).HasColumnName("Gfbz");
+ this.Property(t => t.AreaID).HasColumnName("AreaID");
+ this.Property(t => t.Area).HasColumnName("Area");
+ this.Property(t => t.HouseAddress).HasColumnName("HouseAddress");
+ this.Property(t => t.LocationLevelID).HasColumnName("LocationLevelID");
+ this.Property(t => t.LocationLevel).HasColumnName("LocationLevel");
+ this.Property(t => t.StructureID).HasColumnName("StructureID");
+ this.Property(t => t.Structure).HasColumnName("Structure");
+ this.Property(t => t.BuildingArea).HasColumnName("BuildingArea");
+ this.Property(t => t.UsageID).HasColumnName("UsageID");
+ this.Property(t => t.Usage).HasColumnName("Usage");
+ this.Property(t => t.Population).HasColumnName("Population");
+ this.Property(t => t.IsSuite).HasColumnName("IsSuite");
+ this.Property(t => t.PropertyRightPrson).HasColumnName("PropertyRightPrson");
+ this.Property(t => t.Lessee).HasColumnName("Lessee");
+ this.Property(t => t.LesseeCardNo).HasColumnName("LesseeCardNo");
+ this.Property(t => t.UsePopulation).HasColumnName("UsePopulation");
+ this.Property(t => t.AssessMoney).HasColumnName("AssessMoney");
+ this.Property(t => t.AssessMoney_DX).HasColumnName("AssessMoney_DX");
+ this.Property(t => t.SummationShouldCompensateMoney).HasColumnName("SummationShouldCompensateMoney");
+ this.Property(t => t.SummationShouldCompensateMoney_DX).HasColumnName("SummationShouldCompensateMoney_DX");
+ this.Property(t => t.DidNotPayMoney).HasColumnName("DidNotPayMoney");
+ this.Property(t => t.PayStatus).HasColumnName("PayStatus");
+ this.Property(t => t.HouseReformMoney).HasColumnName("HouseReformMoney");
+ this.Property(t => t.SubtractCompensation).HasColumnName("SubtractCompensation");
+ this.Property(t => t.SubtractCompensation_DX).HasColumnName("SubtractCompensation_DX");
+ this.Property(t => t.SetSubsidy).HasColumnName("SetSubsidy");
+ this.Property(t => t.AheadRelocatedRewardMoney).HasColumnName("AheadRelocatedRewardMoney");
+ this.Property(t => t.TemporaryAllocationFee).HasColumnName("TemporaryAllocationFee");
+ this.Property(t => t.OtherPromise).HasColumnName("OtherPromise");
+ this.Property(t => t.Memo).HasColumnName("Memo");
+ this.Property(t => t.TotalCompensateMoney).HasColumnName("TotalCompensateMoney");
+ this.Property(t => t.TotalCompensateMoney_DX).HasColumnName("TotalCompensateMoney_DX");
+ this.Property(t => t.IsPrivateRent).HasColumnName("IsPrivateRent");
+ this.Property(t => t.SignTime).HasColumnName("SignTime");
+ this.Property(t => t.DemolitionPerson).HasColumnName("DemolitionPerson");
+ this.Property(t => t.DemolitionUnit).HasColumnName("DemolitionUnit");
+ this.Property(t => t.Operator).HasColumnName("Operator");
+ this.Property(t => t.OperatorPhone).HasColumnName("OperatorPhone");
+ this.Property(t => t.PropertyRightsUnit).HasColumnName("PropertyRightsUnit");
+ this.Property(t => t.TypeID).HasColumnName("TypeID");
+ this.Property(t => t.Type).HasColumnName("Type");
+ this.Property(t => t.IsInRecords).HasColumnName("IsInRecords");
+ this.Property(t => t.InRecordPersonID).HasColumnName("InRecordPersonID");
+ this.Property(t => t.InRecordPerson).HasColumnName("InRecordPerson");
+ this.Property(t => t.InRecordDate).HasColumnName("InRecordDate");
+ this.Property(t => t.IsHousingReform).HasColumnName("IsHousingReform");
+ this.Property(t => t.SwitchProductionWayID).HasColumnName("SwitchProductionWayID");
+ this.Property(t => t.SwitchProductionWay).HasColumnName("SwitchProductionWay");
+ this.Property(t => t.JHZFSYZKZSHBCZJ).HasColumnName("JHZFSYZKZSHBCZJ");
+ this.Property(t => t.XZHBBCZJBCZJ).HasColumnName("XZHBBCZJBCZJ");
+ this.Property(t => t.AZFKNBZZJBZZJ).HasColumnName("AZFKNBZZJBZZJ");
+ this.Property(t => t.ABCJEZSDCQDHMJ).HasColumnName("ABCJEZSDCQDHMJ");
+ this.Property(t => t.CQDHMJBZ).HasColumnName("CQDHMJBZ");
+ this.Property(t => t.CQDHZJMJ).HasColumnName("CQDHZJMJ");
+ this.Property(t => t.AZGCKZJGTBZMJ).HasColumnName("AZGCKZJGTBZMJ");
+ this.Property(t => t.SKZJMJ).HasColumnName("SKZJMJ");
+ this.Property(t => t.TotalAllocationArea).HasColumnName("TotalAllocationArea");
+ this.Property(t => t.OneTimeRelocationCompensation).HasColumnName("OneTimeRelocationCompensation");
+ this.Property(t => t.AKNBZBZJFBCZJ).HasColumnName("AKNBZBZJFBCZJ");
+ this.Property(t => t.TQBQJLBL).HasColumnName("TQBQJLBL");
+ this.Property(t => t.XFYCQLSAZF).HasColumnName("XFYCQLSAZF");
+ this.Property(t => t.XYZFYFZSBCZJRS).HasColumnName("XYZFYFZSBCZJRS");
+ this.Property(t => t.XYQDJRNXXZFYFZSBCZJ).HasColumnName("XYQDJRNXXZFYFZSBCZJ");
+ this.Property(t => t.XXZFBCJEYE).HasColumnName("XXZFBCJEYE");
+ this.Property(t => t.qtzfrq).HasColumnName("qtzfrq");
+ this.Property(t => t.qtqfrq).HasColumnName("qtqfrq");
+ this.Property(t => t.EnsureRelocateDate).HasColumnName("EnsureRelocateDate");
+ this.Property(t => t.GGGDDBQQX).HasColumnName("GGGDDBQQX");
+ this.Property(t => t.QYBQJLZBQQXJMHJRZF).HasColumnName("QYBQJLZBQQXJMHJRZF");
+ this.Property(t => t.XYSXQYBL).HasColumnName("XYSXQYBL");
+ this.Property(t => t.ZFKNBZZJ).HasColumnName("ZFKNBZZJ");
+ this.Property(t => t.DSRZFKNBCJE).HasColumnName("DSRZFKNBCJE");
+ this.Property(t => t.QYBQJLF).HasColumnName("QYBQJLF");
+ this.Property(t => t.AllocationHouseAreaID).HasColumnName("AllocationHouseAreaID");
+ this.Property(t => t.AllocationHouseArea).HasColumnName("AllocationHouseArea");
+ this.Property(t => t.AllocationHouseAddr).HasColumnName("AllocationHouseAddr");
+ this.Property(t => t.AllocationHouseTypeID).HasColumnName("AllocationHouseTypeID");
+ this.Property(t => t.AllocationHouseType).HasColumnName("AllocationHouseType");
+ this.Property(t => t.AllocationHouseBuildArea).HasColumnName("AllocationHouseBuildArea");
+ this.Property(t => t.AllocationHouseProvideDate).HasColumnName("AllocationHouseProvideDate");
+ this.Property(t => t.AllocationHouseAreaID2).HasColumnName("AllocationHouseAreaID2");
+ this.Property(t => t.AllocationHouseArea2).HasColumnName("AllocationHouseArea2");
+ this.Property(t => t.AllocationHouseAddr2).HasColumnName("AllocationHouseAddr2");
+ this.Property(t => t.AllocationHouseTypeID2).HasColumnName("AllocationHouseTypeID2");
+ this.Property(t => t.AllocationHouseType2).HasColumnName("AllocationHouseType2");
+ this.Property(t => t.AllocationHouseBuildArea2).HasColumnName("AllocationHouseBuildArea2");
+ this.Property(t => t.AllocationHouseProvideDate2).HasColumnName("AllocationHouseProvideDate2");
+ this.Property(t => t.QFLYHLSAZFMYJE).HasColumnName("QFLYHLSAZFMYJE");
+ this.Property(t => t.QFLSAZFXYSXJRXZZF).HasColumnName("QFLSAZFXYSXJRXZZF");
+ this.Property(t => t.QFLSAZXXZFAZFYYS).HasColumnName("QFLSAZXXZFAZFYYS");
+ this.Property(t => t.QFLSAZXXAZFY).HasColumnName("QFLSAZXXAZFY");
+ this.Property(t => t.IsReCheck).HasColumnName("IsReCheck");
+ this.Property(t => t.ReCheckPerson).HasColumnName("ReCheckPerson");
+ this.Property(t => t.ReCheckDate).HasColumnName("ReCheckDate");
+ this.Property(t => t.IsDeedTax).HasColumnName("IsDeedTax");
+ this.Property(t => t.DeedTaxPerson).HasColumnName("DeedTaxPerson");
+ this.Property(t => t.DeedTaxDeductionDate).HasColumnName("DeedTaxDeductionDate");
+ this.Property(t => t.OtherCompensation).HasColumnName("OtherCompensation");
+ this.Property(t => t.TaxPersonRemark).HasColumnName("TaxPersonRemark");
+ 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.LSAZBCFBZ).HasColumnName("LSAZBCFBZ");
+ this.Property(t => t.WJF_BlockID).HasColumnName("WJF_BlockID");
+ this.Property(t => t.WJF_Block).HasColumnName("WJF_Block");
+ this.Property(t => t.HouseAcquisitionDepartment).HasColumnName("HouseAcquisitionDepartment");
+ this.Property(t => t.CollectImplUnitName).HasColumnName("CollectImplUnitName");
+ this.Property(t => t.AvailableAmount).HasColumnName("AvailableAmount");
+ this.Property(t => t.ZSPhone).HasColumnName("ZSPhone");
+ this.Property(t => t.ZSAddress).HasColumnName("ZSAddress");
+ this.Property(t => t.ZSSSPhone).HasColumnName("ZSSSPhone");
+ this.Property(t => t.ZSSSAddress).HasColumnName("ZSSSAddress");
+ this.Property(t => t.HousingManagementID).HasColumnName("HousingManagementID");
+ this.Property(t => t.Village).HasColumnName("Village");
+ this.Property(t => t.Sfyzx).HasColumnName("Sfyzx");
+ this.Property(t => t.Cancellation).HasColumnName("Cancellation");
+ this.Property(t => t.ZDYBQRQ).HasColumnName("ZDYBQRQ");
+ this.Property(t => t.CardLb).HasColumnName("CardLb");
+ this.Property(t => t.LandUseArea).HasColumnName("LandUseArea");
+ this.Property(t => t.FWPGValue).HasColumnName("FWPGValue");
+ this.Property(t => t.ZXFSPGValue).HasColumnName("ZXFSPGValue");
+ this.Property(t => t.BCValueBL).HasColumnName("BCValueBL");
+ this.Property(t => t.AZFSX).HasColumnName("AZFSX");
+ this.Property(t => t.GiveLSAZFMonth).HasColumnName("GiveLSAZFMonth");
+ this.Property(t => t.GiveLSANZFValue).HasColumnName("GiveLSANZFValue");
+ this.Property(t => t.BCZJYEGiveTime).HasColumnName("BCZJYEGiveTime");
+ this.Property(t => t.AllocationHouseEvaluationApprovePrice).HasColumnName("AllocationHouseEvaluationApprovePrice");
+ this.Property(t => t.PropertyRightCardNo).HasColumnName("PropertyRightCardNo");
+ this.Property(t => t.PropertyArea).HasColumnName("PropertyArea");
+ this.Property(t => t.LandCardNo).HasColumnName("LandCardNo");
+ this.Property(t => t.LandCardArea).HasColumnName("LandCardArea");
+ this.Property(t => t.LandFinalArea).HasColumnName("LandFinalArea");
+ this.Property(t => t.AmoutPGMoney).HasColumnName("AmoutPGMoney");
+ this.Property(t => t.HSMJJS).HasColumnName("HSMJJS");
+ this.Property(t => t.AddMJJS).HasColumnName("AddMJJS");
+ this.Property(t => t.SKMJJS).HasColumnName("SKMJJS");
+ this.Property(t => t.TSMJJS).HasColumnName("TSMJJS");
+ this.Property(t => t.TotalJS).HasColumnName("TotalJS");
+ this.Property(t => t.Gfbz_Out).HasColumnName("Gfbz_Out");
+ this.Property(t => t.IsCity).HasColumnName("IsCity");
+ this.Property(t => t.IsNext).HasColumnName("IsNext");
+ this.Property(t => t.BuyArea).HasColumnName("BuyArea");
+ this.Property(t => t.GGGDQYQX).HasColumnName("GGGDQYQX");
+ this.Property(t => t.LesseeLB).HasColumnName("LesseeLB");
+ this.Property(t => t.NatureOfProperty).HasColumnName("NatureOfProperty");
+ this.Property(t => t.NatureOfPropertyID).HasColumnName("NatureOfPropertyID");
+ this.Property(t => t.zfknzj).HasColumnName("zfknzj");
+ this.Property(t => t.zfknName).HasColumnName("zfknName");
+ this.Property(t => t.QYBQJLCal).HasColumnName("QYBQJLCal");
+ this.Property(t => t.BZMJJS).HasColumnName("BZMJJS");
+ this.Property(t => t.AZFDJ).HasColumnName("AZFDJ");
+ this.Property(t => t.IsFitGF).HasColumnName("IsFitGF");
+ this.Property(t => t.LandWay).HasColumnName("LandWay");
+ this.Property(t => t.LandUse).HasColumnName("LandUse");
+ this.Property(t => t.HouseUse).HasColumnName("HouseUse");
+ 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.FSPGValue).HasColumnName("FSPGValue");
+ this.Property(t => t.AtticAssessedValue).HasColumnName("AtticAssessedValue");
+ this.Property(t => t.ExceedLandMoney).HasColumnName("ExceedLandMoney");
+ this.Property(t => t.HouseTicketMoney).HasColumnName("HouseTicketMoney");
+ this.Property(t => t.IfHouseTick).HasColumnName("IfHouseTick").IsRequired();
+ this.Property(t => t.SKZJMJ_Max).HasColumnName("SKZJMJ_Max");
+ this.Property(t => t.TotalAllocationArea_Max).HasColumnName("TotalAllocationArea_Max");
+ this.Property(t => t.ExtraArea).HasColumnName("ExtraArea");
+ this.Property(t => t.ExtraType).HasColumnName("ExtraType");
+ this.Property(t => t.GTBZMJJS).HasColumnName("GTBZMJJS");
+ this.Property(t => t.AllocationHouseBuildArea_Max).HasColumnName("AllocationHouseBuildArea_Max");
+ this.Property(t => t.HouseTicketGive).HasColumnName("HouseTicketGive");
+ this.Property(t => t.XYLODOPText).HasColumnName("XYLODOPText");
+ this.Property(t => t.XYLODOP).HasColumnName("XYLODOP").IsRequired();
+ this.Property(t => t.HSDLODOPText).HasColumnName("HSDLODOPText");
+ this.Property(t => t.HSDLODOP).HasColumnName("HSDLODOP").IsRequired();
+ this.Property(t => t.ExceedLandArea).HasColumnName("ExceedLandArea");
+ this.Property(t => t.MoveRewardBig).HasColumnName("MoveRewardBig");
+ this.Property(t => t.MoveRewardSmall).HasColumnName("MoveRewardSmall");
+ this.Property(t => t.ClearingSheetNum).HasColumnName("ClearingSheetNum");
+ this.Property(t => t.NoAddClearingSheetNum).HasColumnName("NoAddClearingSheetNum");
+ this.Property(t => t.HaveAddClearingSheetNum).HasColumnName("HaveAddClearingSheetNum");
+ this.Property(t => t.HaveRecordClearingSheetNum).HasColumnName("HaveRecordClearingSheetNum");
+ this.Property(t => t.IfCQDH).HasColumnName("IfCQDH");
+ this.Property(t => t.QFLSBZ_Month).HasColumnName("QFLSBZ_Month");
+ this.Property(t => t.QFLSBZ).HasColumnName("QFLSBZ");
+ this.Property(t => t.PropertyUser1).HasColumnName("PropertyUser1");
+ this.Property(t => t.Lessee1).HasColumnName("Lessee1");
+ this.Property(t => t.AssessMoneyIfCalute).HasColumnName("AssessMoneyIfCalute").IsRequired();
+ this.Property(t => t.AssessMoneyAfterCalute).HasColumnName("AssessMoneyAfterCalute");
+ this.Property(t => t.Deductible).HasColumnName("Deductible").IsRequired();
+ this.Property(t => t.IsCancelRecord).HasColumnName("IsCancelRecord").IsRequired();
+ this.Property(t => t.ZXFSPGMoney).HasColumnName("ZXFSPGMoney");
+ this.Property(t => t.AcutualPlaHouseArea).HasColumnName("AcutualPlaHouseArea");
+ this.Property(t => t.ActualCurrSectionArea).HasColumnName("ActualCurrSectionArea");
+ this.Property(t => t.ActualPorpSwapSectionArea).HasColumnName("ActualPorpSwapSectionArea");
+ this.Property(t => t.ActualCurrSectionEval).HasColumnName("ActualCurrSectionEval");
+ this.Property(t => t.CurrSubsidy).HasColumnName("CurrSubsidy");
+ this.Property(t => t.XyFile).HasColumnName("XyFile");
+ this.Property(t => t.IsxyFile).HasColumnName("IsxyFile");
+ }
+ }**/
+
+ }
+
+ //----------ResidentialAgreement结束----------
+
+
\ No newline at end of file
diff --git a/Ewide.Nbzs.Entity/DataBase/zjzwfwTickets.cs b/Ewide.Nbzs.Entity/DataBase/zjzwfwTickets.cs
new file mode 100644
index 0000000..edecbe6
--- /dev/null
+++ b/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
+ {
+ ///
+ /// 数据表实体类:zjzwfwTickets
+ ///
+ [Table("zjzwfwTickets")]
+ public partial class zjzwfwTickets: BaseEntity {
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("ID")]
+ [DataMember]
+ public string ID {get;set;}
+ ///
+ /// 无描述
+ ///
+
+ [Display(Name="无描述")]
+ [Column("Ticket")]
+ [DataMember]
+ public string Ticket {get;set;}
+ ///
+ /// 姓名
+ ///
+
+ [Display(Name="姓名")]
+ [Column("UserName")]
+ [DataMember]
+ public string UserName {get;set;}
+ ///
+ /// 身份证号码
+ ///
+
+ [Display(Name="身份证号码")]
+ [Column("IdCardNo")]
+ [DataMember]
+ public string IdCardNo {get;set;}
+ ///
+ /// 创建时间
+ ///
+
+ [Display(Name="创建时间")]
+ [Column("CreateTime")]
+ [DataMember]
+ public DateTime? CreateTime {get;set;}
+ ///
+ /// 到期时间 默认1小时到期
+ ///
+
+ [Display(Name="到期时间 默认1小时到期")]
+ [Column("ExpireTime")]
+ [DataMember]
+ public DateTime? ExpireTime {get;set;}
+ ///
+ /// 原始文本
+ ///
+
+ [Display(Name="原始文本")]
+ [Column("OriginalResponse")]
+ [DataMember]
+ public string OriginalResponse {get;set;}
+
+ }
+
+ /**
+ ///
+ /// 数据表实体类Map:zjzwfwTickets
+ ///
+ public class zjzwfwTicketsMap : EntityTypeConfiguration
+ {
+ public zjzwfwTicketsMap()
+ {
+ this.ToTable("zjzwfwTickets");
+ this.Property(t => t.ID).HasColumnName("ID").IsRequired();
+ this.Property(t => t.Ticket).HasColumnName("Ticket");
+ this.Property(t => t.UserName).HasColumnName("UserName");
+ this.Property(t => t.IdCardNo).HasColumnName("IdCardNo");
+ this.Property(t => t.CreateTime).HasColumnName("CreateTime");
+ this.Property(t => t.ExpireTime).HasColumnName("ExpireTime");
+ this.Property(t => t.OriginalResponse).HasColumnName("OriginalResponse");
+ }
+ }**/
+
+ }
+
+ //----------zjzwfwTickets结束----------
+
+
\ No newline at end of file
diff --git a/Ewide.Nbzs.Entity/Ewide.Nbzs.Entity.csproj b/Ewide.Nbzs.Entity/Ewide.Nbzs.Entity.csproj
new file mode 100644
index 0000000..06fca78
--- /dev/null
+++ b/Ewide.Nbzs.Entity/Ewide.Nbzs.Entity.csproj
@@ -0,0 +1,26 @@
+
+
+
+ net5.0
+
+
+
+
+
+
+
+
+ SqlModelTpl.tt
+ True
+ True
+
+
+
+
+
+ SqlModelTpl.cs
+ TextTemplatingFileGenerator
+
+
+
+
diff --git a/Ewide.Nbzs.Entity/Extends/H5IndexPrjModel.cs b/Ewide.Nbzs.Entity/Extends/H5IndexPrjModel.cs
new file mode 100644
index 0000000..c4c41ab
--- /dev/null
+++ b/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; }
+ ///
+ /// 项目信息
+ ///
+ public List PrjList { get; set; }
+ public PoliciesRegulations PoliciesRegulationsLists { get; set; }
+ }
+ public class H5IndexPrjModel
+ {
+ public string PrjId { get; set; }
+ ///
+ /// 区域
+ ///
+ public string Area { get; set; }
+ public string Name { get; set; }
+ [Newtonsoft.Json.JsonIgnore]
+ public string AreaID { get; set; }
+ ///
+ /// 征收部门
+ ///
+ public string zsbm { get; set; }
+ ///
+ /// 年份
+ ///
+ public decimal? Year { get; set; }
+ ///
+ /// 征收决定号
+ ///
+ public string Zsjdh { get; set; }
+ ///
+ /// 当前阶段
+ ///
+ public string CurrentState { get; set; }
+ ///
+ /// 项目备案日期
+ ///
+ public string CreateRecordTime { get; set; }
+ ///
+ /// 分户评估集合
+ ///
+ public List FhpgList { get; set; }
+ ///
+ /// 补偿协议集合
+ ///
+ public List BcxyList { get; set; }
+ }
+ public class PoliciesRegulations
+ {
+ public int TotalCount { get; set; }
+ public List List { get; set; }
+ }
+ public class PoliciesRegulation
+ {
+
+ public Guid ID { get; set; }
+ public string Title { get; set; }
+ public string Contents { get; set; }
+ public DateTime? PublicTime { get; set; }
+ public string Area { get; set; }
+ }
+ public class FHPG
+ {
+ public string Id { get; set; }
+ ///
+ /// 评估编号
+ ///
+ public string AssessmentNo { get; set; }
+ public string HouseAddress { get; set; }
+ ///
+ /// 被征收房屋评估金额
+ ///
+ public string HousingAssessmentValue { get; set; }
+ ///
+ /// 被征收房屋评估价值
+ ///
+ public string countValue { get; set; }
+ ///
+ /// 附属物评估金额
+ ///
+ public string AttachedAssessedValue { get; set; }
+ ///
+ /// 装修评估金额
+ ///
+ public string DecorateAssessedValue { get; set; }
+ ///
+ /// 备注
+ ///
+ public string Remark { get; set; }
+ ///
+ /// 超容积率土地补偿费
+ ///
+ public string ExceedLandMoney { get; set; }
+ ///
+ /// 阁楼补偿费
+ ///
+ 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; }
+
+ }
+}
diff --git a/Ewide.Nbzs.Entity/ModelAuto.ttinclude b/Ewide.Nbzs.Entity/ModelAuto.ttinclude
new file mode 100644
index 0000000..d1efccb
--- /dev/null
+++ b/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 blocks = new List();
+ 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;
+ }
+ }
+ }
+}#>
\ No newline at end of file
diff --git a/Ewide.Nbzs.Entity/SqlModelTpl.cs b/Ewide.Nbzs.Entity/SqlModelTpl.cs
new file mode 100644
index 0000000..aa5333b
--- /dev/null
+++ b/Ewide.Nbzs.Entity/SqlModelTpl.cs
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Ewide.Nbzs.Entity/SqlModelTpl.tt b/Ewide.Nbzs.Entity/SqlModelTpl.tt
new file mode 100644
index 0000000..8c64ca1
--- /dev/null
+++ b/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 { "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
+ {
+ ///
+ /// 数据表实体类:<#= tableClass #>
+ ///
+ [Table("<#=tableClass #>")]
+ public partial class <#= tableClass #><# if(objType=="U"){#>: BaseEntity<#}else{#>: BaseEntity<#}#>
+ {
+ <#
+ //List listBaseColumn = new List{"Id","UNID","CreateTime","CreateUserId","LastUpdateTime","IsDeleted","Sort"};
+ List listBaseColumn = new List{};
+ foreach (DataRow dr in datacloumn.Rows)
+ {
+ string columnName=GetFormColumnName(dr["columnname"].ToString(),tableClass);
+ //if(objType=="U"&&listBaseColumn.Contains(columnName))
+ if(listBaseColumn.Contains(columnName))
+ continue;
+ #>
+ ///
+ /// <#=dr["comments"].ToString()==""?"无描述": dr["comments"].ToString().Replace("\r","").Replace("\n","").Replace("\"","") #>
+ ///
+
+ [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;}
+ <#
+ }
+ #>
+ }
+
+ /**
+ ///
+ /// 数据表实体类Map:<#= tableClass #>
+ ///
+ 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);
+#>
+
+
+ <#+
+ ///
+ /// SQL[不完善,需要的自己改造]
+ ///
+ ///
+ ///
+ 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 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;
+ }
+
+
+ #>
+
diff --git a/Ewide.NbzsZheliban/Entity/DataBase/InvestigateTable_Assessment.cs b/Ewide.NbzsZheliban/Entity/DataBase/InvestigateTable_Assessment.cs
index bc36562..febfb25 100644
--- a/Ewide.NbzsZheliban/Entity/DataBase/InvestigateTable_Assessment.cs
+++ b/Ewide.NbzsZheliban/Entity/DataBase/InvestigateTable_Assessment.cs
@@ -755,9 +755,9 @@ using System.Runtime.Serialization;
///
[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");
}
}**/
diff --git a/Ewide.NbzsZheliban/Entity/DataBase/NonInvestigateTable_Assessment.cs b/Ewide.NbzsZheliban/Entity/DataBase/NonInvestigateTable_Assessment.cs
index d371f74..2877bbe 100644
--- a/Ewide.NbzsZheliban/Entity/DataBase/NonInvestigateTable_Assessment.cs
+++ b/Ewide.NbzsZheliban/Entity/DataBase/NonInvestigateTable_Assessment.cs
@@ -299,9 +299,9 @@ using System.Runtime.Serialization;
///
[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");
}
}**/
diff --git a/Ewide.NbzsZheliban/Entity/Extends/H5IndexPrjModel.cs b/Ewide.NbzsZheliban/Entity/Extends/H5IndexPrjModel.cs
index 03f1e57..c4c41ab 100644
--- a/Ewide.NbzsZheliban/Entity/Extends/H5IndexPrjModel.cs
+++ b/Ewide.NbzsZheliban/Entity/Extends/H5IndexPrjModel.cs
@@ -117,6 +117,7 @@ namespace Ewide.NbzsZheliban.Entity.Extends
/// 评估编号
///
public string AssessmentNo { get; set; }
+ public string HouseAddress { get; set; }
///
/// 被征收房屋评估金额
///
@@ -146,7 +147,11 @@ namespace Ewide.NbzsZheliban.Entity.Extends
///
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; }
}
}
diff --git a/Ewide.NbzsZheliban/Ewide.NbzsZheliban.csproj b/Ewide.NbzsZheliban/Ewide.NbzsZheliban.csproj
index abcdf6d..1e43c4d 100644
--- a/Ewide.NbzsZheliban/Ewide.NbzsZheliban.csproj
+++ b/Ewide.NbzsZheliban/Ewide.NbzsZheliban.csproj
@@ -4,31 +4,23 @@
net5.0
+
+
+
+
+
+
+
-
-
- TextTemplatingFileGenerator
- SqlModelTpl.cs
-
-
-
-
-
- True
- True
- SqlModelTpl.tt
-
-
-
diff --git a/Ewide.NbzsZheliban/Service/DataService.cs b/Ewide.NbzsZheliban/Service/DataService.cs
index cb0f8af..b3d0e0e 100644
--- a/Ewide.NbzsZheliban/Service/DataService.cs
+++ b/Ewide.NbzsZheliban/Service/DataService.cs
@@ -399,80 +399,105 @@ namespace Ewide.NbzsZheliban.Service
//非住宅
jzlrModel = db.Ado.SqlQuery("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().Where(p => p.ID == id).Select(p => new { p.ID, p.File }).First();
+ var entity_zz = db.Queryable().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().Where(p => p.ID == id).Select(p => new { p.ID, p.File }).First();
+ var entity_fzz = db.Queryable().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();
- 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();
+ 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;
}
}
diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.deps.json b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.deps.json
index a8632e2..2783264 100644
--- a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.deps.json
+++ b/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,
diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll
index d1f6c54..103d9bc 100644
Binary files a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.dll differ
diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.pdb b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.pdb
index 4e7e71a..e02aa6f 100644
Binary files a/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.pdb and b/Ewide.NbzsZheliban/bin/Debug/net5.0/Ewide.NbzsZheliban.pdb differ
diff --git a/Ewide.NbzsZheliban/bin/Debug/net5.0/ref/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Debug/net5.0/ref/Ewide.NbzsZheliban.dll
index 0d15461..82941d6 100644
Binary files a/Ewide.NbzsZheliban/bin/Debug/net5.0/ref/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/bin/Debug/net5.0/ref/Ewide.NbzsZheliban.dll differ
diff --git a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll
index bfa2477..7c2ccb6 100644
Binary files a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.dll differ
diff --git a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.pdb b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.pdb
index 796931a..df16dc3 100644
Binary files a/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.pdb and b/Ewide.NbzsZheliban/bin/Release/net5.0/Ewide.NbzsZheliban.pdb differ
diff --git a/Ewide.NbzsZheliban/bin/Release/net5.0/ref/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/bin/Release/net5.0/ref/Ewide.NbzsZheliban.dll
index be1c038..5c4bd9e 100644
Binary files a/Ewide.NbzsZheliban/bin/Release/net5.0/ref/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/bin/Release/net5.0/ref/Ewide.NbzsZheliban.dll differ
diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.assets.cache b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.assets.cache
index 4b28e45..d646126 100644
Binary files a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.assets.cache and b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.assets.cache differ
diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache
index 67e247c..ae47fc9 100644
Binary files a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache and b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache differ
diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.CoreCompileInputs.cache b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.CoreCompileInputs.cache
index a779200..8786ce0 100644
--- a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.CoreCompileInputs.cache
+++ b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-ad5333fd9787f96d4c08a3722a762bad8a91584f
+283159aa7621c878c3d2922181efab5f330e0f3b
diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.FileListAbsolute.txt b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.FileListAbsolute.txt
index 9342a4a..88141cd 100644
--- a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.FileListAbsolute.txt
+++ b/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
diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll
index d1f6c54..103d9bc 100644
Binary files a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.dll differ
diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.pdb b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.pdb
index 4e7e71a..e02aa6f 100644
Binary files a/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.pdb and b/Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.pdb differ
diff --git a/Ewide.NbzsZheliban/obj/Debug/net5.0/ref/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Debug/net5.0/ref/Ewide.NbzsZheliban.dll
index 0d15461..82941d6 100644
Binary files a/Ewide.NbzsZheliban/obj/Debug/net5.0/ref/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/obj/Debug/net5.0/ref/Ewide.NbzsZheliban.dll differ
diff --git a/Ewide.NbzsZheliban/obj/Ewide.NbzsZheliban.csproj.nuget.dgspec.json b/Ewide.NbzsZheliban/obj/Ewide.NbzsZheliban.csproj.nuget.dgspec.json
index 16bfcdb..073d95e 100644
--- a/Ewide.NbzsZheliban/obj/Ewide.NbzsZheliban.csproj.nuget.dgspec.json
+++ b/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": [
diff --git a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache
index 749e725..78850cd 100644
Binary files a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache and b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.AssemblyReference.cache differ
diff --git a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll
index bfa2477..7c2ccb6 100644
Binary files a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.dll differ
diff --git a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.pdb b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.pdb
index 796931a..df16dc3 100644
Binary files a/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.pdb and b/Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.pdb differ
diff --git a/Ewide.NbzsZheliban/obj/Release/net5.0/ref/Ewide.NbzsZheliban.dll b/Ewide.NbzsZheliban/obj/Release/net5.0/ref/Ewide.NbzsZheliban.dll
index be1c038..5c4bd9e 100644
Binary files a/Ewide.NbzsZheliban/obj/Release/net5.0/ref/Ewide.NbzsZheliban.dll and b/Ewide.NbzsZheliban/obj/Release/net5.0/ref/Ewide.NbzsZheliban.dll differ
diff --git a/Ewide.NbzsZheliban/obj/project.assets.json b/Ewide.NbzsZheliban/obj/project.assets.json
index e7499a3..6865327 100644
--- a/Ewide.NbzsZheliban/obj/project.assets.json
+++ b/Ewide.NbzsZheliban/obj/project.assets.json
@@ -379,6 +379,58 @@
"lib/netcoreapp2.0/_._": {}
}
},
+ "Microsoft.Data.SqlClient/2.1.1": {
+ "type": "package",
+ "dependencies": {
+ "Microsoft.Data.SqlClient.SNI.runtime": "2.1.1",
+ "Microsoft.Identity.Client": "4.21.1",
+ "Microsoft.IdentityModel.JsonWebTokens": "6.8.0",
+ "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0",
+ "Microsoft.Win32.Registry": "4.7.0",
+ "System.Configuration.ConfigurationManager": "4.7.0",
+ "System.Diagnostics.DiagnosticSource": "4.7.0",
+ "System.Runtime.Caching": "4.7.0",
+ "System.Security.Principal.Windows": "4.7.0",
+ "System.Text.Encoding.CodePages": "4.7.0"
+ },
+ "compile": {
+ "ref/netcoreapp3.1/Microsoft.Data.SqlClient.dll": {}
+ },
+ "runtime": {
+ "lib/netcoreapp3.1/Microsoft.Data.SqlClient.dll": {}
+ },
+ "runtimeTargets": {
+ "runtimes/unix/lib/netcoreapp3.1/Microsoft.Data.SqlClient.dll": {
+ "assetType": "runtime",
+ "rid": "unix"
+ },
+ "runtimes/win/lib/netcoreapp3.1/Microsoft.Data.SqlClient.dll": {
+ "assetType": "runtime",
+ "rid": "win"
+ }
+ }
+ },
+ "Microsoft.Data.SqlClient.SNI.runtime/2.1.1": {
+ "type": "package",
+ "runtimeTargets": {
+ "runtimes/win-arm/native/Microsoft.Data.SqlClient.SNI.dll": {
+ "assetType": "native",
+ "rid": "win-arm"
+ },
+ "runtimes/win-arm64/native/Microsoft.Data.SqlClient.SNI.dll": {
+ "assetType": "native",
+ "rid": "win-arm64"
+ },
+ "runtimes/win-x64/native/Microsoft.Data.SqlClient.SNI.dll": {
+ "assetType": "native",
+ "rid": "win-x64"
+ },
+ "runtimes/win-x86/native/Microsoft.Data.SqlClient.SNI.dll": {
+ "assetType": "native",
+ "rid": "win-x86"
+ }
+ }
+ },
"Microsoft.Data.Sqlite/2.2.4": {
"type": "package",
"dependencies": {
@@ -645,10 +697,19 @@
"lib/netcoreapp3.0/Microsoft.Extensions.Primitives.dll": {}
}
},
- "Microsoft.IdentityModel.JsonWebTokens/6.7.1": {
+ "Microsoft.Identity.Client/4.21.1": {
+ "type": "package",
+ "compile": {
+ "ref/netcoreapp2.1/_._": {}
+ },
+ "runtime": {
+ "lib/netcoreapp2.1/Microsoft.Identity.Client.dll": {}
+ }
+ },
+ "Microsoft.IdentityModel.JsonWebTokens/6.8.0": {
"type": "package",
"dependencies": {
- "Microsoft.IdentityModel.Tokens": "6.7.1"
+ "Microsoft.IdentityModel.Tokens": "6.8.0"
},
"compile": {
"lib/netstandard2.0/Microsoft.IdentityModel.JsonWebTokens.dll": {}
@@ -657,7 +718,7 @@
"lib/netstandard2.0/Microsoft.IdentityModel.JsonWebTokens.dll": {}
}
},
- "Microsoft.IdentityModel.Logging/6.7.1": {
+ "Microsoft.IdentityModel.Logging/6.8.0": {
"type": "package",
"compile": {
"lib/netstandard2.0/Microsoft.IdentityModel.Logging.dll": {}
@@ -666,11 +727,11 @@
"lib/netstandard2.0/Microsoft.IdentityModel.Logging.dll": {}
}
},
- "Microsoft.IdentityModel.Protocols/6.7.1": {
+ "Microsoft.IdentityModel.Protocols/6.8.0": {
"type": "package",
"dependencies": {
- "Microsoft.IdentityModel.Logging": "6.7.1",
- "Microsoft.IdentityModel.Tokens": "6.7.1"
+ "Microsoft.IdentityModel.Logging": "6.8.0",
+ "Microsoft.IdentityModel.Tokens": "6.8.0"
},
"compile": {
"lib/netstandard2.0/Microsoft.IdentityModel.Protocols.dll": {}
@@ -679,11 +740,11 @@
"lib/netstandard2.0/Microsoft.IdentityModel.Protocols.dll": {}
}
},
- "Microsoft.IdentityModel.Protocols.OpenIdConnect/6.7.1": {
+ "Microsoft.IdentityModel.Protocols.OpenIdConnect/6.8.0": {
"type": "package",
"dependencies": {
- "Microsoft.IdentityModel.Protocols": "6.7.1",
- "System.IdentityModel.Tokens.Jwt": "6.7.1"
+ "Microsoft.IdentityModel.Protocols": "6.8.0",
+ "System.IdentityModel.Tokens.Jwt": "6.8.0"
},
"compile": {
"lib/netstandard2.0/Microsoft.IdentityModel.Protocols.OpenIdConnect.dll": {}
@@ -692,11 +753,11 @@
"lib/netstandard2.0/Microsoft.IdentityModel.Protocols.OpenIdConnect.dll": {}
}
},
- "Microsoft.IdentityModel.Tokens/6.7.1": {
+ "Microsoft.IdentityModel.Tokens/6.8.0": {
"type": "package",
"dependencies": {
"Microsoft.CSharp": "4.5.0",
- "Microsoft.IdentityModel.Logging": "6.7.1",
+ "Microsoft.IdentityModel.Logging": "6.8.0",
"System.Security.Cryptography.Cng": "4.5.0"
},
"compile": {
@@ -744,12 +805,11 @@
"ref/netstandard1.3/Microsoft.Win32.Primitives.dll": {}
}
},
- "Microsoft.Win32.Registry/4.4.0": {
+ "Microsoft.Win32.Registry/4.7.0": {
"type": "package",
"dependencies": {
- "Microsoft.NETCore.Platforms": "2.0.0",
- "System.Security.AccessControl": "4.4.0",
- "System.Security.Principal.Windows": "4.4.0"
+ "System.Security.AccessControl": "4.7.0",
+ "System.Security.Principal.Windows": "4.7.0"
},
"compile": {
"ref/netstandard2.0/_._": {}
@@ -758,11 +818,11 @@
"lib/netstandard2.0/Microsoft.Win32.Registry.dll": {}
},
"runtimeTargets": {
- "runtimes/unix/lib/netcoreapp2.0/Microsoft.Win32.Registry.dll": {
+ "runtimes/unix/lib/netstandard2.0/Microsoft.Win32.Registry.dll": {
"assetType": "runtime",
"rid": "unix"
},
- "runtimes/win/lib/netcoreapp2.0/Microsoft.Win32.Registry.dll": {
+ "runtimes/win/lib/netstandard2.0/Microsoft.Win32.Registry.dll": {
"assetType": "runtime",
"rid": "win"
}
@@ -914,7 +974,7 @@
"System.Xml.XDocument": "4.3.0"
}
},
- "Newtonsoft.Json/12.0.3": {
+ "Newtonsoft.Json/13.0.1": {
"type": "package",
"compile": {
"lib/netstandard2.0/Newtonsoft.Json.dll": {}
@@ -935,13 +995,19 @@
"lib/netcoreapp3.0/Npgsql.dll": {}
}
},
- "Oracle.ManagedDataAccess.Core/2.18.3": {
+ "Oracle.ManagedDataAccess.Core/3.21.1": {
"type": "package",
+ "dependencies": {
+ "System.Diagnostics.PerformanceCounter": "4.7.0",
+ "System.DirectoryServices": "4.7.0",
+ "System.DirectoryServices.Protocols": "4.7.0",
+ "System.Text.Json": "4.7.1"
+ },
"compile": {
- "lib/netstandard2.0/Oracle.ManagedDataAccess.dll": {}
+ "lib/netstandard2.1/Oracle.ManagedDataAccess.dll": {}
},
"runtime": {
- "lib/netstandard2.0/Oracle.ManagedDataAccess.dll": {}
+ "lib/netstandard2.1/Oracle.ManagedDataAccess.dll": {}
}
},
"Portable.BouncyCastle/1.8.10": {
@@ -1007,14 +1073,6 @@
"lib/netstandard1.0/_._": {}
}
},
- "runtime.native.System.Data.SqlClient.sni/4.4.0": {
- "type": "package",
- "dependencies": {
- "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni": "4.4.0",
- "runtime.win-x64.runtime.native.System.Data.SqlClient.sni": "4.4.0",
- "runtime.win-x86.runtime.native.System.Data.SqlClient.sni": "4.4.0"
- }
- },
"runtime.native.System.IO.Compression/4.3.0": {
"type": "package",
"dependencies": {
@@ -1146,33 +1204,6 @@
}
}
},
- "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni/4.4.0": {
- "type": "package",
- "runtimeTargets": {
- "runtimes/win-arm64/native/sni.dll": {
- "assetType": "native",
- "rid": "win-arm64"
- }
- }
- },
- "runtime.win-x64.runtime.native.System.Data.SqlClient.sni/4.4.0": {
- "type": "package",
- "runtimeTargets": {
- "runtimes/win-x64/native/sni.dll": {
- "assetType": "native",
- "rid": "win-x64"
- }
- }
- },
- "runtime.win-x86.runtime.native.System.Data.SqlClient.sni/4.4.0": {
- "type": "package",
- "runtimeTargets": {
- "runtimes/win-x86/native/sni.dll": {
- "assetType": "native",
- "rid": "win-x86"
- }
- }
- },
"Serilog/2.10.0": {
"type": "package",
"compile": {
@@ -1422,25 +1453,25 @@
"lib/netstandard1.1/SQLitePCLRaw.provider.e_sqlite3.dll": {}
}
},
- "SqlSugarCore/5.0.3.2": {
+ "SqlSugarCore/5.0.3.8": {
"type": "package",
"dependencies": {
+ "Microsoft.Data.SqlClient": "2.1.1",
"Microsoft.Data.Sqlite": "2.2.4",
"MySql.Data": "8.0.21",
"Newtonsoft.Json": "10.0.3",
"Npgsql": "4.1.3.1",
- "Oracle.ManagedDataAccess.Core": "2.18.3",
+ "Oracle.ManagedDataAccess.Core": "3.21.1",
"SqlSugarCore.Dm": "1.0.0",
"SqlSugarCore.Kdbndp": "1.0.0",
"System.Data.Common": "4.3.0",
- "System.Data.SqlClient": "4.4.0",
"System.Reflection.Emit.Lightweight": "4.3.0"
},
"compile": {
- "lib/netstandard2.0/SqlSugar.dll": {}
+ "lib/netstandard2.1/SqlSugar.dll": {}
},
"runtime": {
- "lib/netstandard2.0/SqlSugar.dll": {}
+ "lib/netstandard2.1/SqlSugar.dll": {}
}
},
"SqlSugarCore.Dm/1.0.0": {
@@ -1700,31 +1731,6 @@
"lib/netstandard1.2/System.Data.Common.dll": {}
}
},
- "System.Data.SqlClient/4.4.0": {
- "type": "package",
- "dependencies": {
- "Microsoft.Win32.Registry": "4.4.0",
- "System.Security.Principal.Windows": "4.4.0",
- "System.Text.Encoding.CodePages": "4.4.0",
- "runtime.native.System.Data.SqlClient.sni": "4.4.0"
- },
- "compile": {
- "ref/netstandard2.0/System.Data.SqlClient.dll": {}
- },
- "runtime": {
- "lib/netstandard2.0/System.Data.SqlClient.dll": {}
- },
- "runtimeTargets": {
- "runtimes/unix/lib/netstandard2.0/System.Data.SqlClient.dll": {
- "assetType": "runtime",
- "rid": "unix"
- },
- "runtimes/win/lib/netstandard2.0/System.Data.SqlClient.dll": {
- "assetType": "runtime",
- "rid": "win"
- }
- }
- },
"System.Diagnostics.Debug/4.3.0": {
"type": "package",
"dependencies": {
@@ -1745,6 +1751,27 @@
"lib/net5.0/System.Diagnostics.DiagnosticSource.dll": {}
}
},
+ "System.Diagnostics.PerformanceCounter/4.7.0": {
+ "type": "package",
+ "dependencies": {
+ "Microsoft.NETCore.Platforms": "3.1.0",
+ "Microsoft.Win32.Registry": "4.7.0",
+ "System.Configuration.ConfigurationManager": "4.7.0",
+ "System.Security.Principal.Windows": "4.7.0"
+ },
+ "compile": {
+ "ref/netstandard2.0/System.Diagnostics.PerformanceCounter.dll": {}
+ },
+ "runtime": {
+ "lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll": {}
+ },
+ "runtimeTargets": {
+ "runtimes/win/lib/netcoreapp2.0/System.Diagnostics.PerformanceCounter.dll": {
+ "assetType": "runtime",
+ "rid": "win"
+ }
+ }
+ },
"System.Diagnostics.StackTrace/4.3.0": {
"type": "package",
"dependencies": {
@@ -1809,6 +1836,47 @@
"ref/netstandard1.5/System.Diagnostics.Tracing.dll": {}
}
},
+ "System.DirectoryServices/4.7.0": {
+ "type": "package",
+ "dependencies": {
+ "Microsoft.NETCore.Platforms": "3.1.0",
+ "System.IO.FileSystem.AccessControl": "4.7.0",
+ "System.Security.AccessControl": "4.7.0",
+ "System.Security.Permissions": "4.7.0",
+ "System.Security.Principal.Windows": "4.7.0"
+ },
+ "compile": {
+ "ref/netstandard2.0/System.DirectoryServices.dll": {}
+ },
+ "runtime": {
+ "lib/netstandard2.0/System.DirectoryServices.dll": {}
+ },
+ "runtimeTargets": {
+ "runtimes/win/lib/netcoreapp2.0/System.DirectoryServices.dll": {
+ "assetType": "runtime",
+ "rid": "win"
+ }
+ }
+ },
+ "System.DirectoryServices.Protocols/4.7.0": {
+ "type": "package",
+ "dependencies": {
+ "Microsoft.NETCore.Platforms": "3.1.0",
+ "System.Security.Principal.Windows": "4.7.0"
+ },
+ "compile": {
+ "ref/netstandard2.0/System.DirectoryServices.Protocols.dll": {}
+ },
+ "runtime": {
+ "lib/netstandard2.0/System.DirectoryServices.Protocols.dll": {}
+ },
+ "runtimeTargets": {
+ "runtimes/win/lib/netcoreapp2.0/System.DirectoryServices.Protocols.dll": {
+ "assetType": "runtime",
+ "rid": "win"
+ }
+ }
+ },
"System.Drawing.Common/5.0.2": {
"type": "package",
"dependencies": {
@@ -1903,11 +1971,11 @@
}
}
},
- "System.IdentityModel.Tokens.Jwt/6.7.1": {
+ "System.IdentityModel.Tokens.Jwt/6.8.0": {
"type": "package",
"dependencies": {
- "Microsoft.IdentityModel.JsonWebTokens": "6.7.1",
- "Microsoft.IdentityModel.Tokens": "6.7.1"
+ "Microsoft.IdentityModel.JsonWebTokens": "6.8.0",
+ "Microsoft.IdentityModel.Tokens": "6.8.0"
},
"compile": {
"lib/netstandard2.0/System.IdentityModel.Tokens.Jwt.dll": {}
@@ -1998,6 +2066,25 @@
"ref/netstandard1.3/System.IO.FileSystem.dll": {}
}
},
+ "System.IO.FileSystem.AccessControl/4.7.0": {
+ "type": "package",
+ "dependencies": {
+ "System.Security.AccessControl": "4.7.0",
+ "System.Security.Principal.Windows": "4.7.0"
+ },
+ "compile": {
+ "ref/netstandard2.0/System.IO.FileSystem.AccessControl.dll": {}
+ },
+ "runtime": {
+ "lib/netstandard2.0/System.IO.FileSystem.AccessControl.dll": {}
+ },
+ "runtimeTargets": {
+ "runtimes/win/lib/netstandard2.0/System.IO.FileSystem.AccessControl.dll": {
+ "assetType": "runtime",
+ "rid": "win"
+ }
+ }
+ },
"System.IO.FileSystem.Primitives/4.3.0": {
"type": "package",
"dependencies": {
@@ -2316,6 +2403,24 @@
"ref/netstandard1.5/System.Runtime.dll": {}
}
},
+ "System.Runtime.Caching/4.7.0": {
+ "type": "package",
+ "dependencies": {
+ "System.Configuration.ConfigurationManager": "4.7.0"
+ },
+ "compile": {
+ "ref/netstandard2.0/_._": {}
+ },
+ "runtime": {
+ "lib/netstandard2.0/System.Runtime.Caching.dll": {}
+ },
+ "runtimeTargets": {
+ "runtimes/win/lib/netstandard2.0/System.Runtime.Caching.dll": {
+ "assetType": "runtime",
+ "rid": "win"
+ }
+ }
+ },
"System.Runtime.CompilerServices.Unsafe/5.0.0": {
"type": "package",
"compile": {
@@ -2991,7 +3096,7 @@
"Furion": "2.18.7",
"Furion.Extras.Authentication.JwtBearer": "2.18.7",
"Furion.Extras.DatabaseAccessor.Dapper": "2.18.7",
- "Furion.Extras.DatabaseAccessor.SqlSugar": "2.12.9",
+ "Furion.Extras.DatabaseAccessor.SqlSugar": "2.18.7",
"Furion.Extras.Logging.Serilog": "2.18.7",
"Furion.Extras.ObjectMapper.Mapster": "2.18.7",
"Kendo.DynamicLinqCore": "3.1.1",
@@ -3009,6 +3114,19 @@
"bin/placeholder/Ewide.Core.dll": {}
}
},
+ "Ewide.Nbzs.Entity/1.0.0": {
+ "type": "project",
+ "framework": ".NETCoreApp,Version=v5.0",
+ "dependencies": {
+ "Newtonsoft.Json": "13.0.1"
+ },
+ "compile": {
+ "bin/placeholder/Ewide.Nbzs.Entity.dll": {}
+ },
+ "runtime": {
+ "bin/placeholder/Ewide.Nbzs.Entity.dll": {}
+ }
+ },
"Furion/2.18.7": {
"type": "project",
"framework": ".NETCoreApp,Version=v5.0",
@@ -3056,11 +3174,11 @@
"Microsoft.AspNetCore.App"
]
},
- "Furion.Extras.DatabaseAccessor.SqlSugar/2.12.9": {
+ "Furion.Extras.DatabaseAccessor.SqlSugar/2.18.7": {
"type": "project",
"framework": ".NETCoreApp,Version=v5.0",
"dependencies": {
- "sqlSugarCore": "5.0.3.2"
+ "sqlSugarCore": "5.0.3.8"
},
"compile": {
"bin/placeholder/Furion.Extras.DatabaseAccessor.SqlSugar.dll": {}
@@ -3709,6 +3827,93 @@
"version.txt"
]
},
+ "Microsoft.Data.SqlClient/2.1.1": {
+ "sha512": "qxPmA2q0/oqqzZiwgN2QcoFRMPPQOCOxJP9h8X/bLXkPRsIo8xy182td9Txt0WhobW1dBBSYj96/Wf9cmhpm7Q==",
+ "type": "package",
+ "path": "microsoft.data.sqlclient/2.1.1",
+ "files": [
+ ".nupkg.metadata",
+ ".signature.p7s",
+ "dotnet.png",
+ "lib/net46/Microsoft.Data.SqlClient.dll",
+ "lib/net46/Microsoft.Data.SqlClient.pdb",
+ "lib/net46/Microsoft.Data.SqlClient.xml",
+ "lib/net46/de/Microsoft.Data.SqlClient.resources.dll",
+ "lib/net46/es/Microsoft.Data.SqlClient.resources.dll",
+ "lib/net46/fr/Microsoft.Data.SqlClient.resources.dll",
+ "lib/net46/it/Microsoft.Data.SqlClient.resources.dll",
+ "lib/net46/ja/Microsoft.Data.SqlClient.resources.dll",
+ "lib/net46/ko/Microsoft.Data.SqlClient.resources.dll",
+ "lib/net46/pt-BR/Microsoft.Data.SqlClient.resources.dll",
+ "lib/net46/ru/Microsoft.Data.SqlClient.resources.dll",
+ "lib/net46/zh-Hans/Microsoft.Data.SqlClient.resources.dll",
+ "lib/net46/zh-Hant/Microsoft.Data.SqlClient.resources.dll",
+ "lib/netcoreapp2.1/Microsoft.Data.SqlClient.dll",
+ "lib/netcoreapp2.1/Microsoft.Data.SqlClient.pdb",
+ "lib/netcoreapp2.1/Microsoft.Data.SqlClient.xml",
+ "lib/netcoreapp3.1/Microsoft.Data.SqlClient.dll",
+ "lib/netcoreapp3.1/Microsoft.Data.SqlClient.pdb",
+ "lib/netcoreapp3.1/Microsoft.Data.SqlClient.xml",
+ "lib/netstandard2.0/Microsoft.Data.SqlClient.dll",
+ "lib/netstandard2.0/Microsoft.Data.SqlClient.pdb",
+ "lib/netstandard2.0/Microsoft.Data.SqlClient.xml",
+ "lib/netstandard2.1/Microsoft.Data.SqlClient.dll",
+ "lib/netstandard2.1/Microsoft.Data.SqlClient.pdb",
+ "lib/netstandard2.1/Microsoft.Data.SqlClient.xml",
+ "microsoft.data.sqlclient.2.1.1.nupkg.sha512",
+ "microsoft.data.sqlclient.nuspec",
+ "ref/net46/Microsoft.Data.SqlClient.dll",
+ "ref/net46/Microsoft.Data.SqlClient.pdb",
+ "ref/net46/Microsoft.Data.SqlClient.xml",
+ "ref/netcoreapp2.1/Microsoft.Data.SqlClient.dll",
+ "ref/netcoreapp2.1/Microsoft.Data.SqlClient.pdb",
+ "ref/netcoreapp2.1/Microsoft.Data.SqlClient.xml",
+ "ref/netcoreapp3.1/Microsoft.Data.SqlClient.dll",
+ "ref/netcoreapp3.1/Microsoft.Data.SqlClient.pdb",
+ "ref/netcoreapp3.1/Microsoft.Data.SqlClient.xml",
+ "ref/netstandard2.0/Microsoft.Data.SqlClient.dll",
+ "ref/netstandard2.0/Microsoft.Data.SqlClient.pdb",
+ "ref/netstandard2.0/Microsoft.Data.SqlClient.xml",
+ "ref/netstandard2.1/Microsoft.Data.SqlClient.dll",
+ "ref/netstandard2.1/Microsoft.Data.SqlClient.pdb",
+ "ref/netstandard2.1/Microsoft.Data.SqlClient.xml",
+ "runtimes/unix/lib/netcoreapp2.1/Microsoft.Data.SqlClient.dll",
+ "runtimes/unix/lib/netcoreapp2.1/Microsoft.Data.SqlClient.pdb",
+ "runtimes/unix/lib/netcoreapp3.1/Microsoft.Data.SqlClient.dll",
+ "runtimes/unix/lib/netcoreapp3.1/Microsoft.Data.SqlClient.pdb",
+ "runtimes/unix/lib/netstandard2.0/Microsoft.Data.SqlClient.dll",
+ "runtimes/unix/lib/netstandard2.0/Microsoft.Data.SqlClient.pdb",
+ "runtimes/unix/lib/netstandard2.1/Microsoft.Data.SqlClient.dll",
+ "runtimes/unix/lib/netstandard2.1/Microsoft.Data.SqlClient.pdb",
+ "runtimes/win/lib/net46/Microsoft.Data.SqlClient.dll",
+ "runtimes/win/lib/net46/Microsoft.Data.SqlClient.pdb",
+ "runtimes/win/lib/netcoreapp2.1/Microsoft.Data.SqlClient.dll",
+ "runtimes/win/lib/netcoreapp2.1/Microsoft.Data.SqlClient.pdb",
+ "runtimes/win/lib/netcoreapp3.1/Microsoft.Data.SqlClient.dll",
+ "runtimes/win/lib/netcoreapp3.1/Microsoft.Data.SqlClient.pdb",
+ "runtimes/win/lib/netstandard2.0/Microsoft.Data.SqlClient.dll",
+ "runtimes/win/lib/netstandard2.0/Microsoft.Data.SqlClient.pdb",
+ "runtimes/win/lib/netstandard2.1/Microsoft.Data.SqlClient.dll",
+ "runtimes/win/lib/netstandard2.1/Microsoft.Data.SqlClient.pdb"
+ ]
+ },
+ "Microsoft.Data.SqlClient.SNI.runtime/2.1.1": {
+ "sha512": "JwGDWkyZgm7SATJmFLfT2G4teimvNbNtq3lsS9a5DzvhEZnQrZjZhevCU0vdx8MjheLHoG5vocuO03QtioFQxQ==",
+ "type": "package",
+ "path": "microsoft.data.sqlclient.sni.runtime/2.1.1",
+ "files": [
+ ".nupkg.metadata",
+ ".signature.p7s",
+ "LICENSE.txt",
+ "dotnet.png",
+ "microsoft.data.sqlclient.sni.runtime.2.1.1.nupkg.sha512",
+ "microsoft.data.sqlclient.sni.runtime.nuspec",
+ "runtimes/win-arm/native/Microsoft.Data.SqlClient.SNI.dll",
+ "runtimes/win-arm64/native/Microsoft.Data.SqlClient.SNI.dll",
+ "runtimes/win-x64/native/Microsoft.Data.SqlClient.SNI.dll",
+ "runtimes/win-x86/native/Microsoft.Data.SqlClient.SNI.dll"
+ ]
+ },
"Microsoft.Data.Sqlite/2.2.4": {
"sha512": "QgYDdW07QZUyZPwisIU3Db62FnK6Yfcuru7KAsHusLGstJ0kBIXFnG185PcWmm2ba4AN0ab1iwrhXZr/9Yxj0w==",
"type": "package",
@@ -4104,10 +4309,58 @@
"version.txt"
]
},
- "Microsoft.IdentityModel.JsonWebTokens/6.7.1": {
- "sha512": "q/Ii8ILV8cM1X49gnl12cJK+0KWiI1xUeiLYiE9+uRonJLaHWB0l8t89rGnZTEGthGKItyikKSB38LQpfy/zBw==",
+ "Microsoft.Identity.Client/4.21.1": {
+ "sha512": "vycgk7S/HAbHaUaK4Tid1fsWHsXdFRRP2KavAIOHCVV27zvuQfYAjXmMvctuuF4egydSumG58CwPZob3gWeYgQ==",
"type": "package",
- "path": "microsoft.identitymodel.jsonwebtokens/6.7.1",
+ "path": "microsoft.identity.client/4.21.1",
+ "files": [
+ ".nupkg.metadata",
+ ".signature.p7s",
+ "lib/monoandroid10.0/Microsoft.Identity.Client.dll",
+ "lib/monoandroid10.0/Microsoft.Identity.Client.xml",
+ "lib/monoandroid90/Microsoft.Identity.Client.dll",
+ "lib/monoandroid90/Microsoft.Identity.Client.xml",
+ "lib/net45/Microsoft.Identity.Client.dll",
+ "lib/net45/Microsoft.Identity.Client.xml",
+ "lib/net461/Microsoft.Identity.Client.dll",
+ "lib/net461/Microsoft.Identity.Client.xml",
+ "lib/netcoreapp2.1/Microsoft.Identity.Client.dll",
+ "lib/netcoreapp2.1/Microsoft.Identity.Client.xml",
+ "lib/netstandard1.3/Microsoft.Identity.Client.dll",
+ "lib/netstandard1.3/Microsoft.Identity.Client.xml",
+ "lib/uap10.0/Microsoft.Identity.Client.dll",
+ "lib/uap10.0/Microsoft.Identity.Client.pri",
+ "lib/uap10.0/Microsoft.Identity.Client.xml",
+ "lib/xamarinios10/Microsoft.Identity.Client.dll",
+ "lib/xamarinios10/Microsoft.Identity.Client.xml",
+ "lib/xamarinmac20/Microsoft.Identity.Client.dll",
+ "lib/xamarinmac20/Microsoft.Identity.Client.xml",
+ "microsoft.identity.client.4.21.1.nupkg.sha512",
+ "microsoft.identity.client.nuspec",
+ "ref/MonoAndroid10.0/Microsoft.Identity.Client.dll",
+ "ref/MonoAndroid10.0/Microsoft.Identity.Client.xml",
+ "ref/MonoAndroid9.0/Microsoft.Identity.Client.dll",
+ "ref/MonoAndroid9.0/Microsoft.Identity.Client.xml",
+ "ref/Xamarin.iOS10/Microsoft.Identity.Client.dll",
+ "ref/Xamarin.iOS10/Microsoft.Identity.Client.xml",
+ "ref/net45/Microsoft.Identity.Client.dll",
+ "ref/net45/Microsoft.Identity.Client.xml",
+ "ref/net461/Microsoft.Identity.Client.dll",
+ "ref/net461/Microsoft.Identity.Client.xml",
+ "ref/netcoreapp2.1/Microsoft.Identity.Client.dll",
+ "ref/netcoreapp2.1/Microsoft.Identity.Client.xml",
+ "ref/netstandard1.3/Microsoft.Identity.Client.dll",
+ "ref/netstandard1.3/Microsoft.Identity.Client.xml",
+ "ref/uap10.0/Microsoft.Identity.Client.dll",
+ "ref/uap10.0/Microsoft.Identity.Client.xml",
+ "ref/xamarinmac20/Microsoft.Identity.Client.dll",
+ "ref/xamarinmac20/Microsoft.Identity.Client.xml"
+ ]
+ },
+ "Microsoft.IdentityModel.JsonWebTokens/6.8.0": {
+ "sha512": "+7JIww64PkMt7NWFxoe4Y/joeF7TAtA/fQ0b2GFGcagzB59sKkTt/sMZWR6aSZht5YC7SdHi3W6yM1yylRGJCQ==",
+ "type": "package",
+ "path": "microsoft.identitymodel.jsonwebtokens/6.8.0",
"files": [
".nupkg.metadata",
".signature.p7s",
@@ -4117,14 +4370,14 @@
"lib/net461/Microsoft.IdentityModel.JsonWebTokens.xml",
"lib/netstandard2.0/Microsoft.IdentityModel.JsonWebTokens.dll",
"lib/netstandard2.0/Microsoft.IdentityModel.JsonWebTokens.xml",
- "microsoft.identitymodel.jsonwebtokens.6.7.1.nupkg.sha512",
+ "microsoft.identitymodel.jsonwebtokens.6.8.0.nupkg.sha512",
"microsoft.identitymodel.jsonwebtokens.nuspec"
]
},
- "Microsoft.IdentityModel.Logging/6.7.1": {
- "sha512": "WGtTiTy2ZikOz/I5GxCGbNPLOpyI9fPyuyG4Q5rfkhACK+Q0Ad6U8XajYZ2cJ2cFKse0IvHwm15HVrfwrX/89g==",
+ "Microsoft.IdentityModel.Logging/6.8.0": {
+ "sha512": "Rfh/p4MaN4gkmhPxwbu8IjrmoDncGfHHPh1sTnc0AcM/Oc39/fzC9doKNWvUAjzFb8LqA6lgZyblTrIsX/wDXg==",
"type": "package",
- "path": "microsoft.identitymodel.logging/6.7.1",
+ "path": "microsoft.identitymodel.logging/6.8.0",
"files": [
".nupkg.metadata",
".signature.p7s",
@@ -4134,14 +4387,14 @@
"lib/net461/Microsoft.IdentityModel.Logging.xml",
"lib/netstandard2.0/Microsoft.IdentityModel.Logging.dll",
"lib/netstandard2.0/Microsoft.IdentityModel.Logging.xml",
- "microsoft.identitymodel.logging.6.7.1.nupkg.sha512",
+ "microsoft.identitymodel.logging.6.8.0.nupkg.sha512",
"microsoft.identitymodel.logging.nuspec"
]
},
- "Microsoft.IdentityModel.Protocols/6.7.1": {
- "sha512": "DVGYIRUK3TkCTmz0IgBzWUE55CDNfLtXil1FgSbgHI7hi2fP2pz4tiTAno/5O/hdVwAzV+HtCQtFi7xW8smaHw==",
+ "Microsoft.IdentityModel.Protocols/6.8.0": {
+ "sha512": "OJZx5nPdiH+MEkwCkbJrTAUiO/YzLe0VSswNlDxJsJD9bhOIdXHufh650pfm59YH1DNevp3/bXzukKrG57gA1w==",
"type": "package",
- "path": "microsoft.identitymodel.protocols/6.7.1",
+ "path": "microsoft.identitymodel.protocols/6.8.0",
"files": [
".nupkg.metadata",
".signature.p7s",
@@ -4151,14 +4404,14 @@
"lib/net461/Microsoft.IdentityModel.Protocols.xml",
"lib/netstandard2.0/Microsoft.IdentityModel.Protocols.dll",
"lib/netstandard2.0/Microsoft.IdentityModel.Protocols.xml",
- "microsoft.identitymodel.protocols.6.7.1.nupkg.sha512",
+ "microsoft.identitymodel.protocols.6.8.0.nupkg.sha512",
"microsoft.identitymodel.protocols.nuspec"
]
},
- "Microsoft.IdentityModel.Protocols.OpenIdConnect/6.7.1": {
- "sha512": "99gA+E6ZOCqySrT80Yh6wrfjJfeMxDisdAcA5Q66zHxMPY5Gzc8aT2Ldzu0GP1sADv/o3yI1Gc3P1GHXlXAVVQ==",
+ "Microsoft.IdentityModel.Protocols.OpenIdConnect/6.8.0": {
+ "sha512": "X/PiV5l3nYYsodtrNMrNQIVlDmHpjQQ5w48E+o/D5H4es2+4niEyQf3l03chvZGWNzBRhfSstaXr25/Ye4AeYw==",
"type": "package",
- "path": "microsoft.identitymodel.protocols.openidconnect/6.7.1",
+ "path": "microsoft.identitymodel.protocols.openidconnect/6.8.0",
"files": [
".nupkg.metadata",
".signature.p7s",
@@ -4168,14 +4421,14 @@
"lib/net461/Microsoft.IdentityModel.Protocols.OpenIdConnect.xml",
"lib/netstandard2.0/Microsoft.IdentityModel.Protocols.OpenIdConnect.dll",
"lib/netstandard2.0/Microsoft.IdentityModel.Protocols.OpenIdConnect.xml",
- "microsoft.identitymodel.protocols.openidconnect.6.7.1.nupkg.sha512",
+ "microsoft.identitymodel.protocols.openidconnect.6.8.0.nupkg.sha512",
"microsoft.identitymodel.protocols.openidconnect.nuspec"
]
},
- "Microsoft.IdentityModel.Tokens/6.7.1": {
- "sha512": "Td9Vn9d/0eM1zlUUvaVQzjqdBkBLJ2oGtGL/LYPuiCUAALMeAHVDtpXGk8eYI8Gbduz5n+o7ifldsCIca4MWew==",
+ "Microsoft.IdentityModel.Tokens/6.8.0": {
+ "sha512": "gTqzsGcmD13HgtNePPcuVHZ/NXWmyV+InJgalW/FhWpII1D7V1k0obIseGlWMeA4G+tZfeGMfXr0klnWbMR/mQ==",
"type": "package",
- "path": "microsoft.identitymodel.tokens/6.7.1",
+ "path": "microsoft.identitymodel.tokens/6.8.0",
"files": [
".nupkg.metadata",
".signature.p7s",
@@ -4185,7 +4438,7 @@
"lib/net461/Microsoft.IdentityModel.Tokens.xml",
"lib/netstandard2.0/Microsoft.IdentityModel.Tokens.dll",
"lib/netstandard2.0/Microsoft.IdentityModel.Tokens.xml",
- "microsoft.identitymodel.tokens.6.7.1.nupkg.sha512",
+ "microsoft.identitymodel.tokens.6.8.0.nupkg.sha512",
"microsoft.identitymodel.tokens.nuspec"
]
},
@@ -4275,10 +4528,10 @@
"ref/xamarinwatchos10/_._"
]
},
- "Microsoft.Win32.Registry/4.4.0": {
- "sha512": "dA36TlNVn/XfrZtmf0fiI/z1nd3Wfp2QVzTdj26pqgP9LFWq0i1hYEUAW50xUjGFYn1+/cP3KGuxT2Yn1OUNBQ==",
+ "Microsoft.Win32.Registry/4.7.0": {
+ "sha512": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==",
"type": "package",
- "path": "microsoft.win32.registry/4.4.0",
+ "path": "microsoft.win32.registry/4.7.0",
"files": [
".nupkg.metadata",
".signature.p7s",
@@ -4286,13 +4539,17 @@
"THIRD-PARTY-NOTICES.TXT",
"lib/net46/Microsoft.Win32.Registry.dll",
"lib/net461/Microsoft.Win32.Registry.dll",
+ "lib/net461/Microsoft.Win32.Registry.xml",
"lib/netstandard1.3/Microsoft.Win32.Registry.dll",
"lib/netstandard2.0/Microsoft.Win32.Registry.dll",
- "microsoft.win32.registry.4.4.0.nupkg.sha512",
+ "lib/netstandard2.0/Microsoft.Win32.Registry.xml",
+ "microsoft.win32.registry.4.7.0.nupkg.sha512",
"microsoft.win32.registry.nuspec",
"ref/net46/Microsoft.Win32.Registry.dll",
"ref/net461/Microsoft.Win32.Registry.dll",
"ref/net461/Microsoft.Win32.Registry.xml",
+ "ref/net472/Microsoft.Win32.Registry.dll",
+ "ref/net472/Microsoft.Win32.Registry.xml",
"ref/netstandard1.3/Microsoft.Win32.Registry.dll",
"ref/netstandard1.3/Microsoft.Win32.Registry.xml",
"ref/netstandard1.3/de/Microsoft.Win32.Registry.xml",
@@ -4306,11 +4563,14 @@
"ref/netstandard1.3/zh-hant/Microsoft.Win32.Registry.xml",
"ref/netstandard2.0/Microsoft.Win32.Registry.dll",
"ref/netstandard2.0/Microsoft.Win32.Registry.xml",
- "runtimes/unix/lib/netcoreapp2.0/Microsoft.Win32.Registry.dll",
+ "runtimes/unix/lib/netstandard2.0/Microsoft.Win32.Registry.dll",
+ "runtimes/unix/lib/netstandard2.0/Microsoft.Win32.Registry.xml",
"runtimes/win/lib/net46/Microsoft.Win32.Registry.dll",
"runtimes/win/lib/net461/Microsoft.Win32.Registry.dll",
- "runtimes/win/lib/netcoreapp2.0/Microsoft.Win32.Registry.dll",
+ "runtimes/win/lib/net461/Microsoft.Win32.Registry.xml",
"runtimes/win/lib/netstandard1.3/Microsoft.Win32.Registry.dll",
+ "runtimes/win/lib/netstandard2.0/Microsoft.Win32.Registry.dll",
+ "runtimes/win/lib/netstandard2.0/Microsoft.Win32.Registry.xml",
"useSharedDesignerContext.txt",
"version.txt"
]
@@ -4434,10 +4694,10 @@
"netstandard.library.nuspec"
]
},
- "Newtonsoft.Json/12.0.3": {
- "sha512": "6mgjfnRB4jKMlzHSl+VD+oUc1IebOZabkbyWj2RiTgWwYPPuaK1H97G1sHqGwPlS5npiF5Q0OrxN1wni2n5QWg==",
+ "Newtonsoft.Json/13.0.1": {
+ "sha512": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==",
"type": "package",
- "path": "newtonsoft.json/12.0.3",
+ "path": "newtonsoft.json/13.0.1",
"files": [
".nupkg.metadata",
".signature.p7s",
@@ -4456,11 +4716,7 @@
"lib/netstandard1.3/Newtonsoft.Json.xml",
"lib/netstandard2.0/Newtonsoft.Json.dll",
"lib/netstandard2.0/Newtonsoft.Json.xml",
- "lib/portable-net40+sl5+win8+wp8+wpa81/Newtonsoft.Json.dll",
- "lib/portable-net40+sl5+win8+wp8+wpa81/Newtonsoft.Json.xml",
- "lib/portable-net45+win8+wp8+wpa81/Newtonsoft.Json.dll",
- "lib/portable-net45+win8+wp8+wpa81/Newtonsoft.Json.xml",
- "newtonsoft.json.12.0.3.nupkg.sha512",
+ "newtonsoft.json.13.0.1.nupkg.sha512",
"newtonsoft.json.nuspec",
"packageIcon.png"
]
@@ -4489,16 +4745,18 @@
"postgresql.png"
]
},
- "Oracle.ManagedDataAccess.Core/2.18.3": {
- "sha512": "YaN+rm9wgFQAuWxrrR7lUxEQI4WJnNkMTlZb+gbv2W4D/ML2kkgz4N8Z76W9Polx6BU+kK3Vx2R8RD9u7sea7g==",
+ "Oracle.ManagedDataAccess.Core/3.21.1": {
+ "sha512": "SJM0qRVz6a7xMJtPPHAObq7MEzo42T+6+MImuuUK7ZCTXc2BIXbc9cenN7006FcOuX8x4OeTpPbFfQTVlhk9bw==",
"type": "package",
- "path": "oracle.manageddataaccess.core/2.18.3",
+ "path": "oracle.manageddataaccess.core/3.21.1",
"files": [
".nupkg.metadata",
".signature.p7s",
+ "PerfCounters/register_odpc_perfmon_counters.ps1",
+ "PerfCounters/unregister_odpc_perfmon_counters.ps1",
"info.txt",
- "lib/netstandard2.0/Oracle.ManagedDataAccess.dll",
- "oracle.manageddataaccess.core.2.18.3.nupkg.sha512",
+ "lib/netstandard2.1/Oracle.ManagedDataAccess.dll",
+ "oracle.manageddataaccess.core.3.21.1.nupkg.sha512",
"oracle.manageddataaccess.core.nuspec",
"readme.txt"
]
@@ -4588,20 +4846,6 @@
"runtime.native.system.nuspec"
]
},
- "runtime.native.System.Data.SqlClient.sni/4.4.0": {
- "sha512": "A8v6PGmk+UGbfWo5Ixup0lPM4swuSwOiayJExZwKIOjTlFFQIsu3QnDXECosBEyrWSPryxBVrdqtJyhK3BaupQ==",
- "type": "package",
- "path": "runtime.native.system.data.sqlclient.sni/4.4.0",
- "files": [
- ".nupkg.metadata",
- "LICENSE.TXT",
- "THIRD-PARTY-NOTICES.TXT",
- "runtime.native.system.data.sqlclient.sni.4.4.0.nupkg.sha512",
- "runtime.native.system.data.sqlclient.sni.nuspec",
- "useSharedDesignerContext.txt",
- "version.txt"
- ]
- },
"runtime.native.System.IO.Compression/4.3.0": {
"sha512": "INBPonS5QPEgn7naufQFXJEp3zX6L4bwHgJ/ZH78aBTpeNfQMtf7C6VrAFhlq2xxWBveIOWyFzQjJ8XzHMhdOQ==",
"type": "package",
@@ -4758,51 +5002,6 @@
"runtimes/ubuntu.16.10-x64/native/System.Security.Cryptography.Native.OpenSsl.so"
]
},
- "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni/4.4.0": {
- "sha512": "LbrynESTp3bm5O/+jGL8v0Qg5SJlTV08lpIpFesXjF6uGNMWqFnUQbYBJwZTeua6E/Y7FIM1C54Ey1btLWupdg==",
- "type": "package",
- "path": "runtime.win-arm64.runtime.native.system.data.sqlclient.sni/4.4.0",
- "files": [
- ".nupkg.metadata",
- "ThirdPartyNotices.txt",
- "dotnet_library_license.txt",
- "runtime.win-arm64.runtime.native.system.data.sqlclient.sni.4.4.0.nupkg.sha512",
- "runtime.win-arm64.runtime.native.system.data.sqlclient.sni.nuspec",
- "runtimes/win-arm64/native/sni.dll",
- "useSharedDesignerContext.txt",
- "version.txt"
- ]
- },
- "runtime.win-x64.runtime.native.System.Data.SqlClient.sni/4.4.0": {
- "sha512": "38ugOfkYJqJoX9g6EYRlZB5U2ZJH51UP8ptxZgdpS07FgOEToV+lS11ouNK2PM12Pr6X/PpT5jK82G3DwH/SxQ==",
- "type": "package",
- "path": "runtime.win-x64.runtime.native.system.data.sqlclient.sni/4.4.0",
- "files": [
- ".nupkg.metadata",
- "ThirdPartyNotices.txt",
- "dotnet_library_license.txt",
- "runtime.win-x64.runtime.native.system.data.sqlclient.sni.4.4.0.nupkg.sha512",
- "runtime.win-x64.runtime.native.system.data.sqlclient.sni.nuspec",
- "runtimes/win-x64/native/sni.dll",
- "useSharedDesignerContext.txt",
- "version.txt"
- ]
- },
- "runtime.win-x86.runtime.native.System.Data.SqlClient.sni/4.4.0": {
- "sha512": "YhEdSQUsTx+C8m8Bw7ar5/VesXvCFMItyZF7G1AUY+OM0VPZUOeAVpJ4Wl6fydBGUYZxojTDR3I6Bj/+BPkJNA==",
- "type": "package",
- "path": "runtime.win-x86.runtime.native.system.data.sqlclient.sni/4.4.0",
- "files": [
- ".nupkg.metadata",
- "ThirdPartyNotices.txt",
- "dotnet_library_license.txt",
- "runtime.win-x86.runtime.native.system.data.sqlclient.sni.4.4.0.nupkg.sha512",
- "runtime.win-x86.runtime.native.system.data.sqlclient.sni.nuspec",
- "runtimes/win-x86/native/sni.dll",
- "useSharedDesignerContext.txt",
- "version.txt"
- ]
- },
"Serilog/2.10.0": {
"sha512": "+QX0hmf37a0/OZLxM3wL7V6/ADvC1XihXN4Kq/p6d8lCPfgkRdiuhbWlMaFjR9Av0dy5F0+MBeDmDdRZN/YwQA==",
"type": "package",
@@ -5112,15 +5311,15 @@
"sqlitepclraw.provider.e_sqlite3.netstandard11.nuspec"
]
},
- "SqlSugarCore/5.0.3.2": {
- "sha512": "Oyl73NFAPBYNgV/6qfclNTarLMAkpvPFT0kzzwNryoriJXtUgDngTPedfd4nYbrs+k7vlTMlgAOfQtJoIA6tWQ==",
+ "SqlSugarCore/5.0.3.8": {
+ "sha512": "5J4JWa0lZxF5OTZz7KKPnJrijwpCx6lUduR8dTqhnCy9FNTPI/S2bRlv7C181JIHBKc7zwIkPY+tOtszGKBuKQ==",
"type": "package",
- "path": "sqlsugarcore/5.0.3.2",
+ "path": "sqlsugarcore/5.0.3.8",
"files": [
".nupkg.metadata",
".signature.p7s",
- "lib/netstandard2.0/SqlSugar.dll",
- "sqlsugarcore.5.0.3.2.nupkg.sha512",
+ "lib/netstandard2.1/SqlSugar.dll",
+ "sqlsugarcore.5.0.3.8.nupkg.sha512",
"sqlsugarcore.nuspec"
]
},
@@ -5820,74 +6019,6 @@
"system.data.common.nuspec"
]
},
- "System.Data.SqlClient/4.4.0": {
- "sha512": "fxb9ghn1k1Ua7FFdlvtiBOD4/PsQvD/fk2KnhS+FK7VC6OggEx6P+lP1P0+KMb5V2dqS1+FbR7HCenoqzJMNIA==",
- "type": "package",
- "path": "system.data.sqlclient/4.4.0",
- "files": [
- ".nupkg.metadata",
- ".signature.p7s",
- "LICENSE.TXT",
- "THIRD-PARTY-NOTICES.TXT",
- "lib/MonoAndroid10/_._",
- "lib/MonoTouch10/_._",
- "lib/net451/System.Data.SqlClient.dll",
- "lib/net46/System.Data.SqlClient.dll",
- "lib/net461/System.Data.SqlClient.dll",
- "lib/netstandard1.2/System.Data.SqlClient.dll",
- "lib/netstandard1.3/System.Data.SqlClient.dll",
- "lib/netstandard2.0/System.Data.SqlClient.dll",
- "lib/xamarinios10/_._",
- "lib/xamarinmac20/_._",
- "lib/xamarintvos10/_._",
- "lib/xamarinwatchos10/_._",
- "ref/MonoAndroid10/_._",
- "ref/MonoTouch10/_._",
- "ref/net451/System.Data.SqlClient.dll",
- "ref/net46/System.Data.SqlClient.dll",
- "ref/net461/System.Data.SqlClient.dll",
- "ref/net461/System.Data.SqlClient.xml",
- "ref/netstandard1.2/System.Data.SqlClient.dll",
- "ref/netstandard1.2/System.Data.SqlClient.xml",
- "ref/netstandard1.2/de/System.Data.SqlClient.xml",
- "ref/netstandard1.2/es/System.Data.SqlClient.xml",
- "ref/netstandard1.2/fr/System.Data.SqlClient.xml",
- "ref/netstandard1.2/it/System.Data.SqlClient.xml",
- "ref/netstandard1.2/ja/System.Data.SqlClient.xml",
- "ref/netstandard1.2/ko/System.Data.SqlClient.xml",
- "ref/netstandard1.2/ru/System.Data.SqlClient.xml",
- "ref/netstandard1.2/zh-hans/System.Data.SqlClient.xml",
- "ref/netstandard1.2/zh-hant/System.Data.SqlClient.xml",
- "ref/netstandard1.3/System.Data.SqlClient.dll",
- "ref/netstandard1.3/System.Data.SqlClient.xml",
- "ref/netstandard1.3/de/System.Data.SqlClient.xml",
- "ref/netstandard1.3/es/System.Data.SqlClient.xml",
- "ref/netstandard1.3/fr/System.Data.SqlClient.xml",
- "ref/netstandard1.3/it/System.Data.SqlClient.xml",
- "ref/netstandard1.3/ja/System.Data.SqlClient.xml",
- "ref/netstandard1.3/ko/System.Data.SqlClient.xml",
- "ref/netstandard1.3/ru/System.Data.SqlClient.xml",
- "ref/netstandard1.3/zh-hans/System.Data.SqlClient.xml",
- "ref/netstandard1.3/zh-hant/System.Data.SqlClient.xml",
- "ref/netstandard2.0/System.Data.SqlClient.dll",
- "ref/netstandard2.0/System.Data.SqlClient.xml",
- "ref/xamarinios10/_._",
- "ref/xamarinmac20/_._",
- "ref/xamarintvos10/_._",
- "ref/xamarinwatchos10/_._",
- "runtimes/unix/lib/netstandard1.3/System.Data.SqlClient.dll",
- "runtimes/unix/lib/netstandard2.0/System.Data.SqlClient.dll",
- "runtimes/win/lib/net451/System.Data.SqlClient.dll",
- "runtimes/win/lib/net46/System.Data.SqlClient.dll",
- "runtimes/win/lib/net461/System.Data.SqlClient.dll",
- "runtimes/win/lib/netstandard1.3/System.Data.SqlClient.dll",
- "runtimes/win/lib/netstandard2.0/System.Data.SqlClient.dll",
- "system.data.sqlclient.4.4.0.nupkg.sha512",
- "system.data.sqlclient.nuspec",
- "useSharedDesignerContext.txt",
- "version.txt"
- ]
- },
"System.Diagnostics.Debug/4.3.0": {
"sha512": "ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==",
"type": "package",
@@ -5983,6 +6114,45 @@
"version.txt"
]
},
+ "System.Diagnostics.PerformanceCounter/4.7.0": {
+ "sha512": "kE9szT4i3TYT9bDE/BPfzg9/BL6enMiZlcUmnUEBrhRtxWvurKoa8qhXkLTRhrxMzBqaDleWlRfIPE02tulU+w==",
+ "type": "package",
+ "path": "system.diagnostics.performancecounter/4.7.0",
+ "files": [
+ ".nupkg.metadata",
+ ".signature.p7s",
+ "LICENSE.TXT",
+ "THIRD-PARTY-NOTICES.TXT",
+ "lib/MonoAndroid10/_._",
+ "lib/MonoTouch10/_._",
+ "lib/net461/System.Diagnostics.PerformanceCounter.dll",
+ "lib/net461/System.Diagnostics.PerformanceCounter.xml",
+ "lib/netstandard2.0/System.Diagnostics.PerformanceCounter.dll",
+ "lib/netstandard2.0/System.Diagnostics.PerformanceCounter.xml",
+ "lib/xamarinios10/_._",
+ "lib/xamarinmac20/_._",
+ "lib/xamarintvos10/_._",
+ "lib/xamarinwatchos10/_._",
+ "ref/MonoAndroid10/_._",
+ "ref/MonoTouch10/_._",
+ "ref/net461/System.Diagnostics.PerformanceCounter.dll",
+ "ref/net461/System.Diagnostics.PerformanceCounter.xml",
+ "ref/net472/System.Diagnostics.PerformanceCounter.dll",
+ "ref/net472/System.Diagnostics.PerformanceCounter.xml",
+ "ref/netstandard2.0/System.Diagnostics.PerformanceCounter.dll",
+ "ref/netstandard2.0/System.Diagnostics.PerformanceCounter.xml",
+ "ref/xamarinios10/_._",
+ "ref/xamarinmac20/_._",
+ "ref/xamarintvos10/_._",
+ "ref/xamarinwatchos10/_._",
+ "runtimes/win/lib/netcoreapp2.0/System.Diagnostics.PerformanceCounter.dll",
+ "runtimes/win/lib/netcoreapp2.0/System.Diagnostics.PerformanceCounter.xml",
+ "system.diagnostics.performancecounter.4.7.0.nupkg.sha512",
+ "system.diagnostics.performancecounter.nuspec",
+ "useSharedDesignerContext.txt",
+ "version.txt"
+ ]
+ },
"System.Diagnostics.StackTrace/4.3.0": {
"sha512": "BiHg0vgtd35/DM9jvtaC1eKRpWZxr0gcQd643ABG7GnvSlf5pOkY2uyd42mMOJoOmKvnpNj0F4tuoS1pacTwYw==",
"type": "package",
@@ -6208,6 +6378,54 @@
"system.diagnostics.tracing.nuspec"
]
},
+ "System.DirectoryServices/4.7.0": {
+ "sha512": "NRENC4ulDamI4DQtrYybxtQU3qnhGSTUdEKJkLyctHXY4RqNyS/egZpB9z8/CnFCiaQZmwLlqxfBmw80VlKBTA==",
+ "type": "package",
+ "path": "system.directoryservices/4.7.0",
+ "files": [
+ ".nupkg.metadata",
+ ".signature.p7s",
+ "LICENSE.TXT",
+ "THIRD-PARTY-NOTICES.TXT",
+ "lib/net45/_._",
+ "lib/netstandard2.0/System.DirectoryServices.dll",
+ "lib/netstandard2.0/System.DirectoryServices.xml",
+ "ref/net45/_._",
+ "ref/netstandard2.0/System.DirectoryServices.dll",
+ "ref/netstandard2.0/System.DirectoryServices.xml",
+ "runtimes/win/lib/net45/_._",
+ "runtimes/win/lib/netcoreapp2.0/System.DirectoryServices.dll",
+ "runtimes/win/lib/netcoreapp2.0/System.DirectoryServices.xml",
+ "system.directoryservices.4.7.0.nupkg.sha512",
+ "system.directoryservices.nuspec",
+ "useSharedDesignerContext.txt",
+ "version.txt"
+ ]
+ },
+ "System.DirectoryServices.Protocols/4.7.0": {
+ "sha512": "yy0a+E/yksdoMWfZEmWpI5LuCbJ/E6P5d4QRbqUDj/xC4MV7Vw5DiW3KREA9LFbWedoGx90KikUfSN0xhE1j1g==",
+ "type": "package",
+ "path": "system.directoryservices.protocols/4.7.0",
+ "files": [
+ ".nupkg.metadata",
+ ".signature.p7s",
+ "LICENSE.TXT",
+ "THIRD-PARTY-NOTICES.TXT",
+ "lib/net45/_._",
+ "lib/netstandard2.0/System.DirectoryServices.Protocols.dll",
+ "lib/netstandard2.0/System.DirectoryServices.Protocols.xml",
+ "ref/net45/_._",
+ "ref/netstandard2.0/System.DirectoryServices.Protocols.dll",
+ "ref/netstandard2.0/System.DirectoryServices.Protocols.xml",
+ "runtimes/win/lib/net45/_._",
+ "runtimes/win/lib/netcoreapp2.0/System.DirectoryServices.Protocols.dll",
+ "runtimes/win/lib/netcoreapp2.0/System.DirectoryServices.Protocols.xml",
+ "system.directoryservices.protocols.4.7.0.nupkg.sha512",
+ "system.directoryservices.protocols.nuspec",
+ "useSharedDesignerContext.txt",
+ "version.txt"
+ ]
+ },
"System.Drawing.Common/5.0.2": {
"sha512": "rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
"type": "package",
@@ -6464,10 +6682,10 @@
"system.globalization.extensions.nuspec"
]
},
- "System.IdentityModel.Tokens.Jwt/6.7.1": {
- "sha512": "sPnRn9dUMYARQC3mAKWpig/7rlrruqJvopKXmGoYAQ1A+xQsT3q5LiwsArkV8Oz/hfiRCLkV9vgi3FQg/mYfrw==",
+ "System.IdentityModel.Tokens.Jwt/6.8.0": {
+ "sha512": "5tBCjAub2Bhd5qmcd0WhR5s354e4oLYa//kOWrkX+6/7ZbDDJjMTfwLSOiZ/MMpWdE4DWPLOfTLOq/juj9CKzA==",
"type": "package",
- "path": "system.identitymodel.tokens.jwt/6.7.1",
+ "path": "system.identitymodel.tokens.jwt/6.8.0",
"files": [
".nupkg.metadata",
".signature.p7s",
@@ -6477,7 +6695,7 @@
"lib/net461/System.IdentityModel.Tokens.Jwt.xml",
"lib/netstandard2.0/System.IdentityModel.Tokens.Jwt.dll",
"lib/netstandard2.0/System.IdentityModel.Tokens.Jwt.xml",
- "system.identitymodel.tokens.jwt.6.7.1.nupkg.sha512",
+ "system.identitymodel.tokens.jwt.6.8.0.nupkg.sha512",
"system.identitymodel.tokens.jwt.nuspec"
]
},
@@ -6706,6 +6924,49 @@
"system.io.filesystem.nuspec"
]
},
+ "System.IO.FileSystem.AccessControl/4.7.0": {
+ "sha512": "vMToiarpU81LR1/KZtnT7VDPvqAZfw9oOS5nY6pPP78nGYz3COLsQH3OfzbR+SjTgltd31R6KmKklz/zDpTmzw==",
+ "type": "package",
+ "path": "system.io.filesystem.accesscontrol/4.7.0",
+ "files": [
+ ".nupkg.metadata",
+ ".signature.p7s",
+ "LICENSE.TXT",
+ "THIRD-PARTY-NOTICES.TXT",
+ "lib/net46/System.IO.FileSystem.AccessControl.dll",
+ "lib/net461/System.IO.FileSystem.AccessControl.dll",
+ "lib/net461/System.IO.FileSystem.AccessControl.xml",
+ "lib/netstandard1.3/System.IO.FileSystem.AccessControl.dll",
+ "lib/netstandard2.0/System.IO.FileSystem.AccessControl.dll",
+ "lib/netstandard2.0/System.IO.FileSystem.AccessControl.xml",
+ "ref/net46/System.IO.FileSystem.AccessControl.dll",
+ "ref/net461/System.IO.FileSystem.AccessControl.dll",
+ "ref/net461/System.IO.FileSystem.AccessControl.xml",
+ "ref/netstandard1.3/System.IO.FileSystem.AccessControl.dll",
+ "ref/netstandard1.3/System.IO.FileSystem.AccessControl.xml",
+ "ref/netstandard1.3/de/System.IO.FileSystem.AccessControl.xml",
+ "ref/netstandard1.3/es/System.IO.FileSystem.AccessControl.xml",
+ "ref/netstandard1.3/fr/System.IO.FileSystem.AccessControl.xml",
+ "ref/netstandard1.3/it/System.IO.FileSystem.AccessControl.xml",
+ "ref/netstandard1.3/ja/System.IO.FileSystem.AccessControl.xml",
+ "ref/netstandard1.3/ko/System.IO.FileSystem.AccessControl.xml",
+ "ref/netstandard1.3/ru/System.IO.FileSystem.AccessControl.xml",
+ "ref/netstandard1.3/zh-hans/System.IO.FileSystem.AccessControl.xml",
+ "ref/netstandard1.3/zh-hant/System.IO.FileSystem.AccessControl.xml",
+ "ref/netstandard2.0/System.IO.FileSystem.AccessControl.dll",
+ "ref/netstandard2.0/System.IO.FileSystem.AccessControl.xml",
+ "runtimes/win/lib/net46/System.IO.FileSystem.AccessControl.dll",
+ "runtimes/win/lib/net461/System.IO.FileSystem.AccessControl.dll",
+ "runtimes/win/lib/net461/System.IO.FileSystem.AccessControl.xml",
+ "runtimes/win/lib/netstandard1.3/System.IO.FileSystem.AccessControl.dll",
+ "runtimes/win/lib/netstandard2.0/System.IO.FileSystem.AccessControl.dll",
+ "runtimes/win/lib/netstandard2.0/System.IO.FileSystem.AccessControl.xml",
+ "system.io.filesystem.accesscontrol.4.7.0.nupkg.sha512",
+ "system.io.filesystem.accesscontrol.nuspec",
+ "useSharedDesignerContext.txt",
+ "version.txt"
+ ]
+ },
"System.IO.FileSystem.Primitives/4.3.0": {
"sha512": "6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==",
"type": "package",
@@ -7804,6 +8065,42 @@
"system.runtime.nuspec"
]
},
+ "System.Runtime.Caching/4.7.0": {
+ "sha512": "NdvNRjTPxYvIEhXQszT9L9vJhdQoX6AQ0AlhjTU+5NqFQVuacJTfhPVAvtGWNA2OJCqRiR/okBcZgMwI6MqcZg==",
+ "type": "package",
+ "path": "system.runtime.caching/4.7.0",
+ "files": [
+ ".nupkg.metadata",
+ ".signature.p7s",
+ "LICENSE.TXT",
+ "THIRD-PARTY-NOTICES.TXT",
+ "lib/MonoAndroid10/_._",
+ "lib/MonoTouch10/_._",
+ "lib/net45/_._",
+ "lib/netstandard2.0/System.Runtime.Caching.dll",
+ "lib/netstandard2.0/System.Runtime.Caching.xml",
+ "lib/xamarinios10/_._",
+ "lib/xamarinmac20/_._",
+ "lib/xamarintvos10/_._",
+ "lib/xamarinwatchos10/_._",
+ "ref/MonoAndroid10/_._",
+ "ref/MonoTouch10/_._",
+ "ref/net45/_._",
+ "ref/netstandard2.0/System.Runtime.Caching.dll",
+ "ref/netstandard2.0/System.Runtime.Caching.xml",
+ "ref/xamarinios10/_._",
+ "ref/xamarinmac20/_._",
+ "ref/xamarintvos10/_._",
+ "ref/xamarinwatchos10/_._",
+ "runtimes/win/lib/net45/_._",
+ "runtimes/win/lib/netstandard2.0/System.Runtime.Caching.dll",
+ "runtimes/win/lib/netstandard2.0/System.Runtime.Caching.xml",
+ "system.runtime.caching.4.7.0.nupkg.sha512",
+ "system.runtime.caching.nuspec",
+ "useSharedDesignerContext.txt",
+ "version.txt"
+ ]
+ },
"System.Runtime.CompilerServices.Unsafe/5.0.0": {
"sha512": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==",
"type": "package",
@@ -9646,6 +9943,11 @@
"path": "../framework/Api/Ewide.Core/Ewide.Core.csproj",
"msbuildProject": "../framework/Api/Ewide.Core/Ewide.Core.csproj"
},
+ "Ewide.Nbzs.Entity/1.0.0": {
+ "type": "project",
+ "path": "../Ewide.Nbzs.Entity/Ewide.Nbzs.Entity.csproj",
+ "msbuildProject": "../Ewide.Nbzs.Entity/Ewide.Nbzs.Entity.csproj"
+ },
"Furion/2.18.7": {
"type": "project",
"path": "../framework/Api/Furion/framework/Furion/Furion.csproj",
@@ -9661,7 +9963,7 @@
"path": "../framework/Api/Furion/framework/Furion.Extras.DatabaseAccessor.Dapper/Furion.Extras.DatabaseAccessor.Dapper.csproj",
"msbuildProject": "../framework/Api/Furion/framework/Furion.Extras.DatabaseAccessor.Dapper/Furion.Extras.DatabaseAccessor.Dapper.csproj"
},
- "Furion.Extras.DatabaseAccessor.SqlSugar/2.12.9": {
+ "Furion.Extras.DatabaseAccessor.SqlSugar/2.18.7": {
"type": "project",
"path": "../framework/Api/Furion/framework/Furion.Extras.DatabaseAccessor.SqlSugar/Furion.Extras.DatabaseAccessor.SqlSugar.csproj",
"msbuildProject": "../framework/Api/Furion/framework/Furion.Extras.DatabaseAccessor.SqlSugar/Furion.Extras.DatabaseAccessor.SqlSugar.csproj"
@@ -9680,6 +9982,7 @@
"projectFileDependencyGroups": {
"net5.0": [
"Ewide.Core >= 1.0.0",
+ "Ewide.Nbzs.Entity >= 1.0.0",
"Magick.NET-Q16-AnyCPU >= 8.3.1"
]
},
@@ -9714,6 +10017,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"
}
diff --git a/Ewide.NbzsZheliban/obj/project.nuget.cache b/Ewide.NbzsZheliban/obj/project.nuget.cache
index 0a98517..3d73761 100644
--- a/Ewide.NbzsZheliban/obj/project.nuget.cache
+++ b/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",
diff --git a/FrontCode2/sunshine_levy/package-lock.json b/FrontCode2/sunshine_levy/package-lock.json
index 9e0191b..1eb6a47 100644
--- a/FrontCode2/sunshine_levy/package-lock.json
+++ b/FrontCode2/sunshine_levy/package-lock.json
@@ -259,7 +259,7 @@
},
"source-map": {
"version": "0.5.7",
- "resolved": "https://registry.nlark.com/source-map/download/source-map-0.5.7.tgz",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
}
}
@@ -281,7 +281,7 @@
},
"source-map": {
"version": "0.5.7",
- "resolved": "https://registry.nlark.com/source-map/download/source-map-0.5.7.tgz",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
}
}
@@ -357,7 +357,7 @@
"dependencies": {
"jsesc": {
"version": "0.5.0",
- "resolved": "https://registry.nlark.com/jsesc/download/jsesc-0.5.0.tgz",
+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
"integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
},
"regexpu-core": {
@@ -1409,7 +1409,7 @@
},
"to-fast-properties": {
"version": "2.0.0",
- "resolved": "https://registry.nlark.com/to-fast-properties/download/to-fast-properties-2.0.0.tgz?cache=0&sync_timestamp=1628418893613&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fto-fast-properties%2Fdownload%2Fto-fast-properties-2.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
}
}
@@ -1967,7 +1967,7 @@
},
"ansi-gray": {
"version": "0.1.1",
- "resolved": "https://registry.npm.taobao.org/ansi-gray/download/ansi-gray-0.1.1.tgz",
+ "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
"integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
"requires": {
"ansi-wrap": "0.1.0"
@@ -1994,12 +1994,12 @@
},
"ansi-wrap": {
"version": "0.1.0",
- "resolved": "https://registry.npm.taobao.org/ansi-wrap/download/ansi-wrap-0.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
"integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768="
},
"any-promise": {
"version": "1.3.0",
- "resolved": "https://registry.npm.taobao.org/any-promise/download/any-promise-1.3.0.tgz",
+ "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
"integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8="
},
"anymatch": {
@@ -2013,7 +2013,7 @@
},
"append-buffer": {
"version": "1.0.2",
- "resolved": "https://registry.npm.taobao.org/append-buffer/download/append-buffer-1.0.2.tgz",
+ "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
"integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
"requires": {
"buffer-equal": "^1.0.0"
@@ -2026,7 +2026,7 @@
},
"archy": {
"version": "1.0.0",
- "resolved": "https://registry.npm.taobao.org/archy/download/archy-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
"integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA="
},
"argparse": {
@@ -2044,7 +2044,7 @@
},
"arr-filter": {
"version": "1.1.2",
- "resolved": "https://registry.nlark.com/arr-filter/download/arr-filter-1.1.2.tgz",
+ "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
"integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
"requires": {
"make-iterator": "^1.0.0"
@@ -2057,7 +2057,7 @@
},
"arr-map": {
"version": "2.0.2",
- "resolved": "https://registry.npm.taobao.org/arr-map/download/arr-map-2.0.2.tgz",
+ "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
"integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
"requires": {
"make-iterator": "^1.0.0"
@@ -2070,7 +2070,7 @@
},
"array-each": {
"version": "1.0.1",
- "resolved": "https://registry.npm.taobao.org/array-each/download/array-each-1.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
"integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8="
},
"array-find-index": {
@@ -2100,7 +2100,7 @@
},
"array-initial": {
"version": "1.1.0",
- "resolved": "https://registry.npm.taobao.org/array-initial/download/array-initial-1.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
"integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
"requires": {
"array-slice": "^1.0.0",
@@ -2223,7 +2223,7 @@
},
"assert-plus": {
"version": "1.0.0",
- "resolved": "https://registry.npm.taobao.org/assert-plus/download/assert-plus-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
},
"assign-symbols": {
@@ -2264,7 +2264,7 @@
},
"async-settle": {
"version": "1.0.0",
- "resolved": "https://registry.npm.taobao.org/async-settle/download/async-settle-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
"integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
"requires": {
"async-done": "^1.2.2"
@@ -2280,7 +2280,7 @@
},
"asynckit": {
"version": "0.4.0",
- "resolved": "https://registry.npm.taobao.org/asynckit/download/asynckit-0.4.0.tgz",
+ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
},
"at-least-node": {
@@ -2309,7 +2309,7 @@
},
"aws-sign2": {
"version": "0.7.0",
- "resolved": "https://registry.nlark.com/aws-sign2/download/aws-sign2-0.7.0.tgz",
+ "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
},
"aws4": {
@@ -3112,7 +3112,7 @@
"dependencies": {
"camelcase": {
"version": "3.0.0",
- "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-3.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
}
}
@@ -3327,7 +3327,7 @@
},
"bach": {
"version": "1.2.0",
- "resolved": "https://registry.npm.taobao.org/bach/download/bach-1.2.0.tgz",
+ "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
"integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
"requires": {
"arr-filter": "^1.1.1",
@@ -3424,7 +3424,7 @@
},
"bcrypt-pbkdf": {
"version": "1.0.2",
- "resolved": "https://registry.npm.taobao.org/bcrypt-pbkdf/download/bcrypt-pbkdf-1.0.2.tgz",
+ "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
"integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
"requires": {
"tweetnacl": "^0.14.3"
@@ -3670,7 +3670,7 @@
},
"buffer-equal": {
"version": "1.0.0",
- "resolved": "https://registry.nlark.com/buffer-equal/download/buffer-equal-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
"integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74="
},
"buffer-from": {
@@ -3803,7 +3803,7 @@
},
"clone": {
"version": "2.1.2",
- "resolved": "https://registry.nlark.com/clone/download/clone-2.1.2.tgz",
+ "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
"integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18="
},
"css-loader": {
@@ -3842,7 +3842,7 @@
},
"emojis-list": {
"version": "2.1.0",
- "resolved": "https://registry.nlark.com/emojis-list/download/emojis-list-2.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
"integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
},
"enhanced-resolve": {
@@ -3891,7 +3891,7 @@
},
"html-webpack-plugin": {
"version": "3.2.0",
- "resolved": "https://registry.nlark.com/html-webpack-plugin/download/html-webpack-plugin-3.2.0.tgz",
+ "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
"integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=",
"requires": {
"html-minifier": "^3.2.3",
@@ -3905,7 +3905,7 @@
"dependencies": {
"loader-utils": {
"version": "0.2.17",
- "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-0.2.17.tgz",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
"integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
"requires": {
"big.js": "^3.1.3",
@@ -3940,7 +3940,7 @@
},
"jsonfile": {
"version": "4.0.0",
- "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz?cache=0&sync_timestamp=1604161876665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-4.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
"requires": {
"graceful-fs": "^4.1.6"
@@ -4242,7 +4242,7 @@
},
"memory-fs": {
"version": "0.4.1",
- "resolved": "https://registry.npm.taobao.org/memory-fs/download/memory-fs-0.4.1.tgz",
+ "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
"requires": {
"errno": "^0.1.3",
@@ -4333,7 +4333,7 @@
},
"call-me-maybe": {
"version": "1.0.1",
- "resolved": "https://registry.nlark.com/call-me-maybe/download/call-me-maybe-1.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
"integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms="
},
"caller-callsite": {
@@ -4432,7 +4432,7 @@
},
"caseless": {
"version": "0.12.0",
- "resolved": "https://registry.nlark.com/caseless/download/caseless-0.12.0.tgz",
+ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
},
"ccount": {
@@ -4487,7 +4487,7 @@
},
"charenc": {
"version": "0.0.2",
- "resolved": "https://registry.npm.taobao.org/charenc/download/charenc-0.0.2.tgz",
+ "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
"integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc="
},
"check-types": {
@@ -4651,12 +4651,12 @@
},
"clone-buffer": {
"version": "1.0.0",
- "resolved": "https://registry.npm.taobao.org/clone-buffer/download/clone-buffer-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
"integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg="
},
"clone-stats": {
"version": "1.0.0",
- "resolved": "https://registry.npm.taobao.org/clone-stats/download/clone-stats-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
"integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA="
},
"cloneable-readable": {
@@ -4696,7 +4696,7 @@
},
"collection-map": {
"version": "1.0.0",
- "resolved": "https://registry.npm.taobao.org/collection-map/download/collection-map-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
"integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
"requires": {
"arr-map": "^2.0.2",
@@ -5086,7 +5086,7 @@
},
"crypt": {
"version": "0.0.2",
- "resolved": "https://registry.npm.taobao.org/crypt/download/crypt-0.0.2.tgz",
+ "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
"integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs="
},
"crypto-browserify": {
@@ -5318,7 +5318,7 @@
},
"css-parse": {
"version": "2.0.0",
- "resolved": "https://registry.npm.taobao.org/css-parse/download/css-parse-2.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
"integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=",
"requires": {
"css": "^2.0.0"
@@ -6156,7 +6156,7 @@
},
"dashdash": {
"version": "1.14.1",
- "resolved": "https://registry.npm.taobao.org/dashdash/download/dashdash-1.14.1.tgz?cache=0&sync_timestamp=1601073647826&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdashdash%2Fdownload%2Fdashdash-1.14.1.tgz",
+ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
"requires": {
"assert-plus": "^1.0.0"
@@ -6222,12 +6222,12 @@
},
"default-resolution": {
"version": "2.0.0",
- "resolved": "https://registry.npm.taobao.org/default-resolution/download/default-resolution-2.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
"integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ="
},
"defaults": {
"version": "1.0.3",
- "resolved": "https://registry.nlark.com/defaults/download/defaults-1.0.3.tgz",
+ "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
"integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
"requires": {
"clone": "^1.0.2"
@@ -6328,7 +6328,7 @@
},
"delayed-stream": {
"version": "1.0.0",
- "resolved": "https://registry.nlark.com/delayed-stream/download/delayed-stream-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
},
"depd": {
@@ -6354,7 +6354,7 @@
},
"detect-file": {
"version": "1.0.0",
- "resolved": "https://registry.npm.taobao.org/detect-file/download/detect-file-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
"integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc="
},
"detect-indent": {
@@ -6510,7 +6510,7 @@
},
"ecc-jsbn": {
"version": "0.1.2",
- "resolved": "https://registry.nlark.com/ecc-jsbn/download/ecc-jsbn-0.1.2.tgz",
+ "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
"requires": {
"jsbn": "~0.1.0",
@@ -6928,7 +6928,7 @@
},
"expand-tilde": {
"version": "2.0.2",
- "resolved": "https://registry.npm.taobao.org/expand-tilde/download/expand-tilde-2.0.2.tgz",
+ "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
"integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
"requires": {
"homedir-polyfill": "^1.0.1"
@@ -7099,7 +7099,7 @@
},
"extsprintf": {
"version": "1.3.0",
- "resolved": "https://registry.nlark.com/extsprintf/download/extsprintf-1.3.0.tgz",
+ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
},
"fancy-log": {
@@ -7115,7 +7115,7 @@
"dependencies": {
"time-stamp": {
"version": "1.1.0",
- "resolved": "https://registry.nlark.com/time-stamp/download/time-stamp-1.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
"integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM="
}
}
@@ -7156,7 +7156,7 @@
},
"fast-levenshtein": {
"version": "1.1.4",
- "resolved": "https://registry.nlark.com/fast-levenshtein/download/fast-levenshtein-1.1.4.tgz",
+ "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz",
"integrity": "sha1-5qdUzI8V5YmHqpy9J69m/W9OWvk="
},
"fastparse": {
@@ -7355,7 +7355,7 @@
},
"for-own": {
"version": "1.0.0",
- "resolved": "https://registry.nlark.com/for-own/download/for-own-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
"integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
"requires": {
"for-in": "^1.0.1"
@@ -7363,7 +7363,7 @@
},
"forever-agent": {
"version": "0.6.1",
- "resolved": "https://registry.nlark.com/forever-agent/download/forever-agent-0.6.1.tgz",
+ "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
},
"form-data": {
@@ -7473,7 +7473,7 @@
},
"fs-mkdirp-stream": {
"version": "1.0.0",
- "resolved": "https://registry.nlark.com/fs-mkdirp-stream/download/fs-mkdirp-stream-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
"integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
"requires": {
"graceful-fs": "^4.1.11",
@@ -7546,7 +7546,7 @@
},
"getpass": {
"version": "0.1.7",
- "resolved": "https://registry.nlark.com/getpass/download/getpass-0.1.7.tgz",
+ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
"requires": {
"assert-plus": "^1.0.0"
@@ -7583,7 +7583,7 @@
},
"glob-stream": {
"version": "6.1.0",
- "resolved": "https://registry.npm.taobao.org/glob-stream/download/glob-stream-6.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
"integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
"requires": {
"extend": "^3.0.0",
@@ -7600,7 +7600,7 @@
"dependencies": {
"glob-parent": {
"version": "3.1.0",
- "resolved": "https://registry.nlark.com/glob-parent/download/glob-parent-3.1.0.tgz?cache=0&sync_timestamp=1626760165717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fglob-parent%2Fdownload%2Fglob-parent-3.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
"requires": {
"is-glob": "^3.1.0",
@@ -7609,7 +7609,7 @@
},
"is-glob": {
"version": "3.1.0",
- "resolved": "https://registry.nlark.com/is-glob/download/is-glob-3.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
"requires": {
"is-extglob": "^2.1.0"
@@ -7642,7 +7642,7 @@
"dependencies": {
"normalize-path": {
"version": "2.1.1",
- "resolved": "https://registry.nlark.com/normalize-path/download/normalize-path-2.1.1.tgz",
+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
"requires": {
"remove-trailing-separator": "^1.0.1"
@@ -7693,7 +7693,7 @@
},
"extend-shallow": {
"version": "2.0.1",
- "resolved": "https://registry.nlark.com/extend-shallow/download/extend-shallow-2.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"requires": {
"is-extendable": "^0.1.0"
@@ -7701,7 +7701,7 @@
},
"fill-range": {
"version": "4.0.0",
- "resolved": "https://registry.npm.taobao.org/fill-range/download/fill-range-4.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
"requires": {
"extend-shallow": "^2.0.1",
@@ -7718,7 +7718,7 @@
},
"glob-parent": {
"version": "3.1.0",
- "resolved": "https://registry.nlark.com/glob-parent/download/glob-parent-3.1.0.tgz?cache=0&sync_timestamp=1626760165717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fglob-parent%2Fdownload%2Fglob-parent-3.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
"requires": {
"is-glob": "^3.1.0",
@@ -7727,7 +7727,7 @@
"dependencies": {
"is-glob": {
"version": "3.1.0",
- "resolved": "https://registry.nlark.com/is-glob/download/is-glob-3.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
"requires": {
"is-extglob": "^2.1.0"
@@ -7737,7 +7737,7 @@
},
"is-binary-path": {
"version": "1.0.1",
- "resolved": "https://registry.nlark.com/is-binary-path/download/is-binary-path-1.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
"integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
"requires": {
"binary-extensions": "^1.0.0"
@@ -7745,7 +7745,7 @@
},
"is-number": {
"version": "3.0.0",
- "resolved": "https://registry.npm.taobao.org/is-number/download/is-number-3.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
"requires": {
"kind-of": "^3.0.2"
@@ -7763,7 +7763,7 @@
},
"to-regex-range": {
"version": "2.1.1",
- "resolved": "https://registry.nlark.com/to-regex-range/download/to-regex-range-2.1.1.tgz",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
"requires": {
"is-number": "^3.0.0",
@@ -7784,7 +7784,7 @@
},
"global-prefix": {
"version": "1.0.2",
- "resolved": "https://registry.nlark.com/global-prefix/download/global-prefix-1.0.2.tgz",
+ "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
"integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
"requires": {
"expand-tilde": "^2.0.2",
@@ -7876,12 +7876,12 @@
"dependencies": {
"camelcase": {
"version": "3.0.0",
- "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-3.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
},
"cliui": {
"version": "3.2.0",
- "resolved": "https://registry.nlark.com/cliui/download/cliui-3.2.0.tgz",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
"requires": {
"string-width": "^1.0.1",
@@ -7891,7 +7891,7 @@
},
"find-up": {
"version": "1.1.2",
- "resolved": "https://registry.nlark.com/find-up/download/find-up-1.1.2.tgz",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
"requires": {
"path-exists": "^2.0.0",
@@ -7900,7 +7900,7 @@
},
"is-fullwidth-code-point": {
"version": "1.0.0",
- "resolved": "https://registry.nlark.com/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"requires": {
"number-is-nan": "^1.0.0"
@@ -7908,7 +7908,7 @@
},
"load-json-file": {
"version": "1.1.0",
- "resolved": "https://registry.nlark.com/load-json-file/download/load-json-file-1.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
"requires": {
"graceful-fs": "^4.1.2",
@@ -7920,7 +7920,7 @@
},
"os-locale": {
"version": "1.4.0",
- "resolved": "https://registry.nlark.com/os-locale/download/os-locale-1.4.0.tgz?cache=0&sync_timestamp=1627564416279&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fos-locale%2Fdownload%2Fos-locale-1.4.0.tgz",
+ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
"requires": {
"lcid": "^1.0.0"
@@ -7928,7 +7928,7 @@
},
"parse-json": {
"version": "2.2.0",
- "resolved": "https://registry.nlark.com/parse-json/download/parse-json-2.2.0.tgz",
+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
"requires": {
"error-ex": "^1.2.0"
@@ -7936,7 +7936,7 @@
},
"path-exists": {
"version": "2.1.0",
- "resolved": "https://registry.nlark.com/path-exists/download/path-exists-2.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
"requires": {
"pinkie-promise": "^2.0.0"
@@ -7944,7 +7944,7 @@
},
"path-type": {
"version": "1.1.0",
- "resolved": "https://registry.nlark.com/path-type/download/path-type-1.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
"requires": {
"graceful-fs": "^4.1.2",
@@ -7954,12 +7954,12 @@
},
"pify": {
"version": "2.3.0",
- "resolved": "https://registry.nlark.com/pify/download/pify-2.3.0.tgz",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
},
"read-pkg": {
"version": "1.1.0",
- "resolved": "https://registry.nlark.com/read-pkg/download/read-pkg-1.1.0.tgz?cache=0&sync_timestamp=1628984695234&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fread-pkg%2Fdownload%2Fread-pkg-1.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
"requires": {
"load-json-file": "^1.0.0",
@@ -7969,7 +7969,7 @@
},
"read-pkg-up": {
"version": "1.0.1",
- "resolved": "https://registry.nlark.com/read-pkg-up/download/read-pkg-up-1.0.1.tgz?cache=0&sync_timestamp=1618846971516&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fread-pkg-up%2Fdownload%2Fread-pkg-up-1.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
"requires": {
"find-up": "^1.0.0",
@@ -7978,7 +7978,7 @@
},
"string-width": {
"version": "1.0.2",
- "resolved": "https://registry.nlark.com/string-width/download/string-width-1.0.2.tgz?cache=0&sync_timestamp=1631551445892&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstring-width%2Fdownload%2Fstring-width-1.0.2.tgz",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"requires": {
"code-point-at": "^1.0.0",
@@ -7988,7 +7988,7 @@
},
"strip-bom": {
"version": "2.0.0",
- "resolved": "https://registry.nlark.com/strip-bom/download/strip-bom-2.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
"requires": {
"is-utf8": "^0.2.0"
@@ -7996,7 +7996,7 @@
},
"which-module": {
"version": "1.0.0",
- "resolved": "https://registry.nlark.com/which-module/download/which-module-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
"integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
},
"y18n": {
@@ -8071,7 +8071,7 @@
},
"gulplog": {
"version": "1.0.0",
- "resolved": "https://registry.npm.taobao.org/gulplog/download/gulplog-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
"integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
"requires": {
"glogg": "^1.0.0"
@@ -8095,7 +8095,7 @@
},
"har-schema": {
"version": "2.0.0",
- "resolved": "https://registry.npm.taobao.org/har-schema/download/har-schema-2.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
},
"har-validator": {
@@ -8467,7 +8467,7 @@
},
"http-signature": {
"version": "1.2.0",
- "resolved": "https://registry.npm.taobao.org/http-signature/download/http-signature-1.2.0.tgz?cache=0&sync_timestamp=1600868555829&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhttp-signature%2Fdownload%2Fhttp-signature-1.2.0.tgz",
+ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
"requires": {
"assert-plus": "^1.0.0",
@@ -8521,7 +8521,7 @@
},
"jsonfile": {
"version": "4.0.0",
- "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz?cache=0&sync_timestamp=1604161876665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-4.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
"requires": {
"graceful-fs": "^4.1.6"
@@ -8935,7 +8935,7 @@
},
"is-alphanumeric": {
"version": "1.0.0",
- "resolved": "https://registry.npm.taobao.org/is-alphanumeric/download/is-alphanumeric-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz",
"integrity": "sha1-Spzvcdr0wAHB2B1j0UDPU/1oifQ="
},
"is-alphanumerical": {
@@ -9102,7 +9102,7 @@
},
"is-negated-glob": {
"version": "1.0.0",
- "resolved": "https://registry.npm.taobao.org/is-negated-glob/download/is-negated-glob-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
"integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI="
},
"is-negative-zero": {
@@ -9225,7 +9225,7 @@
},
"is-typedarray": {
"version": "1.0.0",
- "resolved": "https://registry.npm.taobao.org/is-typedarray/download/is-typedarray-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
},
"is-unc-path": {
@@ -9248,7 +9248,7 @@
},
"is-valid-glob": {
"version": "1.0.0",
- "resolved": "https://registry.nlark.com/is-valid-glob/download/is-valid-glob-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
"integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao="
},
"is-what": {
@@ -9293,7 +9293,7 @@
},
"isstream": {
"version": "0.1.2",
- "resolved": "https://registry.nlark.com/isstream/download/isstream-0.1.2.tgz",
+ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
},
"jake": {
@@ -9309,7 +9309,7 @@
"dependencies": {
"async": {
"version": "0.9.2",
- "resolved": "https://registry.nlark.com/async/download/async-0.9.2.tgz",
+ "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
"integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0="
}
}
@@ -9386,7 +9386,7 @@
},
"jsbn": {
"version": "0.1.1",
- "resolved": "https://registry.nlark.com/jsbn/download/jsbn-0.1.1.tgz",
+ "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
},
"jsesc": {
@@ -9407,7 +9407,7 @@
},
"json-schema": {
"version": "0.2.3",
- "resolved": "https://registry.nlark.com/json-schema/download/json-schema-0.2.3.tgz",
+ "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
},
"json-schema-ref-parser": {
@@ -9465,12 +9465,12 @@
},
"json-stable-stringify-without-jsonify": {
"version": "1.0.1",
- "resolved": "https://registry.nlark.com/json-stable-stringify-without-jsonify/download/json-stable-stringify-without-jsonify-1.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
},
"json-stringify-safe": {
"version": "5.0.1",
- "resolved": "https://registry.nlark.com/json-stringify-safe/download/json-stringify-safe-5.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
},
"json3": {
@@ -9494,7 +9494,7 @@
},
"jsprim": {
"version": "1.4.1",
- "resolved": "https://registry.npm.taobao.org/jsprim/download/jsprim-1.4.1.tgz",
+ "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
"requires": {
"assert-plus": "1.0.0",
@@ -9533,7 +9533,7 @@
},
"jsonfile": {
"version": "4.0.0",
- "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz?cache=0&sync_timestamp=1604161876665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-4.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
"requires": {
"graceful-fs": "^4.1.6"
@@ -9573,12 +9573,12 @@
"dependencies": {
"ansi-styles": {
"version": "2.2.1",
- "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-2.2.1.tgz?cache=0&sync_timestamp=1618995588464&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-2.2.1.tgz",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
},
"camelcase": {
"version": "3.0.0",
- "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-3.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
},
"cross-spawn": {
@@ -9656,7 +9656,7 @@
},
"jsonfile": {
"version": "4.0.0",
- "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz?cache=0&sync_timestamp=1604161876665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-4.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
"requires": {
"graceful-fs": "^4.1.6"
@@ -9728,7 +9728,7 @@
},
"source-map": {
"version": "0.5.7",
- "resolved": "https://registry.nlark.com/source-map/download/source-map-0.5.7.tgz",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
},
"stylesheet-loader": {
@@ -9744,7 +9744,7 @@
"dependencies": {
"chalk": {
"version": "1.1.3",
- "resolved": "https://registry.nlark.com/chalk/download/chalk-1.1.3.tgz?cache=0&sync_timestamp=1627646655305&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-1.1.3.tgz",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"requires": {
"ansi-styles": "^2.2.1",
@@ -9758,7 +9758,7 @@
},
"supports-color": {
"version": "2.0.0",
- "resolved": "https://registry.nlark.com/supports-color/download/supports-color-2.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
},
"tapable": {
@@ -9825,7 +9825,7 @@
},
"last-run": {
"version": "1.1.1",
- "resolved": "https://registry.nlark.com/last-run/download/last-run-1.1.1.tgz",
+ "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
"integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
"requires": {
"default-resolution": "^2.0.0",
@@ -9840,7 +9840,7 @@
},
"lazystream": {
"version": "1.0.0",
- "resolved": "https://registry.npm.taobao.org/lazystream/download/lazystream-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
"integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
"requires": {
"readable-stream": "^2.0.5"
@@ -9856,7 +9856,7 @@
},
"lead": {
"version": "1.0.0",
- "resolved": "https://registry.npm.taobao.org/lead/download/lead-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
"integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
"requires": {
"flush-write-stream": "^1.0.2"
@@ -10010,12 +10010,12 @@
},
"lodash.debounce": {
"version": "4.0.8",
- "resolved": "https://registry.nlark.com/lodash.debounce/download/lodash.debounce-4.0.8.tgz",
+ "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
"integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
},
"lodash.isequal": {
"version": "4.5.0",
- "resolved": "https://registry.npm.taobao.org/lodash.isequal/download/lodash.isequal-4.5.0.tgz",
+ "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
"integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
},
"lodash.memoize": {
@@ -10025,7 +10025,7 @@
},
"lodash.some": {
"version": "4.6.0",
- "resolved": "https://registry.npm.taobao.org/lodash.some/download/lodash.some-4.6.0.tgz",
+ "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
"integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0="
},
"lodash.uniq": {
@@ -10094,7 +10094,7 @@
},
"lru-queue": {
"version": "0.1.0",
- "resolved": "https://registry.npm.taobao.org/lru-queue/download/lru-queue-0.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
"integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
"requires": {
"es5-ext": "~0.10.2"
@@ -10154,7 +10154,7 @@
},
"matchdep": {
"version": "2.0.0",
- "resolved": "https://registry.npm.taobao.org/matchdep/download/matchdep-2.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
"integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
"requires": {
"findup-sync": "^2.0.0",
@@ -10165,7 +10165,7 @@
"dependencies": {
"findup-sync": {
"version": "2.0.0",
- "resolved": "https://registry.npm.taobao.org/findup-sync/download/findup-sync-2.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
"integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
"requires": {
"detect-file": "^1.0.0",
@@ -10176,7 +10176,7 @@
},
"is-glob": {
"version": "3.1.0",
- "resolved": "https://registry.nlark.com/is-glob/download/is-glob-3.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
"requires": {
"is-extglob": "^2.1.0"
@@ -10616,7 +10616,7 @@
},
"jsonfile": {
"version": "4.0.0",
- "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz?cache=0&sync_timestamp=1604161876665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-4.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
"requires": {
"graceful-fs": "^4.1.6"
@@ -10784,7 +10784,7 @@
},
"fill-range": {
"version": "4.0.0",
- "resolved": "https://registry.npm.taobao.org/fill-range/download/fill-range-4.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
"requires": {
"extend-shallow": "^2.0.1",
@@ -10795,7 +10795,7 @@
"dependencies": {
"extend-shallow": {
"version": "2.0.1",
- "resolved": "https://registry.nlark.com/extend-shallow/download/extend-shallow-2.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"requires": {
"is-extendable": "^0.1.0"
@@ -10857,7 +10857,7 @@
},
"is-number": {
"version": "3.0.0",
- "resolved": "https://registry.npm.taobao.org/is-number/download/is-number-3.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
"requires": {
"kind-of": "^3.0.2"
@@ -10865,7 +10865,7 @@
"dependencies": {
"kind-of": {
"version": "3.2.2",
- "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"requires": {
"is-buffer": "^1.1.5"
@@ -10888,7 +10888,7 @@
},
"jsonfile": {
"version": "4.0.0",
- "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz?cache=0&sync_timestamp=1604161876665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-4.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
"requires": {
"graceful-fs": "^4.1.6"
@@ -11214,7 +11214,7 @@
},
"path-exists": {
"version": "3.0.0",
- "resolved": "https://registry.nlark.com/path-exists/download/path-exists-3.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
"integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
},
"pkg-dir": {
@@ -11273,7 +11273,7 @@
},
"to-regex-range": {
"version": "2.1.1",
- "resolved": "https://registry.nlark.com/to-regex-range/download/to-regex-range-2.1.1.tgz",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
"requires": {
"is-number": "^3.0.0",
@@ -11351,7 +11351,7 @@
"dependencies": {
"extend-shallow": {
"version": "2.0.1",
- "resolved": "https://registry.nlark.com/extend-shallow/download/extend-shallow-2.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"requires": {
"is-extendable": "^0.1.0"
@@ -11379,7 +11379,7 @@
},
"memory-fs": {
"version": "0.4.1",
- "resolved": "https://registry.npm.taobao.org/memory-fs/download/memory-fs-0.4.1.tgz",
+ "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
"requires": {
"errno": "^0.1.3",
@@ -12212,7 +12212,7 @@
},
"object.defaults": {
"version": "1.1.0",
- "resolved": "https://registry.npm.taobao.org/object.defaults/download/object.defaults-1.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
"integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
"requires": {
"array-each": "^1.0.1",
@@ -12233,7 +12233,7 @@
},
"object.map": {
"version": "1.0.1",
- "resolved": "https://registry.npm.taobao.org/object.map/download/object.map-1.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
"integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
"requires": {
"for-own": "^1.0.0",
@@ -12268,7 +12268,7 @@
},
"object.reduce": {
"version": "1.0.1",
- "resolved": "https://registry.nlark.com/object.reduce/download/object.reduce-1.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
"integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
"requires": {
"for-own": "^1.0.0",
@@ -12396,7 +12396,7 @@
},
"ordered-read-streams": {
"version": "1.0.1",
- "resolved": "https://registry.npm.taobao.org/ordered-read-streams/download/ordered-read-streams-1.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
"integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
"requires": {
"readable-stream": "^2.0.1"
@@ -12521,7 +12521,7 @@
},
"parse-filepath": {
"version": "1.0.2",
- "resolved": "https://registry.nlark.com/parse-filepath/download/parse-filepath-1.0.2.tgz",
+ "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
"integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
"requires": {
"is-absolute": "^1.0.0",
@@ -12545,7 +12545,7 @@
},
"parse-passwd": {
"version": "1.0.0",
- "resolved": "https://registry.npm.taobao.org/parse-passwd/download/parse-passwd-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
"integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY="
},
"parseurl": {
@@ -12598,7 +12598,7 @@
},
"path-root": {
"version": "0.1.1",
- "resolved": "https://registry.npm.taobao.org/path-root/download/path-root-0.1.1.tgz",
+ "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
"integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
"requires": {
"path-root-regex": "^0.1.0"
@@ -12606,7 +12606,7 @@
},
"path-root-regex": {
"version": "0.1.2",
- "resolved": "https://registry.nlark.com/path-root-regex/download/path-root-regex-0.1.2.tgz",
+ "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
"integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0="
},
"path-to-regexp": {
@@ -12643,7 +12643,7 @@
},
"performance-now": {
"version": "2.1.0",
- "resolved": "https://registry.nlark.com/performance-now/download/performance-now-2.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
},
"picomatch": {
@@ -16028,7 +16028,7 @@
},
"pretty-data": {
"version": "0.40.0",
- "resolved": "https://registry.npm.taobao.org/pretty-data/download/pretty-data-0.40.0.tgz",
+ "resolved": "https://registry.npmjs.org/pretty-data/-/pretty-data-0.40.0.tgz",
"integrity": "sha1-Vyqo6iNGdGerlLa1Jmpv2cj93XI="
},
"pretty-error": {
@@ -16042,7 +16042,7 @@
},
"pretty-hrtime": {
"version": "1.0.3",
- "resolved": "https://registry.npm.taobao.org/pretty-hrtime/download/pretty-hrtime-1.0.3.tgz",
+ "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
"integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE="
},
"private": {
@@ -16601,7 +16601,7 @@
},
"jsonfile": {
"version": "4.0.0",
- "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz?cache=0&sync_timestamp=1604161876665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-4.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
"requires": {
"graceful-fs": "^4.1.6"
@@ -16736,7 +16736,7 @@
},
"jsonfile": {
"version": "4.0.0",
- "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz?cache=0&sync_timestamp=1604161876665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-4.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
"requires": {
"graceful-fs": "^4.1.6"
@@ -16823,7 +16823,7 @@
},
"jsonfile": {
"version": "4.0.0",
- "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz?cache=0&sync_timestamp=1604161876665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-4.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
"requires": {
"graceful-fs": "^4.1.6"
@@ -17061,7 +17061,7 @@
},
"jsonfile": {
"version": "4.0.0",
- "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz?cache=0&sync_timestamp=1604161876665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-4.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
"requires": {
"graceful-fs": "^4.1.6"
@@ -17228,12 +17228,12 @@
},
"color-name": {
"version": "1.1.3",
- "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.3.tgz",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
},
"has-flag": {
"version": "3.0.0",
- "resolved": "https://registry.nlark.com/has-flag/download/has-flag-3.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-3.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
},
"supports-color": {
@@ -17642,7 +17642,7 @@
},
"remove-bom-stream": {
"version": "1.2.0",
- "resolved": "https://registry.npm.taobao.org/remove-bom-stream/download/remove-bom-stream-1.2.0.tgz",
+ "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
"integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
"requires": {
"remove-bom-buffer": "^3.0.0",
@@ -17693,7 +17693,7 @@
},
"replace-homedir": {
"version": "1.0.0",
- "resolved": "https://registry.npm.taobao.org/replace-homedir/download/replace-homedir-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
"integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
"requires": {
"homedir-polyfill": "^1.0.1",
@@ -17737,7 +17737,7 @@
},
"request-progress": {
"version": "3.0.0",
- "resolved": "https://registry.npm.taobao.org/request-progress/download/request-progress-3.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz",
"integrity": "sha1-TKdUCBx/7GP1BeT6qCWqBs1mnb4=",
"requires": {
"throttleit": "^1.0.0"
@@ -17809,7 +17809,7 @@
},
"resolve-dir": {
"version": "1.0.1",
- "resolved": "https://registry.npm.taobao.org/resolve-dir/download/resolve-dir-1.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
"integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
"requires": {
"expand-tilde": "^2.0.0",
@@ -17823,7 +17823,7 @@
},
"resolve-options": {
"version": "1.1.0",
- "resolved": "https://registry.npm.taobao.org/resolve-options/download/resolve-options-1.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
"integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
"requires": {
"value-or-function": "^3.0.0"
@@ -17988,7 +17988,7 @@
},
"semver-greatest-satisfied-range": {
"version": "1.1.0",
- "resolved": "https://registry.npm.taobao.org/semver-greatest-satisfied-range/download/semver-greatest-satisfied-range-1.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
"integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
"requires": {
"sver-compat": "^1.5.0"
@@ -18530,7 +18530,7 @@
},
"stack-trace": {
"version": "0.0.10",
- "resolved": "https://registry.nlark.com/stack-trace/download/stack-trace-0.0.10.tgz?cache=0&sync_timestamp=1620387179562&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstack-trace%2Fdownload%2Fstack-trace-0.0.10.tgz",
+ "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
"integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA="
},
"stackframe": {
@@ -18570,7 +18570,7 @@
},
"stealthy-require": {
"version": "1.1.1",
- "resolved": "https://registry.nlark.com/stealthy-require/download/stealthy-require-1.1.1.tgz",
+ "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
"integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks="
},
"stream-browserify": {
@@ -18784,17 +18784,17 @@
"dependencies": {
"ansi-styles": {
"version": "2.2.1",
- "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-2.2.1.tgz?cache=0&sync_timestamp=1618995588464&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-2.2.1.tgz",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
},
"camelcase": {
"version": "3.0.0",
- "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-3.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
},
"chalk": {
"version": "1.1.3",
- "resolved": "https://registry.nlark.com/chalk/download/chalk-1.1.3.tgz?cache=0&sync_timestamp=1627646655305&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-1.1.3.tgz",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"requires": {
"ansi-styles": "^2.2.1",
@@ -18806,7 +18806,7 @@
},
"supports-color": {
"version": "2.0.0",
- "resolved": "https://registry.nlark.com/supports-color/download/supports-color-2.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
}
}
@@ -18861,7 +18861,7 @@
},
"sver-compat": {
"version": "1.5.0",
- "resolved": "https://registry.npm.taobao.org/sver-compat/download/sver-compat-1.5.0.tgz",
+ "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
"integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
"requires": {
"es6-iterator": "^2.0.1",
@@ -19149,7 +19149,7 @@
},
"thenify-all": {
"version": "1.6.0",
- "resolved": "https://registry.npm.taobao.org/thenify-all/download/thenify-all-1.6.0.tgz",
+ "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
"integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
"requires": {
"thenify": ">= 3.1.0 < 4"
@@ -19162,12 +19162,12 @@
},
"throttleit": {
"version": "1.0.0",
- "resolved": "https://registry.npm.taobao.org/throttleit/download/throttleit-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
"integrity": "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw="
},
"through": {
"version": "2.3.8",
- "resolved": "https://registry.nlark.com/through/download/through-2.3.8.tgz?cache=0&sync_timestamp=1618847037651&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fthrough%2Fdownload%2Fthrough-2.3.8.tgz",
+ "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
},
"through2": {
@@ -19232,7 +19232,7 @@
},
"to-absolute-glob": {
"version": "2.0.2",
- "resolved": "https://registry.npm.taobao.org/to-absolute-glob/download/to-absolute-glob-2.0.2.tgz",
+ "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
"integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
"requires": {
"is-absolute": "^1.0.0",
@@ -19279,7 +19279,7 @@
},
"to-through": {
"version": "2.0.0",
- "resolved": "https://registry.npm.taobao.org/to-through/download/to-through-2.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
"integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
"requires": {
"through2": "^2.0.3"
@@ -19307,12 +19307,12 @@
},
"traverse": {
"version": "0.6.6",
- "resolved": "https://registry.nlark.com/traverse/download/traverse-0.6.6.tgz",
+ "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz",
"integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc="
},
"trim": {
"version": "0.0.1",
- "resolved": "https://registry.npm.taobao.org/trim/download/trim-0.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
"integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0="
},
"trim-newlines": {
@@ -19407,7 +19407,7 @@
},
"tunnel-agent": {
"version": "0.6.0",
- "resolved": "https://registry.nlark.com/tunnel-agent/download/tunnel-agent-0.6.0.tgz",
+ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
"requires": {
"safe-buffer": "^5.0.1"
@@ -19415,7 +19415,7 @@
},
"tweetnacl": {
"version": "0.14.5",
- "resolved": "https://registry.npm.taobao.org/tweetnacl/download/tweetnacl-0.14.5.tgz",
+ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
},
"type": {
@@ -19552,7 +19552,7 @@
},
"unc-path-regex": {
"version": "0.1.2",
- "resolved": "https://registry.npm.taobao.org/unc-path-regex/download/unc-path-regex-0.1.2.tgz",
+ "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
"integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo="
},
"undertaker": {
@@ -19574,7 +19574,7 @@
},
"undertaker-registry": {
"version": "1.0.1",
- "resolved": "https://registry.npm.taobao.org/undertaker-registry/download/undertaker-registry-1.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
"integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA="
},
"unherit": {
@@ -19938,7 +19938,7 @@
},
"value-or-function": {
"version": "3.0.0",
- "resolved": "https://registry.npm.taobao.org/value-or-function/download/value-or-function-3.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
"integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM="
},
"vant": {
@@ -19966,7 +19966,7 @@
},
"verror": {
"version": "1.10.0",
- "resolved": "https://registry.nlark.com/verror/download/verror-1.10.0.tgz",
+ "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
"requires": {
"assert-plus": "^1.0.0",
@@ -19976,7 +19976,7 @@
"dependencies": {
"core-util-is": {
"version": "1.0.2",
- "resolved": "https://registry.nlark.com/core-util-is/download/core-util-is-1.0.2.tgz",
+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
}
}
@@ -20028,7 +20028,7 @@
"dependencies": {
"clone": {
"version": "2.1.2",
- "resolved": "https://registry.nlark.com/clone/download/clone-2.1.2.tgz",
+ "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
"integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18="
}
}
@@ -20059,7 +20059,7 @@
},
"vinyl-sourcemap": {
"version": "1.1.0",
- "resolved": "https://registry.npm.taobao.org/vinyl-sourcemap/download/vinyl-sourcemap-1.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
"integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
"requires": {
"append-buffer": "^1.0.2",
@@ -20073,7 +20073,7 @@
"dependencies": {
"normalize-path": {
"version": "2.1.1",
- "resolved": "https://registry.nlark.com/normalize-path/download/normalize-path-2.1.1.tgz",
+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
"requires": {
"remove-trailing-separator": "^1.0.1"
@@ -20083,7 +20083,7 @@
},
"vinyl-sourcemaps-apply": {
"version": "0.2.1",
- "resolved": "https://registry.npm.taobao.org/vinyl-sourcemaps-apply/download/vinyl-sourcemaps-apply-0.2.1.tgz",
+ "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz",
"integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=",
"requires": {
"source-map": "^0.5.1"
@@ -20091,7 +20091,7 @@
"dependencies": {
"source-map": {
"version": "0.5.7",
- "resolved": "https://registry.nlark.com/source-map/download/source-map-0.5.7.tgz",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
}
}
@@ -20415,7 +20415,7 @@
},
"wcwidth": {
"version": "1.0.1",
- "resolved": "https://registry.nlark.com/wcwidth/download/wcwidth-1.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
"integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
"requires": {
"defaults": "^1.0.3"
diff --git a/framework b/framework
deleted file mode 160000
index 6c94a9c..0000000
--- a/framework
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6c94a9cceb1bbd0c163bb83a09057a1a00d7a0b8
diff --git a/framework/.gitignore b/framework/.gitignore
new file mode 100644
index 0000000..1b0971a
--- /dev/null
+++ b/framework/.gitignore
@@ -0,0 +1,9 @@
+bin/
+obj/
+*.user
+/Publish
+/packages
+.vs
+Logs/
+Upload
+dbsettings.Development.json
diff --git a/framework/.gitmodules b/framework/.gitmodules
new file mode 100644
index 0000000..eeb9c5b
--- /dev/null
+++ b/framework/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "Api/Furion"]
+ path = Api/Furion
+ url = https://gitee.com/dotnetchina/Furion.git
diff --git a/framework/Api/Ewide.Application/Entity/BsHouseCode.cs b/framework/Api/Ewide.Application/Entity/BsHouseCode.cs
new file mode 100644
index 0000000..ded5654
--- /dev/null
+++ b/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; }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Entity/BsHouseCompany.cs b/framework/Api/Ewide.Application/Entity/BsHouseCompany.cs
new file mode 100644
index 0000000..0849cdc
--- /dev/null
+++ b/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
+ {
+ ///
+ /// 单位类型,多选
+ ///
+ [Comment("单位类型,多选")]
+ [MaxLength(20)]
+ public string Type { get; set; }
+
+ ///
+ /// 单位名称
+ ///
+ [Comment("单位名称")]
+ [MaxLength(200)]
+ public string Name { get; set; }
+
+ ///
+ /// 信息
+ ///
+ [Comment("信息")]
+ public string Info { get; set; }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Entity/BsHouseInfo.cs b/framework/Api/Ewide.Application/Entity/BsHouseInfo.cs
new file mode 100644
index 0000000..f7c8ea8
--- /dev/null
+++ b/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
+ {
+ ///
+ /// HouseCode主键ID
+ ///
+ [Comment("bs_house_code主键Id")]
+ [MaxLength(36)]
+ [Required]
+ public string HouseCodeId { get; set; }
+
+ ///
+ /// 幢名称
+ ///
+ [Comment("幢名称")]
+ [MaxLength(255)]
+ public string BuildingName { get; set; }
+
+ ///
+ /// 土地性质
+ ///
+ [Comment("土地性质")]
+ public int? LandAttribute { get; set; }
+
+ ///
+ /// 结构类型
+ ///
+ [Comment("结构类型")]
+ public int? StructureType { get; set; }
+
+ ///
+ /// 基础情况
+ ///
+ [Comment("基础情况")]
+ public int? BaseInfo { get; set; }
+
+ ///
+ /// 抗震等级
+ ///
+ [Comment("抗震等级")]
+ public int? SeismicGrade { get; set; }
+
+ ///
+ /// 竣工日期
+ ///
+ [Comment("竣工日期")]
+ public DateTime? CompletedDate { get; set; }
+
+ ///
+ /// 设计使用年限
+ ///
+ [Comment("设计使用年限")]
+ public int? UsefulYear { get; set; }
+
+ ///
+ /// 总层数
+ ///
+ [Comment("总层数")]
+ public int? TotalFloor { get; set; }
+
+ ///
+ /// 地上层数
+ ///
+ [Comment("地上层数")]
+ public int? LandFloorCount { get; set; }
+
+ ///
+ /// 地上商业层数开始
+ ///
+ [Comment("地上商业层数开始")]
+ public int? LandBsFloorStart { get; set; }
+
+ ///
+ /// 地上商业层数结束
+ ///
+ [Comment("地上商业层数结束")]
+ public int? LandBsFloorEnd { get; set; }
+
+ ///
+ /// 地上车棚层开始
+ ///
+ [Comment("地上车棚层开始")]
+ public int? LandBikeFloorStart { get; set; }
+
+ ///
+ /// 地上住宅层开始
+ ///
+ [Comment("地上住宅层开始")]
+ public int? LandResidenceFloorStart { get; set; }
+
+ ///
+ /// 地上住宅层结束
+ ///
+ [Comment("地上住宅层结束")]
+ public int? LandResidenceFloorEnd { get; set; }
+
+ ///
+ /// 地下层数
+ ///
+ [Comment("地下层数")]
+ public int? UnderFloorCount { get; set; }
+
+ ///
+ /// 总建筑面积
+ ///
+ [Comment("总建筑面积")]
+ public float? TotalArea { get; set; }
+
+ ///
+ /// 有无建筑幕墙
+ ///
+ [Comment("有无建筑幕墙")]
+ public int? CurtainWall { get; set; }
+
+ ///
+ /// 有无面砖
+ ///
+ [Comment("有无面砖")]
+ public int? FaceBrick { get; set; }
+
+ ///
+ /// 有无涂料
+ ///
+ [Comment("有无涂料")]
+ public int? Coating { get; set; }
+
+ ///
+ /// 有无粉刷
+ ///
+ [Comment("有无粉刷")]
+ public int? Painting { get; set; }
+
+ ///
+ /// 电梯
+ ///
+ [Comment("电梯")]
+ [MaxLength(20)]
+ public string Elevator { get; set; }
+
+ ///
+ /// 总户数(户)
+ ///
+ [Comment("总户数(户)")]
+ public int? HouseHolds { get; set; }
+
+ ///
+ /// 房屋单元数
+ ///
+ [Comment("房屋单元数")]
+ public int? Units { get; set; }
+
+ ///
+ /// 各单元每层户数(户)
+ ///
+ [Comment("各单元每层户数(户)")]
+ public int? UnitFloorHolds { get; set; }
+
+ ///
+ /// 建设单位ID
+ ///
+ [Comment("建设单位ID")]
+ [MaxLength(36)]
+ public string BuildingUnitId { get; set; }
+
+ ///
+ /// 设计单位ID
+ ///
+ [Comment("设计单位ID")]
+ [MaxLength(36)]
+ public string DesingerUnitId { get; set; }
+
+ ///
+ /// 施工单位ID
+ ///
+ [Comment("施工单位ID")]
+ [MaxLength(36)]
+ public string ConstructionUnitId { get; set; }
+
+ ///
+ /// 监理单位ID
+ ///
+ [Comment("监理单位ID")]
+ [MaxLength(36)]
+ public string MonitorUnitId { get; set; }
+
+ ///
+ /// 产权性质
+ ///
+ [Comment("产权性质")]
+ [MaxLength(100)]
+ public string PropertyRights { get; set; }
+
+ ///
+ /// 总共套数
+ ///
+ [Comment("总共套数")]
+ public int? HouseCount { get; set; }
+
+ ///
+ /// 直管公房套数
+ ///
+ [Comment("直管公房套数")]
+ public int? StraightHouseCount { get; set; }
+
+ ///
+ /// 自管公房套数
+ ///
+ [Comment("自管公房套数")]
+ public int? SelfHouseCount { get; set; }
+
+ ///
+ /// 私房套数
+ ///
+ [Comment("私房套数")]
+ public int? PrivateHouseCount { get; set; }
+
+ ///
+ /// 商品房套数
+ ///
+ [Comment("商品房套数")]
+ public int? BusinessCount { get; set; }
+
+ ///
+ /// 房改房套数
+ ///
+ [Comment("房改房套数")]
+ public int? ChangeHouseCount { get; set; }
+
+ ///
+ /// 拆迁安置房套数
+ ///
+ [Comment("拆迁安置房套数")]
+ public int? ResettlementHouseCount { get; set; }
+
+ ///
+ /// 其它套数
+ ///
+ [Comment("其它套数")]
+ public int? OtherCount { get; set; }
+
+ ///
+ /// 产权单位ID
+ ///
+ [Comment("产权单位ID")]
+ [MaxLength(36)]
+ public string PropertyUnitId { get; set; }
+
+ ///
+ /// 物业单位ID
+ ///
+ [Comment("物业单位ID")]
+ [MaxLength(36)]
+ public string WuYeUnitId { get; set; }
+
+ ///
+ /// 图纸资料存档处
+ ///
+ [Comment("图纸资料存档处")]
+ [MaxLength(50)]
+ public string DrawingMaterial { get; set; }
+
+ ///
+ /// 其他图纸存档
+ ///
+ [Comment("其他图纸存档")]
+ [MaxLength(100)]
+ public string DrawingMaterialText { get; set; }
+
+ ///
+ /// 立项文件
+ ///
+ [Comment("立项文件")]
+ [MaxLength(2000)]
+ public string AnEntryDocument { get; set; }
+
+ ///
+ /// 规划许可
+ ///
+ [Comment("规划许可")]
+ [MaxLength(2000)]
+ public string PlanningPermission { get; set; }
+
+ ///
+ /// 竣工验收备案
+ ///
+ [Comment("竣工验收备案")]
+ [MaxLength(2000)]
+ public string CompletionRecord { get; set; }
+
+ ///
+ /// 监理资料
+ ///
+ [Comment("监理资料")]
+ [MaxLength(2000)]
+ public string MonitorDocument { get; set; }
+
+ ///
+ /// 鉴定报告
+ ///
+ [Comment("鉴定报告")]
+ [MaxLength(2000)]
+ public string IdentificationReport { get; set; }
+
+ ///
+ /// 其它资料
+ ///
+ [Comment("其它资料")]
+ [MaxLength(2000)]
+ public string OtherDocument { get; set; }
+
+ ///
+ /// 外立面照片
+ ///
+ [Comment("外立面照片")]
+ [MaxLength(2000)]
+ public string FacadePhoto { get; set; }
+
+ ///
+ /// 房屋等级 1,2,3,4,C,d
+ ///
+ [Comment("房屋等级 1,2,3,4,C,d")]
+ public int? HouseGrade { get; set; }
+
+ ///
+ /// 房屋使用状态
+ ///
+ [Comment("房屋使用状态")]
+ public int? HouseUsedStatus { get; set; }
+
+ ///
+ /// -1 退回(审核被退回的数据) 1、待建档(需要建档的数据未暂存未保存的)2、暂存(点击了暂存的数据)3、待提交(点击了保存的数据) 5、审核中6、审核通过
+ ///
+ [Comment("-1 退回(审核被退回的数据) 1、待建档(需要建档的数据未暂存未保存的)2、暂存(点击了暂存的数据)3、待提交(点击了保存的数据) 5、审核中6、审核通过")]
+ [Required]
+ public int State { get; set; }
+
+ ///
+ /// 调查登记机构
+ ///
+ [Comment("调查登记机构")]
+ [MaxLength(100)]
+ public string InvestigateAgency { get; set; }
+
+ ///
+ /// 纸质资料调查人
+ ///
+ [Comment("纸质资料调查人")]
+ [MaxLength(50)]
+ public string InvestigateUser { get; set; }
+
+ ///
+ /// 纸质资料审核人
+ ///
+ [Comment("纸质资料审核人")]
+ [MaxLength(50)]
+ public string OfflineAuditor { get; set; }
+
+ ///
+ /// 主管部门
+ ///
+ [Comment("主管部门")]
+ [MaxLength(50)]
+ public string CompetentDepartment { get; set; }
+
+ }
+}
diff --git a/framework/Api/Ewide.Application/Entity/BsHouseLog.cs b/framework/Api/Ewide.Application/Entity/BsHouseLog.cs
new file mode 100644
index 0000000..bdcd8bd
--- /dev/null
+++ b/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; }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Entity/BsHouseMemberRelation.cs b/framework/Api/Ewide.Application/Entity/BsHouseMemberRelation.cs
new file mode 100644
index 0000000..98e42e2
--- /dev/null
+++ b/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; }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Entity/BsHouseProjectInfo.cs b/framework/Api/Ewide.Application/Entity/BsHouseProjectInfo.cs
new file mode 100644
index 0000000..1f294e2
--- /dev/null
+++ b/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; }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Entity/BsHouseTask.cs b/framework/Api/Ewide.Application/Entity/BsHouseTask.cs
new file mode 100644
index 0000000..fde1073
--- /dev/null
+++ b/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
+ {
+ ///
+ /// bs_house_code主键Id
+ ///
+ [Comment("bs_house_code主键Id")]
+ [MaxLength(36)]
+ [Required]
+ public string HouseCodeId { get; set; }
+
+ ///
+ /// 巡查日期
+ ///
+ [Comment("巡查日期")]
+ public DateTime? PatrolDate { get; set; }
+
+ ///
+ /// 巡查人姓名
+ ///
+ [Comment("巡查人姓名")]
+ [MaxLength(50)]
+ public string PatrolUser { get; set; }
+
+ ///
+ /// 沉降倾斜
+ ///
+ [Comment("沉降倾斜")]
+ [MaxLength(1000)]
+ public string SettlementTilt { get; set; }
+
+ ///
+ /// 沉降倾斜附件
+ ///
+ [Comment("沉降倾斜附件")]
+ [MaxLength(2000)]
+ public string SettlementTiltFiles { get; set; }
+
+ ///
+ /// 其他情况
+ ///
+ [Comment("其他情况")]
+ [MaxLength(1000)]
+ public string OtherInfo { get; set; }
+
+ ///
+ /// 其他情况附件
+ ///
+ [Comment("其他情况附件")]
+ [MaxLength(2000)]
+ public string OtherInfoFiles { get; set; }
+
+ ///
+ /// 初始等级
+ ///
+ [Comment("初始等级")]
+ public int? InitGrade { get; set; }
+
+ ///
+ /// 损坏等级
+ ///
+ [Comment("损坏等级")]
+ public int? DamageGrade { get; set; }
+
+ ///
+ /// 综合等级
+ ///
+ [Comment("综合等级")]
+ public int? ComprehensiveGrade { get; set; }
+
+ ///
+ /// 房屋场地
+ ///
+ [Comment("房屋场地")]
+ [MaxLength(100)]
+ public string HouseSite { get; set; }
+
+ ///
+ /// 相邻施工
+ ///
+ [Comment("相邻施工")]
+ [MaxLength(100)]
+ public string AdjacentConstruction { get; set; }
+
+ ///
+ /// 化学侵蚀
+ ///
+ [Comment("化学侵蚀")]
+ [MaxLength(100)]
+ public string ChemicalErosion { get; set; }
+
+ ///
+ /// 结构拆改
+ ///
+ [Comment("结构拆改")]
+ public int? StructuralDismantling { get; set; }
+
+ ///
+ /// 加层改造
+ ///
+ [Comment("加层改造")]
+ public int? AddingLayer { get; set; }
+
+ ///
+ /// 修缮加固
+ ///
+ [Comment("修缮加固")]
+ [MaxLength(100)]
+ public string RepairAndReinforce { get; set; }
+
+ ///
+ /// 历史灾害
+ ///
+ [Comment("历史灾害")]
+ [MaxLength(100)]
+ public string HistoricalCalamity { get; set; }
+
+ ///
+ /// 使用功能变更
+ ///
+ [Comment("使用功能变更")]
+ [MaxLength(100)]
+ public string FunctionalChange { get; set; }
+
+ ///
+ /// 其他调查内容
+ ///
+ [Comment("其他调查内容")]
+ [MaxLength(1000)]
+ public string OtherContents { get; set; }
+
+ ///
+ /// 主要安全隐患综述
+ ///
+ [Comment("主要安全隐患综述")]
+ [MaxLength(1000)]
+ public string MainSafety { get; set; }
+
+ ///
+ /// 处理意见
+ ///
+ [Comment("处理意见")]
+ public int? HandlingOpinion { get; set; }
+
+ ///
+ /// 处理意见备注
+ ///
+ [Comment("处理意见备注")]
+ [MaxLength(1000)]
+ public string HandlingOpinionRemark { get; set; }
+
+ ///
+ /// 整改情况
+ ///
+ [Comment("整改情况")]
+ public int? RectifyAndReform { get; set; }
+
+ ///
+ /// 整改情况备注
+ ///
+ [Comment("整改情况备注")]
+ [MaxLength(1000)]
+ public string RectifyAndReformRemark { get; set; }
+
+ ///
+ /// 巡查结果:1正常,-1异常
+ ///
+ [Comment("巡查结果:1正常,-1异常")]
+ public int? PatrolResult { get; set; }
+
+ ///
+ /// 巡查异常描述
+ ///
+ [Comment("巡查异常描述")]
+ [MaxLength(1000)]
+ public string PatrolResultRemark { get; set; }
+
+ ///
+ /// 任务人员ID
+ ///
+ [Comment("任务人员ID")]
+ [MaxLength(36)]
+ public string UserID { get; set; }
+
+ ///
+ /// 任务截止时间
+ ///
+ [Comment("任务截止时间")]
+ public DateTime? EndTime { get; set; }
+
+ ///
+ /// 是否过期
+ ///
+ [Comment("是否过期")]
+ public bool? IsDelay { get; set; }
+
+ ///
+ /// -1:退回0:待处理1:保存待提交2:待审核3:审核通过
+ ///
+ [Comment("-1:退回0:待处理1:保存待提交2:待审核6:审核通过")]
+ public int Status { get; set; } = 0;
+
+ ///
+ /// 0:建档任务1:系统派发的巡查任务2:主动巡查任务
+ ///
+ [Comment("0:建档任务1:系统派发的巡查任务2:主动巡查任务")]
+ public int? TaskType { get; set; }
+
+ ///
+ /// 上报街道
+ ///
+ [Comment("上报街道")]
+ public int? ReportRoad { get; set; }
+
+ ///
+ /// 上报街道时间
+ ///
+ [Comment("上报街道时间")]
+ public DateTime? ReportRoadTime { get; set; }
+
+ ///
+ /// 上报区住建
+ ///
+ [Comment("上报区住建")]
+ public int? ReportArea { get; set; }
+
+ ///
+ /// 上报区住建时间
+ ///
+ [Comment("上报区住建时间")]
+ public DateTime? ReportAreaTime { get; set; }
+
+ ///
+ /// 上报备注
+ ///
+ [Comment("上报备注")]
+ [MaxLength(1000)]
+ public string ReportRemark { get; set; }
+
+ ///
+ /// 提交时间
+ ///
+ [Comment("提交时间")]
+ public DateTime? SubmitTime { get; set; }
+
+ ///
+ /// 最后提交时间
+ ///
+ [Comment("最后提交时间")]
+ public DateTime? LastSubmitTime { get; set; }
+
+ ///
+ /// 是否有效
+ ///
+ [Comment("是否有效")]
+ public bool IsEnabled { get; set; } = true;
+ }
+}
diff --git a/framework/Api/Ewide.Application/Entity/BsHouseTaskCheckRecord.cs b/framework/Api/Ewide.Application/Entity/BsHouseTaskCheckRecord.cs
new file mode 100644
index 0000000..5fdf4e1
--- /dev/null
+++ b/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
+ {
+ ///
+ /// 任务Id
+ ///
+ [Comment("任务Id")]
+ [MaxLength(36)]
+ public string TaskId { get; set; }
+
+ ///
+ /// 通过1;退回-1
+ ///
+ [Comment("通过3;退回-1")]
+ public int PassOrBack { get; set; }
+
+ ///
+ /// 审核内容
+ ///
+ [Comment("审核内容")]
+ [MaxLength(500)]
+ public string Content { get; set; }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Entity/BsHouseTaskOptions.cs b/framework/Api/Ewide.Application/Entity/BsHouseTaskOptions.cs
new file mode 100644
index 0000000..c279a1b
--- /dev/null
+++ b/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
+ {
+ ///
+ /// bs_house_code主键Id
+ ///
+ [Comment("bs_house_code主键Id")]
+ [MaxLength(36)]
+ [Required]
+ public string TaskId { get; set; }
+
+ ///
+ /// 字典类型
+ ///
+ [Comment("字典类型")]
+ [MaxLength(50)]
+ public string DictType { get; set; }
+
+ ///
+ /// 字典code
+ ///
+ [Comment("字典code")]
+ [MaxLength(50)]
+ public string DictCode { get; set; }
+
+ ///
+ /// 字典值
+ ///
+ [Comment("字典值")]
+ [MaxLength(100)]
+ public string DictValue { get; set; }
+
+ ///
+ /// 备注
+ ///
+ [Comment("备注")]
+ [MaxLength(500)]
+ public string Remark { get; set; }
+
+ ///
+ /// 附件
+ ///
+ [Comment("附件")]
+ [MaxLength(2000)]
+ public string File { get; set; }
+
+ ///
+ /// 是否选中
+ ///
+ [Comment("是否选中")]
+ public bool? Checked { get; set; }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Entity/README.md b/framework/Api/Ewide.Application/Entity/README.md
new file mode 100644
index 0000000..59bc7dd
--- /dev/null
+++ b/framework/Api/Ewide.Application/Entity/README.md
@@ -0,0 +1 @@
+/** 您的业务实体文件写在此文件夹下面 **/
diff --git a/framework/Api/Ewide.Application/Enum/DataStatus.cs b/framework/Api/Ewide.Application/Enum/DataStatus.cs
new file mode 100644
index 0000000..d073a7f
--- /dev/null
+++ b/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
+ {
+ ///
+ /// 审核退回
+ ///
+ [Description("审核退回")]
+ Back = -1,
+
+ ///
+ /// 初始未处理
+ ///
+ [Description("初始未处理")]
+ Init = 0,
+
+ ///
+ /// 暂存
+ ///
+ [Description("暂存")]
+ TempSaved = 1,
+
+ ///
+ /// 已保存,待提交
+ ///
+ [Description("已保存,待提交")]
+ Saved = 2,
+
+ ///
+ /// 已提交,待审核
+ ///
+ [Description("已提交,待审核")]
+ Submited = 3,
+
+ ///
+ /// 审核通过
+ ///
+ [Description("审核通过")]
+ Passed = 6
+ }
+}
diff --git a/framework/Api/Ewide.Application/Enum/HouseLog.cs b/framework/Api/Ewide.Application/Enum/HouseLog.cs
new file mode 100644
index 0000000..29d707f
--- /dev/null
+++ b/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,
+ }
+}
diff --git a/framework/Api/Ewide.Application/Enum/HouseManagerRole.cs b/framework/Api/Ewide.Application/Enum/HouseManagerRole.cs
new file mode 100644
index 0000000..bb0909b
--- /dev/null
+++ b/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
+ {
+ ///
+ /// 市住建部门
+ ///
+ CityManager,
+
+ ///
+ /// 区住建部门
+ ///
+ AreaManager,
+
+ ///
+ /// 街道管理员
+ ///
+ RoadManager,
+
+ ///
+ /// 片区监管员
+ ///
+ ZoneManager,
+
+ ///
+ /// 房屋安全管理员
+ ///
+ HouseSecurityManager
+ }
+}
diff --git a/framework/Api/Ewide.Application/Ewide.Application.csproj b/framework/Api/Ewide.Application/Ewide.Application.csproj
new file mode 100644
index 0000000..8a134d8
--- /dev/null
+++ b/framework/Api/Ewide.Application/Ewide.Application.csproj
@@ -0,0 +1,28 @@
+
+
+
+ net5.0
+ 1701;1702;1591
+ Ewide.Application.xml
+
+
+
+
+
+
+
+
+
+ PreserveNewest
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/framework/Api/Ewide.Application/Ewide.Application.xml b/framework/Api/Ewide.Application/Ewide.Application.xml
new file mode 100644
index 0000000..53d4ca2
--- /dev/null
+++ b/framework/Api/Ewide.Application/Ewide.Application.xml
@@ -0,0 +1,1490 @@
+
+
+
+ Ewide.Application
+
+
+
+
+ 单位类型,多选
+
+
+
+
+ 单位名称
+
+
+
+
+ 信息
+
+
+
+
+ HouseCode主键ID
+
+
+
+
+ 幢名称
+
+
+
+
+ 土地性质
+
+
+
+
+ 结构类型
+
+
+
+
+ 基础情况
+
+
+
+
+ 抗震等级
+
+
+
+
+ 竣工日期
+
+
+
+
+ 设计使用年限
+
+
+
+
+ 总层数
+
+
+
+
+ 地上层数
+
+
+
+
+ 地上商业层数开始
+
+
+
+
+ 地上商业层数结束
+
+
+
+
+ 地上车棚层开始
+
+
+
+
+ 地上住宅层开始
+
+
+
+
+ 地上住宅层结束
+
+
+
+
+ 地下层数
+
+
+
+
+ 总建筑面积
+
+
+
+
+ 有无建筑幕墙
+
+
+
+
+ 有无面砖
+
+
+
+
+ 有无涂料
+
+
+
+
+ 有无粉刷
+
+
+
+
+ 电梯
+
+
+
+
+ 总户数(户)
+
+
+
+
+ 房屋单元数
+
+
+
+
+ 各单元每层户数(户)
+
+
+
+
+ 建设单位ID
+
+
+
+
+ 设计单位ID
+
+
+
+
+ 施工单位ID
+
+
+
+
+ 监理单位ID
+
+
+
+
+ 产权性质
+
+
+
+
+ 总共套数
+
+
+
+
+ 直管公房套数
+
+
+
+
+ 自管公房套数
+
+
+
+
+ 私房套数
+
+
+
+
+ 商品房套数
+
+
+
+
+ 房改房套数
+
+
+
+
+ 拆迁安置房套数
+
+
+
+
+ 其它套数
+
+
+
+
+ 产权单位ID
+
+
+
+
+ 物业单位ID
+
+
+
+
+ 图纸资料存档处
+
+
+
+
+ 其他图纸存档
+
+
+
+
+ 立项文件
+
+
+
+
+ 规划许可
+
+
+
+
+ 竣工验收备案
+
+
+
+
+ 监理资料
+
+
+
+
+ 鉴定报告
+
+
+
+
+ 其它资料
+
+
+
+
+ 外立面照片
+
+
+
+
+ 房屋等级 1,2,3,4,C,d
+
+
+
+
+ 房屋使用状态
+
+
+
+
+ -1 退回(审核被退回的数据) 1、待建档(需要建档的数据未暂存未保存的)2、暂存(点击了暂存的数据)3、待提交(点击了保存的数据) 5、审核中6、审核通过
+
+
+
+
+ 调查登记机构
+
+
+
+
+ 纸质资料调查人
+
+
+
+
+ 纸质资料审核人
+
+
+
+
+ 主管部门
+
+
+
+
+ bs_house_code主键Id
+
+
+
+
+ 巡查日期
+
+
+
+
+ 巡查人姓名
+
+
+
+
+ 沉降倾斜
+
+
+
+
+ 沉降倾斜附件
+
+
+
+
+ 其他情况
+
+
+
+
+ 其他情况附件
+
+
+
+
+ 初始等级
+
+
+
+
+ 损坏等级
+
+
+
+
+ 综合等级
+
+
+
+
+ 房屋场地
+
+
+
+
+ 相邻施工
+
+
+
+
+ 化学侵蚀
+
+
+
+
+ 结构拆改
+
+
+
+
+ 加层改造
+
+
+
+
+ 修缮加固
+
+
+
+
+ 历史灾害
+
+
+
+
+ 使用功能变更
+
+
+
+
+ 其他调查内容
+
+
+
+
+ 主要安全隐患综述
+
+
+
+
+ 处理意见
+
+
+
+
+ 处理意见备注
+
+
+
+
+ 整改情况
+
+
+
+
+ 整改情况备注
+
+
+
+
+ 巡查结果:1正常,-1异常
+
+
+
+
+ 巡查异常描述
+
+
+
+
+ 任务人员ID
+
+
+
+
+ 任务截止时间
+
+
+
+
+ 是否过期
+
+
+
+
+ -1:退回0:待处理1:保存待提交2:待审核3:审核通过
+
+
+
+
+ 0:建档任务1:系统派发的巡查任务2:主动巡查任务
+
+
+
+
+ 上报街道
+
+
+
+
+ 上报街道时间
+
+
+
+
+ 上报区住建
+
+
+
+
+ 上报区住建时间
+
+
+
+
+ 上报备注
+
+
+
+
+ 提交时间
+
+
+
+
+ 最后提交时间
+
+
+
+
+ 是否有效
+
+
+
+
+ 任务Id
+
+
+
+
+ 通过1;退回-1
+
+
+
+
+ 审核内容
+
+
+
+
+ bs_house_code主键Id
+
+
+
+
+ 字典类型
+
+
+
+
+ 字典code
+
+
+
+
+ 字典值
+
+
+
+
+ 备注
+
+
+
+
+ 附件
+
+
+
+
+ 是否选中
+
+
+
+
+ 审核退回
+
+
+
+
+ 初始未处理
+
+
+
+
+ 暂存
+
+
+
+
+ 已保存,待提交
+
+
+
+
+ 已提交,待审核
+
+
+
+
+ 审核通过
+
+
+
+
+ 市住建部门
+
+
+
+
+ 区住建部门
+
+
+
+
+ 街道管理员
+
+
+
+
+ 片区监管员
+
+
+
+
+ 房屋安全管理员
+
+
+
+
+ 房屋编码相关
+
+
+
+
+ 获取同一区域下的下一个编号
+
+
+
+
+
+
+ 房屋详细信息
+
+
+
+
+ 住宅查询
+
+
+
+
+ 房屋流转日志
+
+
+
+
+ 分页查询用户
+
+
+
+
+
+
+ 增加用户
+
+
+
+
+
+
+ 获取角色
+
+
+
+
+
+
+ 获取用户拥有角色
+
+
+
+
+
+
+ 删除用户
+
+
+
+
+
+
+ 更新用户
+
+
+
+
+
+
+ 查看用户
+
+
+
+
+
+
+ 修改用户状态
+
+
+
+
+
+
+ 授权用户数据范围
+
+
+
+
+
+
+ 获取用户拥有数据
+
+
+
+
+
+
+ 获取当前机构中所创建的默认角色
+ 片区中的第一个帐号必定为片区监管员
+
+
+
+
+
+
+ 获取可创建的角色列表
+
+
+
+
+
+ 项目管理相关服务
+
+
+
+
+ 添加项目
+
+
+
+
+
+
+ 删除项目
+
+
+
+
+
+
+ 编辑项目
+
+
+
+
+
+
+ 通过ID获取项目
+
+
+
+
+
+
+ 分页查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 获取项目下拉列表
+
+
+
+
+
+
+ 选房相关
+
+
+
+
+ 获取人员允许绑定的房屋编码列表
+
+
+
+
+
+
+ 获取人员已经绑定的房屋编码列表
+
+
+
+
+
+
+ 从人员选择房屋
+
+
+
+
+
+
+ 房屋任务(巡查任务/建档任务)
+
+
+
+
+ 片区相关
+
+
+
+
+ 获取片区列表
+
+
+
+
+
+
+ 分页查询片区
+
+
+
+
+
+
+ 根据用户Id获取所在片区的Id
+
+
+
+
+
+
+ 总建筑面积
+
+
+
+
+ 总户数(户)
+
+
+
+
+ 房屋单元数
+
+
+
+
+ 各单元每层户数(户)
+
+
+
+
+ 总层数
+
+
+
+
+ 地上层数
+
+
+
+
+ 地上商业层数开始
+
+
+
+
+ 地上商业层数结束
+
+
+
+
+ 地上车棚层开始
+
+
+
+
+ 地上住宅层开始
+
+
+
+
+ 地上住宅层结束
+
+
+
+
+ 地下层数
+
+
+
+
+ 产权性质
+
+
+
+
+ 总共套数
+
+
+
+
+ 直管公房套数
+
+
+
+
+ 自管公房套数
+
+
+
+
+ 私房套数
+
+
+
+
+ 商品房套数
+
+
+
+
+ 房改房套数
+
+
+
+
+ 拆迁安置房套数
+
+
+
+
+ 其它套数
+
+
+
+
+ 房屋等级 1,2,3,4,C,d
+
+
+
+
+ 房屋使用状态
+
+
+
+
+ 图纸资料存档处
+
+
+
+
+ 其他图纸存档
+
+
+
+
+ 立项文件
+
+
+
+
+ 规划许可
+
+
+
+
+ 竣工验收备案
+
+
+
+
+ 监理资料
+
+
+
+
+ 鉴定报告
+
+
+
+
+ 其它资料
+
+
+
+
+ 外立面照片
+
+
+
+
+ 调查登记机构
+
+
+
+
+ 纸质资料调查人
+
+
+
+
+ 纸质资料审核人
+
+
+
+
+ 主管部门
+
+
+
+
+ 总建筑面积
+
+
+
+
+ 总户数(户)
+
+
+
+
+ 房屋单元数
+
+
+
+
+ 各单元每层户数(户)
+
+
+
+
+ 总层数
+
+
+
+
+ 地上层数
+
+
+
+
+ 地上商业层数开始
+
+
+
+
+ 地上商业层数结束
+
+
+
+
+ 地上车棚层开始
+
+
+
+
+ 地上住宅层开始
+
+
+
+
+ 地上住宅层结束
+
+
+
+
+ 地下层数
+
+
+
+
+ 产权性质
+
+
+
+
+ 总共套数
+
+
+
+
+ 直管公房套数
+
+
+
+
+ 自管公房套数
+
+
+
+
+ 私房套数
+
+
+
+
+ 商品房套数
+
+
+
+
+ 房改房套数
+
+
+
+
+ 拆迁安置房套数
+
+
+
+
+ 其它套数
+
+
+
+
+ 房屋等级 1,2,3,4,C,d
+
+
+
+
+ 房屋使用状态
+
+
+
+
+ 图纸资料存档处
+
+
+
+
+ 其他图纸存档
+
+
+
+
+ 立项文件
+
+
+
+
+ 规划许可
+
+
+
+
+ 竣工验收备案
+
+
+
+
+ 监理资料
+
+
+
+
+ 鉴定报告
+
+
+
+
+ 其它资料
+
+
+
+
+ 外立面照片
+
+
+
+
+ 调查登记机构
+
+
+
+
+ 纸质资料调查人
+
+
+
+
+ 纸质资料审核人
+
+
+
+
+ 主管部门
+
+
+
+
+ 任务Id
+
+
+
+
+ 通过3;退回-1
+
+
+
+
+ 审核内容
+
+
+
+
+ 沉降倾斜
+
+
+
+
+ 沉降倾斜附件
+
+
+
+
+ 其他情况
+
+
+
+
+ 其他情况附件
+
+
+
+
+ 房屋场地
+
+
+
+
+ 相邻施工
+
+
+
+
+ 化学侵蚀
+
+
+
+
+ 结构拆改
+
+
+
+
+ 加层改造
+
+
+
+
+ 修缮加固
+
+
+
+
+ 历史灾害
+
+
+
+
+ 使用功能变更
+
+
+
+
+ 其他调查内容
+
+
+
+
+ 主要安全隐患综述
+
+
+
+
+ 处理意见
+
+
+
+
+ 处理意见备注
+
+
+
+
+ 整改情况
+
+
+
+
+ 整改情况备注
+
+
+
+
+ 巡查结果:1正常,-1异常
+
+
+
+
+ 上报街道
+
+
+
+
+ 上报街道时间
+
+
+
+
+ 上报区住建
+
+
+
+
+ 上报区住建时间
+
+
+
+
+ 上报备注
+
+
+
+
+ 沉降倾斜
+
+
+
+
+ 沉降倾斜附件
+
+
+
+
+ 其他情况
+
+
+
+
+ 其他情况附件
+
+
+
+
+ 初始等级
+
+
+
+
+ 损坏等级
+
+
+
+
+ 综合等级
+
+
+
+
+ 房屋场地
+
+
+
+
+ 相邻施工
+
+
+
+
+ 化学侵蚀
+
+
+
+
+ 结构拆改
+
+
+
+
+ 加层改造
+
+
+
+
+ 修缮加固
+
+
+
+
+ 历史灾害
+
+
+
+
+ 使用功能变更
+
+
+
+
+ 其他调查内容
+
+
+
+
+ 主要安全隐患综述
+
+
+
+
+ 处理意见
+
+
+
+
+ 处理意见备注
+
+
+
+
+ 整改情况
+
+
+
+
+ 整改情况备注
+
+
+
+
+ 巡查结果:1正常,-1异常
+
+
+
+
+ 巡查异常描述
+
+
+
+
+ 上报街道
+
+
+
+
+ 上报街道时间
+
+
+
+
+ 上报区住建
+
+
+
+
+ 上报区住建时间
+
+
+
+
+ 上报备注
+
+
+
+
+ 提交时间
+
+
+
+
+ 最后提交时间
+
+
+
+
+ 是否有效
+
+
+
+
+ 所属街道
+
+
+
+
+ 名称
+
+
+
+
+ 机构Id
+
+
+
+
diff --git a/framework/Api/Ewide.Application/README.md b/framework/Api/Ewide.Application/README.md
new file mode 100644
index 0000000..11a79cd
--- /dev/null
+++ b/framework/Api/Ewide.Application/README.md
@@ -0,0 +1,3 @@
+1、原则上服务应该放在Application层次,考虑将咱自己的业务层直接写在Application里面好些,后续升级后,咱大家直接升级就行了,减少冲突!
+2、系统默认ORM为EF Core,如果觉得不趁手,可以自行更换
+3、在此应用层默认集成了SqlSugar,其他ORM类同,可以多个ORM并行开发,熟悉哪个用哪个
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseCode/Dto/HouseCodeInput.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseCode/Dto/HouseCodeInput.cs
new file mode 100644
index 0000000..d105eda
--- /dev/null
+++ b/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; }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseCode/Dto/HouseCodeOutput.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseCode/Dto/HouseCodeOutput.cs
new file mode 100644
index 0000000..bb691f8
--- /dev/null
+++ b/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; }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseCode/HouseCodeService.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseCode/HouseCodeService.cs
new file mode 100644
index 0000000..8175ddd
--- /dev/null
+++ b/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
+{
+ ///
+ /// 房屋编码相关
+ ///
+ [ApiDescriptionSettings(Name = "HouseCode", Order = 180)]
+ public class HouseCodeService : IHouseCodeService, IDynamicApiController, ITransient
+ {
+ private readonly IRepository _houseCodeRep;
+ private readonly IDapperRepository _dapperRepository;
+
+ private readonly IUserManager _userManager;
+ private readonly IHouseLogService _houseLogService;
+
+ public HouseCodeService(IRepository 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();
+ var houseProject = await houseProjectInfoRep.FirstOrDefaultAsync(p => p.Id == input.ProjectId);
+ if (houseProject == null) throw Oops.Oh("项目参数有误,添加失败");
+
+ var areaCodeRep = Db.GetRepository();
+ 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();
+ 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();
+ 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 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 GetHouserCode([FromQuery] GetHouseCodeInput input)
+ {
+ var houseCode = await _houseCodeRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id == input.Id);
+ var areaCode = (await Db.GetRepository().DetachedEntities.FirstOrDefaultAsync(p => p.Id == houseCode.ProjectId)).AreaCode;
+ var result = houseCode.Adapt();
+ result.AreaCode = areaCode;
+ return result;
+ }
+
+ ///
+ /// 获取同一区域下的下一个编号
+ ///
+ ///
+ ///
+ [HttpGet("/houseCode/getNextNoByCode")]
+ public async Task GetNextNoByFullNumber([Required] string projectId)
+ {
+ var areaCodeRep = Db.GetRepository();
+ var houseProjectInfoRep = Db.GetRepository();
+ 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;
+ }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseCode/IHouseCodeService.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseCode/IHouseCodeService.cs
new file mode 100644
index 0000000..c1e1e4f
--- /dev/null
+++ b/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);
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseCompany/Dto/HouseCompanyInput.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseCompany/Dto/HouseCompanyInput.cs
new file mode 100644
index 0000000..95fcd6e
--- /dev/null
+++ b/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 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; }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseCompany/Dto/HouseCompanyOutput.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseCompany/Dto/HouseCompanyOutput.cs
new file mode 100644
index 0000000..8692722
--- /dev/null
+++ b/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 Info { get; set; }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseCompany/HouseCompanyService.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseCompany/HouseCompanyService.cs
new file mode 100644
index 0000000..dc99898
--- /dev/null
+++ b/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 _bsHouseCompanyRep;
+
+ public HouseCompanyService(IRepository bsHouseCompanyRep)
+ {
+ _bsHouseCompanyRep = bsHouseCompanyRep;
+ }
+
+ [HttpPost("/houseCompany/page")]
+ public async Task Page([FromBody] HouseCompanyPageInput input)
+ {
+ var config = new TypeAdapterConfig().ForType()
+ .Map(target => target.Info, src => JsonConvert.DeserializeObject>(src.Info))
+ .Config;
+ return await _bsHouseCompanyRep.DetachedEntities.ToPageData(input, config);
+ }
+
+ [HttpPost("/houseCompany/add")]
+ public async Task Add([FromBody] HouseCompanyAddInput input)
+ {
+ var info = JsonConvert.SerializeObject(input.Info);
+ var config = new TypeAdapterConfig().ForType()
+ .Map(target => target.Info, src => JsonConvert.SerializeObject(src.Info))
+ .Config;
+ var company = input.Adapt(config);
+ await company.InsertAsync();
+ }
+
+ [HttpPost("/houseCompany/edit")]
+ public async Task Edit([FromBody] HouseCompanyEditInput input)
+ {
+ var config = new TypeAdapterConfig().ForType()
+ .Map(target => target.Info, src => JsonConvert.SerializeObject(src.Info))
+ .Config;
+ var company = input.Adapt(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 Detail([FromQuery] HouseCompanyInput input)
+ {
+ var company = await _bsHouseCompanyRep.FirstOrDefaultAsync(p => p.Id.Equals(input.Id));
+ var config = new TypeAdapterConfig().ForType()
+ .Map(target => target.Info, src => JsonConvert.DeserializeObject>(src.Info))
+ .Config;
+ var output = company.Adapt(config);
+ return output;
+ }
+
+ [HttpGet("/houseCompany/list")]
+ public async Task List([FromQuery] HouseCompanyListInput input)
+ {
+ var types = input.Type.Split(',');
+ var result = new List();
+ var config = new TypeAdapterConfig().ForType()
+ .Map(target => target.Info, src => JsonConvert.DeserializeObject>(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(config);
+ return output;
+ });
+ result.AddRange(list);
+ }
+
+ return result.Distinct();
+ }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseCompany/IHouseCompanyService.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseCompany/IHouseCompanyService.cs
new file mode 100644
index 0000000..94eac4e
--- /dev/null
+++ b/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 Page([FromBody] HouseCompanyPageInput input);
+ Task Add([FromBody] HouseCompanyAddInput input);
+ Task Edit([FromBody] HouseCompanyEditInput input);
+ Task Delete([FromBody] HouseCompanyInput input);
+ Task Detail([FromQuery] HouseCompanyInput input);
+ Task List([FromQuery] HouseCompanyListInput input);
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoInput.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoInput.cs
new file mode 100644
index 0000000..6977a3f
--- /dev/null
+++ b/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; }
+ ///
+ /// 总建筑面积
+ ///
+ public float? TotalArea { get; set; }
+ ///
+ /// 总户数(户)
+ ///
+ public int? HouseHolds { get; set; }
+
+ ///
+ /// 房屋单元数
+ ///
+ public int? Units { get; set; }
+
+ ///
+ /// 各单元每层户数(户)
+ ///
+ public int? UnitFloorHolds { get; set; }
+
+ ///
+ /// 总层数
+ ///
+ public int? TotalFloor { get; set; }
+
+ ///
+ /// 地上层数
+ ///
+ public int? LandFloorCount { get; set; }
+
+ ///
+ /// 地上商业层数开始
+ ///
+ public int? LandBsFloorStart { get; set; }
+
+ ///
+ /// 地上商业层数结束
+ ///
+ public int? LandBsFloorEnd { get; set; }
+
+ ///
+ /// 地上车棚层开始
+ ///
+ public int? LandBikeFloorStart { get; set; }
+
+ ///
+ /// 地上住宅层开始
+ ///
+ public int? LandResidenceFloorStart { get; set; }
+
+ ///
+ /// 地上住宅层结束
+ ///
+ public int? LandResidenceFloorEnd { get; set; }
+
+ ///
+ /// 地下层数
+ ///
+ public int? UnderFloorCount { get; set; }
+ #endregion
+ #region 权属情况ownership
+ ///
+ /// 产权性质
+ ///
+ public string PropertyRights { get; set; }
+
+ ///
+ /// 总共套数
+ ///
+ public int? HouseCount { get; set; }
+ ///
+ /// 直管公房套数
+ ///
+ public int? StraightHouseCount { get; set; }
+
+ ///
+ /// 自管公房套数
+ ///
+ public int? SelfHouseCount { get; set; }
+
+ ///
+ /// 私房套数
+ ///
+ public int? PrivateHouseCount { get; set; }
+
+ ///
+ /// 商品房套数
+ ///
+ public int? BusinessCount { get; set; }
+
+ ///
+ /// 房改房套数
+ ///
+ public int? ChangeHouseCount { get; set; }
+
+ ///
+ /// 拆迁安置房套数
+ ///
+ public int? ResettlementHouseCount { get; set; }
+
+ ///
+ /// 其它套数
+ ///
+ public int? OtherCount { get; set; }
+
+ #endregion
+ #region 管理情况manager
+ #endregion
+
+ #region 鉴定治理identification
+
+ ///
+ /// 房屋等级 1,2,3,4,C,d
+ ///
+ public int? HouseGrade { get; set; }
+
+ ///
+ /// 房屋使用状态
+ ///
+ public int? HouseUsedStatus { get; set; }
+ #endregion
+
+ #region 图纸资料存档处drawing
+
+ ///
+ /// 图纸资料存档处
+ ///
+ public string DrawingMaterial { get; set; }
+
+ ///
+ /// 其他图纸存档
+ ///
+ public string DrawingMaterialText { get; set; }
+ #endregion
+
+ #region 相关附件资料attachments
+ ///
+ /// 立项文件
+ ///
+ public string AnEntryDocument { get; set; }
+
+ ///
+ /// 规划许可
+ ///
+ public string PlanningPermission { get; set; }
+
+ ///
+ /// 竣工验收备案
+ ///
+ public string CompletionRecord { get; set; }
+
+ ///
+ /// 监理资料
+ ///
+ public string MonitorDocument { get; set; }
+
+ ///
+ /// 鉴定报告
+ ///
+ public string IdentificationReport { get; set; }
+
+ ///
+ /// 其它资料
+ ///
+ public string OtherDocument { get; set; }
+ #endregion
+
+ #region 建筑概貌aspect
+ ///
+ /// 外立面照片
+ ///
+ public string FacadePhoto { get; set; }
+ #endregion
+
+ #region 调查单位unit
+ ///
+ /// 调查登记机构
+ ///
+ public string InvestigateAgency { get; set; }
+
+ ///
+ /// 纸质资料调查人
+ ///
+ public string InvestigateUser { get; set; }
+
+ ///
+ /// 纸质资料审核人
+ ///
+ public string OfflineAuditor { get; set; }
+
+ ///
+ /// 主管部门
+ ///
+ 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; }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoOutput.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoOutput.cs
new file mode 100644
index 0000000..104f44d
--- /dev/null
+++ b/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; }
+ ///
+ /// 总建筑面积
+ ///
+ public float? TotalArea { get; set; }
+ ///
+ /// 总户数(户)
+ ///
+ public int? HouseHolds { get; set; }
+
+ ///
+ /// 房屋单元数
+ ///
+ public int? Units { get; set; }
+
+ ///
+ /// 各单元每层户数(户)
+ ///
+ public int? UnitFloorHolds { get; set; }
+
+ ///
+ /// 总层数
+ ///
+ public int? TotalFloor { get; set; }
+
+ ///
+ /// 地上层数
+ ///
+ public int? LandFloorCount { get; set; }
+
+ ///
+ /// 地上商业层数开始
+ ///
+ public int? LandBsFloorStart { get; set; }
+
+ ///
+ /// 地上商业层数结束
+ ///
+ public int? LandBsFloorEnd { get; set; }
+
+ ///
+ /// 地上车棚层开始
+ ///
+ public int? LandBikeFloorStart { get; set; }
+
+ ///
+ /// 地上住宅层开始
+ ///
+ public int? LandResidenceFloorStart { get; set; }
+
+ ///
+ /// 地上住宅层结束
+ ///
+ public int? LandResidenceFloorEnd { get; set; }
+
+ ///
+ /// 地下层数
+ ///
+ public int? UnderFloorCount { get; set; }
+ #endregion
+ #region 权属情况ownership
+ ///
+ /// 产权性质
+ ///
+ public string PropertyRights { get; set; }
+
+ ///
+ /// 总共套数
+ ///
+ public int? HouseCount { get; set; }
+ ///
+ /// 直管公房套数
+ ///
+ public int? StraightHouseCount { get; set; }
+
+ ///
+ /// 自管公房套数
+ ///
+ public int? SelfHouseCount { get; set; }
+
+ ///
+ /// 私房套数
+ ///
+ public int? PrivateHouseCount { get; set; }
+
+ ///
+ /// 商品房套数
+ ///
+ public int? BusinessCount { get; set; }
+
+ ///
+ /// 房改房套数
+ ///
+ public int? ChangeHouseCount { get; set; }
+
+ ///
+ /// 拆迁安置房套数
+ ///
+ public int? ResettlementHouseCount { get; set; }
+
+ ///
+ /// 其它套数
+ ///
+ public int? OtherCount { get; set; }
+
+ #endregion
+ #region 管理情况manager
+ #endregion
+
+ #region 鉴定治理identification
+
+ ///
+ /// 房屋等级 1,2,3,4,C,d
+ ///
+ public int? HouseGrade { get; set; }
+
+ ///
+ /// 房屋使用状态
+ ///
+ public int? HouseUsedStatus { get; set; }
+ #endregion
+
+ #region 图纸资料存档处drawing
+
+ ///
+ /// 图纸资料存档处
+ ///
+ public string DrawingMaterial { get; set; }
+
+ ///
+ /// 其他图纸存档
+ ///
+ public string DrawingMaterialText { get; set; }
+ #endregion
+
+ #region 相关附件资料attachments
+ ///
+ /// 立项文件
+ ///
+ public string AnEntryDocument { get; set; }
+
+ ///
+ /// 规划许可
+ ///
+ public string PlanningPermission { get; set; }
+
+ ///
+ /// 竣工验收备案
+ ///
+ public string CompletionRecord { get; set; }
+
+ ///
+ /// 监理资料
+ ///
+ public string MonitorDocument { get; set; }
+
+ ///
+ /// 鉴定报告
+ ///
+ public string IdentificationReport { get; set; }
+
+ ///
+ /// 其它资料
+ ///
+ public string OtherDocument { get; set; }
+ #endregion
+
+ #region 建筑概貌aspect
+ ///
+ /// 外立面照片
+ ///
+ public string FacadePhoto { get; set; }
+ #endregion
+ public int State { get; set; }
+ #region 调查单位unit
+ ///
+ /// 调查登记机构
+ ///
+ public string InvestigateAgency { get; set; }
+
+ ///
+ /// 纸质资料调查人
+ ///
+ public string InvestigateUser { get; set; }
+
+ ///
+ /// 纸质资料审核人
+ ///
+ public string OfflineAuditor { get; set; }
+
+ ///
+ /// 主管部门
+ ///
+ 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; }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs
new file mode 100644
index 0000000..a5b2d5e
--- /dev/null
+++ b/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
+{
+ ///
+ /// 房屋详细信息
+ ///
+ [ApiDescriptionSettings(Name = "HouseInfo", Order = 200)]
+ public class HouseInfoService : IHouseInfoService, IDynamicApiController, ITransient
+ {
+
+ private readonly IRepository _houseCodeRep;
+ private readonly IRepository _houseInfoRep;
+ private readonly IRepository _houseTaskRep;
+ private readonly IRepository _sysUserRep;
+ private readonly IUserManager _userManager;
+ private readonly IDapperRepository _dapperRepository;
+
+ private readonly IHouseLogService _houseLogService;
+
+
+ public HouseInfoService(
+ IRepository HouseCodeRep,
+ IRepository HouseInfoRep,
+ IRepository HouseTaskRep,
+ IRepository 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 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(
+ @"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();
+ 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();
+ houseInfoOutputForDetailPage.HouseInfo = houseInfoOutput;
+
+ return houseInfoOutputForDetailPage;
+ }
+
+ [NonAction]
+ [UnitOfWork]
+ public async Task InputDataProcess(HouseInfoInputSave input,DataStatus dataStatus = DataStatus.Init)
+ {
+ //房屋编码地址/坐标单独更新
+ var houseCode = input.houseCode.Adapt();
+ 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();
+ _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();
+ 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();
+ var _sysUserRoleRep = Db.GetRepository();
+ var _sysRoleRep = Db.GetRepository();
+ 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();
+ 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);
+ }
+ }
+ }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseInfo/IHouseInfoService.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseInfo/IHouseInfoService.cs
new file mode 100644
index 0000000..14dda5f
--- /dev/null
+++ b/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 GetByTaskId(string taskId);
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseLog/Dto/HouseLogInput.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseLog/Dto/HouseLogInput.cs
new file mode 100644
index 0000000..356d221
--- /dev/null
+++ b/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; }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseLog/Dto/HouseLogOutput.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseLog/Dto/HouseLogOutput.cs
new file mode 100644
index 0000000..fdd2831
--- /dev/null
+++ b/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; }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseLog/HouseLogService.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseLog/HouseLogService.cs
new file mode 100644
index 0000000..85cf06f
--- /dev/null
+++ b/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
+{
+ ///
+ /// 房屋流转日志
+ ///
+ [ApiDescriptionSettings(Name = "HouseLog", Order = 210)]
+ public class HouseLogService : IHouseLogService, IDynamicApiController, ITransient
+ {
+ private readonly IDapperRepository _dapperRep;
+
+ private readonly IUserManager _userManager;
+
+ private readonly IRepository _bsHouseLogRep;
+
+ public HouseLogService(IDapperRepository dapperRep, IUserManager userManager, IRepository bsHouseLogRep)
+ {
+ _dapperRep = dapperRep;
+ _userManager = userManager;
+ _bsHouseLogRep = bsHouseLogRep;
+ }
+
+ [NonAction]
+ [UnitOfWork]
+ public async Task Add(string houseCodeId, SysUser targetUser, HouseLogType type, string remark = null, int? sort = null)
+ {
+ return await Add(houseCodeId, new List { targetUser }, type, remark, sort);
+ }
+
+ [NonAction]
+ [UnitOfWork]
+ public async Task Add(string houseCodeId, List 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 AddThenRead(string houseCodeId, SysUser targetUser, HouseLogType type, string remark = null, int? sort = null)
+ {
+ return await AddThenRead(houseCodeId, new List { targetUser }, type, remark, sort);
+ }
+
+ [NonAction]
+ [UnitOfWork]
+ public async Task AddThenRead(string houseCodeId, List 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 AddThenDone(string houseCodeId, SysUser targetUser, HouseLogType type, string remark = null, int? sort = null)
+ {
+ return await AddThenDone(houseCodeId, new List { targetUser }, type, remark, sort);
+ }
+
+ [NonAction]
+ [UnitOfWork]
+ public async Task AddThenDone(string houseCodeId, List 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 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(sql, new { houseCodeId = input.Id });
+ }
+
+ [HttpGet("/houseLog/listByInfoId")]
+ public async Task ListByInfoId([FromQuery] HouseLogInput input)
+ {
+ var info = await Db.GetRepository().DetachedEntities.FirstOrDefaultAsync(p => p.Id.Equals(input.Id));
+ return await List(new HouseLogInput
+ {
+ Id = info.HouseCodeId
+ });
+ }
+
+ [HttpGet("/houseLog/listByTaskId")]
+ public async Task ListByTaskId([FromQuery] HouseLogInput input)
+ {
+ var task = await Db.GetRepository().DetachedEntities.FirstOrDefaultAsync(p => p.Id.Equals(input.Id));
+ return await List(new HouseLogInput
+ {
+ Id = task.HouseCodeId
+ });
+ }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseLog/IHouseLogService.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseLog/IHouseLogService.cs
new file mode 100644
index 0000000..056db2b
--- /dev/null
+++ b/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 Add(string houseCodeId, SysUser targetUser, HouseLogType type, string remark = null, int? sort = null);
+ Task Add(string houseCodeId, List targetUsers, HouseLogType type, string remark = null, int? sort = null);
+ Task Read(string houseCodeId);
+ Task Done(string houseCodeId);
+ Task AddThenRead(string houseCodeId, SysUser targetUser, HouseLogType type, string remark = null, int? sort = null);
+ Task AddThenRead(string houseCodeId, List targetUsers, HouseLogType type, string remark = null, int? sort = null);
+ Task AddThenDone(string houseCodeId, SysUser targetUser, HouseLogType type, string remark = null, int? sort = null);
+ Task AddThenDone(string houseCodeId, List targetUsers, HouseLogType type, string remark = null, int? sort = null);
+ Task List(HouseLogInput input);
+ Task ListByInfoId(HouseLogInput input);
+ Task ListByTaskId(HouseLogInput input);
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseMember/Dto/HouseMemberInput.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseMember/Dto/HouseMemberInput.cs
new file mode 100644
index 0000000..e3634ea
--- /dev/null
+++ b/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; }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseMember/Dto/HouseMemberOutput.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseMember/Dto/HouseMemberOutput.cs
new file mode 100644
index 0000000..73d2395
--- /dev/null
+++ b/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
+ {
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseMember/HouseMemberService.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseMember/HouseMemberService.cs
new file mode 100644
index 0000000..a77a0b5
--- /dev/null
+++ b/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 _sysUserRep; // 用户表仓储
+ private readonly IUserManager _userManager;
+ private readonly ISysUserService _sysUserService;
+ private readonly ISysEmpService _sysEmpService;
+
+ public HouseMemberService(
+ IDapperRepository dapperRepository,
+ IRepository sysUserRep,
+ IUserManager userManager,
+ ISysUserService sysUserService,
+ ISysEmpService sysEmpService
+ )
+ {
+ _dapperRepository = dapperRepository;
+ _sysUserRep = sysUserRep;
+ _userManager = userManager;
+ _sysUserService = sysUserService;
+ _sysEmpService = sysEmpService;
+ }
+
+ ///
+ /// 分页查询用户
+ ///
+ ///
+ ///
+ [HttpPost("/houseMember/page")]
+ public async Task 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(sql, input, param);
+
+ //foreach (var user in users.Items)
+ //{
+ // user.SysEmpInfo = await _sysEmpService.GetEmpInfo(user.Id);
+ //}
+ return PageDataResult.PageResult(users);
+ }
+
+ ///
+ /// 增加用户
+ ///
+ ///
+ ///
+ [HttpPost("/houseMember/add")]
+ [UnitOfWork]
+ public async Task AddUser(AddHouseMemberInput input)
+ {
+ var id = await _sysUserService.AddUser(input);
+ var grantRoleInput = input.Adapt();
+ grantRoleInput.Id = id;
+
+ // 添加角色
+ grantRoleInput.GrantRoleIdList.Add(input.RoleId);
+ await _sysUserService.GrantUserRole(grantRoleInput);
+ }
+
+ ///
+ /// 获取角色
+ ///
+ ///
+ ///
+ [HttpGet("/houseMember/defaultRole")]
+ public async Task DefaultRole([FromQuery] string orgId)
+ {
+ return (await GetDefaultRole(orgId)).Adapt();
+ }
+
+ ///
+ /// 获取用户拥有角色
+ ///
+ ///
+ ///
+ [HttpGet("/houseMember/ownRole")]
+ public async Task GetUserOwnRole([FromQuery] QueryUserInput input)
+ {
+ return await _sysUserService.GetUserOwnRole(input);
+ }
+
+ [HttpGet("/houseMember/defaultRoleRange")]
+ public async Task DefaultRoleRange()
+ {
+ return (await GetRoleRange()).Select(p => p.Adapt()).ToList();
+ }
+
+ ///
+ /// 删除用户
+ ///
+ ///
+ ///
+ [HttpPost("/houseMember/delete")]
+ [UnitOfWork]
+ public async Task DeleteUser(DeleteUserInput input)
+ {
+ /*
+ * 未处理逻辑
+ * 片区监管员在本片区已有安全员的情况下无法删除
+ */
+
+ await _sysUserService.DeleteUser(input);
+ }
+
+ ///
+ /// 更新用户
+ ///
+ ///
+ ///
+ [HttpPost("/houseMember/edit")]
+ [UnitOfWork]
+ public async Task UpdateUser(UpdateUserInput input)
+ {
+ /*
+ * 未处理逻辑
+ * 如果移动组织架构,会产生以下几种逻辑
+ * 片区1监管员(无安全员或有其他监管员)=>片区2,直接成功
+ * 片区1监管员(有安全员并且无其他监管员)=>片区2,无法移动
+ * 片区1安全员=>片区2(有监管员),直接成功
+ * 片区1安全员=>片区2(无监管员),无法移动,需要创建监管员
+ */
+
+ await _sysUserService.UpdateUser(input);
+ }
+
+ ///
+ /// 查看用户
+ ///
+ ///
+ ///
+ [HttpGet("/houseMember/detail")]
+ public async Task 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(sql, new { input.Id })).SingleOrDefault();
+ if (user != null)
+ {
+ user.SysEmpInfo = await _sysEmpService.GetEmpInfo(user.Id);
+ }
+ return user;
+ }
+
+ ///
+ /// 修改用户状态
+ ///
+ ///
+ ///
+ [HttpPost("/houseMember/changeStatus")]
+ public async Task ChangeUserStatus(UpdateUserInput input)
+ {
+ await _sysUserService.ChangeUserStatus(input);
+ }
+
+ ///
+ /// 授权用户数据范围
+ ///
+ ///
+ ///
+ [HttpPost("/houseMember/grantData")]
+ public async Task GrantUserData(UpdateUserInput input)
+ {
+ await _sysUserService.GrantUserData(input);
+ }
+
+ ///
+ /// 获取用户拥有数据
+ ///
+ ///
+ ///
+ [HttpGet("/houseMember/ownData")]
+ public async Task GetUserOwnData([FromQuery] QueryUserInput input)
+ {
+ return await _sysUserService.GetUserOwnData(input);
+ }
+
+ ///
+ /// 获取当前机构中所创建的默认角色
+ /// 片区中的第一个帐号必定为片区监管员
+ ///
+ ///
+ ///
+ [NonAction]
+ private async Task GetDefaultRole(string orgId)
+ {
+ var roles = await GetRoleRange();
+ if (roles.Count < 2) throw Oops.Oh("未配置正确的角色");
+
+ var _sysOrgRep = Db.GetRepository();
+ var org = await _sysOrgRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id == orgId);
+ // 如果当前组织为街道, 则直接返回安全员
+ if (org == null || org.Type <= (int)OrgType.乡镇街道办事处)
+ {
+ return roles.LastOrDefault();
+ }
+
+ var _sysEmpRep = Db.GetRepository();
+ var _sysUserRoleRep = Db.GetRepository();
+ 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();
+ 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();
+ }
+
+ ///
+ /// 获取可创建的角色列表
+ ///
+ ///
+ [NonAction]
+ private async Task> GetRoleRange()
+ {
+ var codes = (new[] {
+ Enum.GetName(HouseManagerRole.ZoneManager),
+ Enum.GetName(HouseManagerRole.HouseSecurityManager),
+ }).Select(p => p.ToUnderScoreCase());
+
+ var _sysRoleRep = Db.GetRepository();
+ var roles = await _sysRoleRep.DetachedEntities.Where(p => codes.Contains(p.Code)).ToListAsync();
+
+ return roles;
+ }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseMember/IHouseMemberService.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseMember/IHouseMemberService.cs
new file mode 100644
index 0000000..76ea0f5
--- /dev/null
+++ b/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 QueryMemberPageList([FromBody] UserInput input);
+ Task AddUser(AddHouseMemberInput input);
+ Task DefaultRole([FromQuery] string orgId);
+ Task DeleteUser(DeleteUserInput input);
+ Task UpdateUser(UpdateUserInput input);
+ Task GetUser([FromQuery] QueryUserInput input);
+ Task ChangeUserStatus(UpdateUserInput input);
+ Task GetUserOwnRole([FromQuery] QueryUserInput input);
+ Task GrantUserData(UpdateUserInput input);
+ Task GetUserOwnData([FromQuery] QueryUserInput input);
+ Task DefaultRoleRange();
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseProjectInfo/Dto/HouseProjectInfoInput.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseProjectInfo/Dto/HouseProjectInfoInput.cs
new file mode 100644
index 0000000..b2e4e17
--- /dev/null
+++ b/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; }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseProjectInfo/Dto/HouseProjectOutput.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseProjectInfo/Dto/HouseProjectOutput.cs
new file mode 100644
index 0000000..307b548
--- /dev/null
+++ b/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; }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseProjectInfo/HouseProjectInfoService.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseProjectInfo/HouseProjectInfoService.cs
new file mode 100644
index 0000000..d0f8112
--- /dev/null
+++ b/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
+{
+ ///
+ /// 项目管理相关服务
+ ///
+ [ApiDescriptionSettings(Name = "HouseProjectInfo", Order = 170)]
+ public class HouseProjectInfoService : IHouseProjectInfoService, ITransient, IDynamicApiController
+ {
+ private readonly IRepository _houseProjectInfoRep;
+
+ public HouseProjectInfoService(IRepository houseProjectInfoRep)
+ {
+ _houseProjectInfoRep = houseProjectInfoRep;
+ }
+
+ ///
+ /// 添加项目
+ ///
+ ///
+ ///
+ [HttpPost("/houseProjectInfo/add")]
+ public async Task AddProject(AddProjectInput input)
+ {
+ await _houseProjectInfoRep.InsertNowAsync(input.Adapt());
+ }
+
+ ///
+ /// 删除项目
+ ///
+ ///
+ ///
+ [HttpPost("/houseProjectInfo/delete")]
+ public async Task DeleteProject(DeleteProjectInput input)
+ {
+ var project = _houseProjectInfoRep.FirstOrDefault(p => p.Id == input.Id);
+ await project.DeleteNowAsync();
+ }
+
+ ///
+ /// 编辑项目
+ ///
+ ///
+ ///
+ [HttpPost("/houseProjectInfo/edit")]
+ public async Task UpdateProject(UpdateProjectInput input)
+ {
+ var project = input.Adapt();
+ await project.UpdateExcludeAsync(new[] { nameof(BsHouseProjectInfo.AreaCode) }, true);
+ }
+
+ ///
+ /// 通过ID获取项目
+ ///
+ ///
+ ///
+ [HttpGet("/houseProjectInfo/getById")]
+ public async Task GetById([Required] string projectId)
+ {
+ return await _houseProjectInfoRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id == projectId);
+ }
+
+ ///
+ /// 分页查询
+ ///
+ ///
+ ///
+ [HttpPost("/houseProjectInfo/page")]
+ public async Task QueryProjectPageList([FromBody] PageProjectInput input)
+ {
+ var areaCodeRep = Db.GetRepository();
+ 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()).ToPagedListAsync(input.PageIndex, input.PageSize);
+ return PageDataResult.PageResult(projects);
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ [HttpGet("/houseProjectInfo/detail")]
+ public async Task GetProject([FromQuery] QueryProjectInput input)
+ {
+ var user = await _houseProjectInfoRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id == input.Id);
+ var userDto = user.Adapt();
+
+ return userDto;
+ }
+
+ [HttpGet("/houseProjectInfo/nextSort")]
+ public async Task 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;
+ }
+
+ ///
+ /// 获取项目下拉列表
+ ///
+ ///
+ ///
+ [HttpGet("houseProjectInfo/list")]
+ public async Task GetProjectList([FromQuery] ListHouseProjectInfoInput input)
+ {
+ return await _houseProjectInfoRep.DetachedEntities
+ .Where(p => p.AreaCode == input.AreaCode && p.Type == input.Type)
+ .OrderBy(p => p.Sort)
+ .ToListAsync();
+ }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseProjectInfo/IHouseProjectInfoService.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseProjectInfo/IHouseProjectInfoService.cs
new file mode 100644
index 0000000..e8b05c6
--- /dev/null
+++ b/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 GetById([FromRoute] string projectId);
+ Task GetProject([FromQuery] QueryProjectInput input);
+ Task QueryProjectPageList([FromQuery] PageProjectInput input);
+
+ Task GetNextProjectSortByAreaCode([FromQuery] ListHouseProjectInfoInput input);
+ Task GetProjectList([FromQuery] ListHouseProjectInfoInput input);
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseQuery/Dto/HouseQueryInput.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseQuery/Dto/HouseQueryInput.cs
new file mode 100644
index 0000000..096f601
--- /dev/null
+++ b/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; }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseQuery/Dto/HouseQueryOutput.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseQuery/Dto/HouseQueryOutput.cs
new file mode 100644
index 0000000..a4464e1
--- /dev/null
+++ b/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
+ {
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseQuery/HouseQueryService.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseQuery/HouseQueryService.cs
new file mode 100644
index 0000000..5800149
--- /dev/null
+++ b/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
+{
+ ///
+ /// 住宅查询
+ ///
+ [ApiDescriptionSettings(Name = "HouseQuery", Order = 210)]
+ public class HouseQueryService : IHouseQueryService, IDynamicApiController, ITransient
+ {
+ private readonly IRepository _houseCodeRep;
+ private readonly IRepository _houseInfoRep;
+ private readonly IRepository _houseTaskRep;
+ private readonly IDapperRepository _dapperRepository;
+
+ public HouseQueryService(IRepository HouseCodeRep, IRepository HouseInfoRep, IRepository HouseTaskRep, IDapperRepository dapperRepository)
+ {
+ _houseCodeRep = HouseCodeRep;
+ _houseInfoRep = HouseInfoRep;
+ _houseTaskRep = HouseTaskRep;
+ _dapperRepository = dapperRepository;
+ }
+
+ [HttpPost("/houseQuery/page")]
+ public async Task 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 Detail([FromQuery] HouseQueryDetailInput input)
+ {
+ var houseCodeOutputAsync = await _dapperRepository.QueryAsync(
+ @"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();
+ houseInfoOutputForDetailPage.HouseInfo = houseInfoOutput;
+
+ return houseInfoOutputForDetailPage;
+ }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseQuery/IHouseQueryService.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseQuery/IHouseQueryService.cs
new file mode 100644
index 0000000..aa1e217
--- /dev/null
+++ b/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
+ {
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseSelector/Dto/HouseSelectorInput.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseSelector/Dto/HouseSelectorInput.cs
new file mode 100644
index 0000000..0001eff
--- /dev/null
+++ b/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; }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseSelector/Dto/HouseSelectorOutput.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseSelector/Dto/HouseSelectorOutput.cs
new file mode 100644
index 0000000..43fd2e9
--- /dev/null
+++ b/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
+ {
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseSelector/HouseSelectorService.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseSelector/HouseSelectorService.cs
new file mode 100644
index 0000000..df04bd2
--- /dev/null
+++ b/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
+{
+ ///
+ /// 选房相关
+ ///
+ [ApiDescriptionSettings(Name = "HouseSelector", Order = 180)]
+ public class HouseSelectorService : IHouseSelectorService, IDynamicApiController, ITransient
+ {
+ private readonly IUserManager _userManager;
+ private readonly IDapperRepository _dapperRep;
+
+ private readonly IRepository _bsHouseMemberRelationRep;
+ private readonly IRepository _bsHouseCodeRep;
+ private readonly IRepository _bsHouseTaskRep;
+ private readonly IRepository _sysUserRep;
+ private readonly IHouseZoneService _houseZoneService;
+
+ private readonly IHouseLogService _houseLogService;
+
+ public HouseSelectorService(
+ IUserManager userManager,
+ IDapperRepository dapperRep,
+ IRepository bsHouseMemberRelationRep,
+ IRepository bsHouseCodeRep,
+ IRepository bsHouseTaskRep,
+ IRepository sysUserRep,
+ IHouseZoneService houseZoneService,
+ IHouseLogService houseLogService
+ )
+ {
+ _userManager = userManager;
+
+ _dapperRep = dapperRep;
+ _bsHouseMemberRelationRep = bsHouseMemberRelationRep;
+ _bsHouseCodeRep = bsHouseCodeRep;
+ _bsHouseTaskRep = bsHouseTaskRep;
+ _sysUserRep = sysUserRep;
+ _houseZoneService = houseZoneService;
+
+ _houseLogService = houseLogService;
+ }
+
+ ///
+ /// 获取人员允许绑定的房屋编码列表
+ ///
+ ///
+ ///
+ [HttpPost("/houseSelector/selectorPage")]
+ public async Task 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)
+ });
+ }
+
+ ///
+ /// 获取人员已经绑定的房屋编码列表
+ ///
+ ///
+ ///
+ [HttpPost("/houseSelector/selectedPage")]
+ public async Task 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)
+ });
+ }
+
+ ///
+ /// 从人员选择房屋
+ ///
+ ///
+ ///
+ [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();
+ 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()
+ {
+
+ }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseSelector/IHouseSelectorService.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseSelector/IHouseSelectorService.cs
new file mode 100644
index 0000000..df71ac7
--- /dev/null
+++ b/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 HouseSelectorList([FromQuery] QueryHouseSelectorInput input);
+ Task HouseSelectedList([FromQuery] QueryHouseSelectorInput input);
+ Task Select([FromBody] HouseSelectInput input);
+ Task Revoke([FromBody] HouseSelectInput input);
+ Task SelectMember();
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseTask/Dto/HouseTaskInput.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseTask/Dto/HouseTaskInput.cs
new file mode 100644
index 0000000..53bdf4b
--- /dev/null
+++ b/framework/Api/Ewide.Application/Service/HouseSafety/HouseTask/Dto/HouseTaskInput.cs
@@ -0,0 +1,171 @@
+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 HouseTaskInput
+ {
+ [Required(ErrorMessage = "巡查日期不能为空")]
+ public DateTime PatrolDate { get; set; }
+
+ [Required(ErrorMessage = "巡查人员/单位不能为空")]
+ public string PatrolUser { get; set; }
+
+ ///
+ /// 沉降倾斜
+ ///
+ public string SettlementTilt { get; set; }
+
+ ///
+ /// 沉降倾斜附件
+ ///
+ public string SettlementTiltFiles { get; set; }
+
+ ///
+ /// 其他情况
+ ///
+ public string OtherInfo { get; set; }
+
+ ///
+ /// 其他情况附件
+ ///
+ public string OtherInfoFiles { get; set; }
+
+ //[Required(ErrorMessage = "巡查初始等级不能为空")]
+ public int InitGrade { get; set; }
+ //[Required(ErrorMessage = "巡查损坏等级不能为空")]
+ public int DamageGrade { get; set; }
+ //[Required(ErrorMessage = "巡查综合等级不能为空")]
+ public int ComprehensiveGrade { get; set; }
+ #region 调查情况investigation
+ ///
+ /// 房屋场地
+ ///
+ public string HouseSite { get; set; }
+
+ ///
+ /// 相邻施工
+ ///
+ public string AdjacentConstruction { get; set; }
+
+ ///
+ /// 化学侵蚀
+ ///
+ public string ChemicalErosion { get; set; }
+
+ ///
+ /// 结构拆改
+ ///
+ public int? StructuralDismantling { get; set; }
+
+ ///
+ /// 加层改造
+ ///
+ public int? AddingLayer { get; set; }
+
+ ///
+ /// 修缮加固
+ ///
+ public string RepairAndReinforce { get; set; }
+
+ ///
+ /// 历史灾害
+ ///
+ public string HistoricalCalamity { get; set; }
+
+ ///
+ /// 使用功能变更
+ ///
+ public string FunctionalChange { get; set; }
+
+ ///
+ /// 其他调查内容
+ ///
+ public string OtherContents { get; set; }
+ #endregion
+ ///
+ /// 主要安全隐患综述
+ ///
+ public string MainSafety { get; set; }
+
+ ///
+ /// 处理意见
+ ///
+ public int? HandlingOpinion { get; set; }
+
+ ///
+ /// 处理意见备注
+ ///
+ public string HandlingOpinionRemark { get; set; }
+
+ ///
+ /// 整改情况
+ ///
+ public int? RectifyAndReform { get; set; }
+
+ ///
+ /// 整改情况备注
+ ///
+ public string RectifyAndReformRemark { get; set; }
+
+ ///
+ /// 巡查结果:1正常,-1异常
+ ///
+ //[Required(ErrorMessage = "巡查结果不能为空")]
+ public int PatrolResult { get; set; }
+
+ public string PatrolResultRemark { get; set; }
+
+ ///
+ /// 上报街道
+ ///
+ public int? ReportRoad { get; set; }
+
+ ///
+ /// 上报街道时间
+ ///
+ public DateTime? ReportRoadTime { get; set; }
+
+ ///
+ /// 上报区住建
+ ///
+ public int? ReportArea { get; set; }
+
+ ///
+ /// 上报区住建时间
+ ///
+ public DateTime? ReportAreaTime { get; set; }
+
+ ///
+ /// 上报备注
+ ///
+ public string ReportRemark { get; set; }
+ }
+
+ public class AddHouseTaskInput : HouseTaskInput
+ {
+
+ }
+
+ public class EditHouseTaskInput : HouseTaskInput
+ {
+ [Required(ErrorMessage = "任务Id不能为空")]
+ public string Id { get; set; }
+ }
+
+ public class SubmitHouseTaskInput
+ {
+ [Required(ErrorMessage = "任务Id不能为空")]
+ public string TaskId { get; set; }
+ }
+
+ public class QueryHouseTaskInput : PageInputBase
+ {
+
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseTask/Dto/HouseTaskOutput.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseTask/Dto/HouseTaskOutput.cs
new file mode 100644
index 0000000..b5f1df0
--- /dev/null
+++ b/framework/Api/Ewide.Application/Service/HouseSafety/HouseTask/Dto/HouseTaskOutput.cs
@@ -0,0 +1,173 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application
+{
+ public class HouseTaskOutput
+ {
+ public DateTime? PatrolDate { get; set; }
+ public string PatrolUser { get; set; }
+
+ ///
+ /// 沉降倾斜
+ ///
+ public string SettlementTilt { get; set; }
+
+ ///
+ /// 沉降倾斜附件
+ ///
+ public string SettlementTiltFiles { get; set; }
+
+ ///
+ /// 其他情况
+ ///
+ public string OtherInfo { get; set; }
+
+ ///
+ /// 其他情况附件
+ ///
+ public string OtherInfoFiles { get; set; }
+
+ ///
+ /// 初始等级
+ ///
+ public int? InitGrade { get; set; }
+
+ ///
+ /// 损坏等级
+ ///
+ public int? DamageGrade { get; set; }
+
+ ///
+ /// 综合等级
+ ///
+ public int? ComprehensiveGrade { get; set; }
+
+ #region 调查情况investigation
+ ///
+ /// 房屋场地
+ ///
+ public string HouseSite { get; set; }
+
+ ///
+ /// 相邻施工
+ ///
+ public string AdjacentConstruction { get; set; }
+
+ ///
+ /// 化学侵蚀
+ ///
+ public string ChemicalErosion { get; set; }
+
+ ///
+ /// 结构拆改
+ ///
+ public int? StructuralDismantling { get; set; }
+
+ ///
+ /// 加层改造
+ ///
+ public int? AddingLayer { get; set; }
+
+ ///
+ /// 修缮加固
+ ///
+ public string RepairAndReinforce { get; set; }
+
+ ///
+ /// 历史灾害
+ ///
+ public string HistoricalCalamity { get; set; }
+
+ ///
+ /// 使用功能变更
+ ///
+ public string FunctionalChange { get; set; }
+
+ ///
+ /// 其他调查内容
+ ///
+ public string OtherContents { get; set; }
+ #endregion
+
+ ///
+ /// 主要安全隐患综述
+ ///
+ public string MainSafety { get; set; }
+
+ ///
+ /// 处理意见
+ ///
+ public int? HandlingOpinion { get; set; }
+
+ ///
+ /// 处理意见备注
+ ///
+ public string HandlingOpinionRemark { get; set; }
+
+ ///
+ /// 整改情况
+ ///
+ public int? RectifyAndReform { get; set; }
+
+ ///
+ /// 整改情况备注
+ ///
+ public string RectifyAndReformRemark { get; set; }
+
+ ///
+ /// 巡查结果:1正常,-1异常
+ ///
+ public int? PatrolResult { get; set; }
+
+ ///
+ /// 巡查异常描述
+ ///
+ public string PatrolResultRemark { get; set; }
+
+ ///
+ /// 上报街道
+ ///
+ public int? ReportRoad { get; set; }
+
+ ///
+ /// 上报街道时间
+ ///
+ public DateTime? ReportRoadTime { get; set; }
+
+ ///
+ /// 上报区住建
+ ///
+ public int? ReportArea { get; set; }
+
+ ///
+ /// 上报区住建时间
+ ///
+ public DateTime? ReportAreaTime { get; set; }
+
+ ///
+ /// 上报备注
+ ///
+ public string ReportRemark { get; set; }
+
+ public int Status { get; set; }
+
+ ///
+ /// 提交时间
+ ///
+ public DateTime? SubmitTime { get; set; }
+
+ ///
+ /// 最后提交时间
+ ///
+ public DateTime? LastSubmitTime { get; set; }
+
+ ///
+ /// 是否有效
+ ///
+ public bool IsEnabled { get; set; }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseTask/HouseTaskService.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseTask/HouseTaskService.cs
new file mode 100644
index 0000000..6337437
--- /dev/null
+++ b/framework/Api/Ewide.Application/Service/HouseSafety/HouseTask/HouseTaskService.cs
@@ -0,0 +1,102 @@
+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 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
+{
+ ///
+ /// 房屋任务(巡查任务/建档任务)
+ ///
+ [ApiDescriptionSettings(Name = "HouseTask", Order = 190)]
+ public class HouseTaskService : IHouseTaskService, IDynamicApiController, ITransient
+ {
+ private readonly IRepository _houseTaskRep;
+ private readonly IRepository _houseInfoRep;
+ private readonly IDapperRepository _dapperRepository;
+ private readonly IUserManager _userManager;
+
+ private readonly IHouseLogService _houseLogService;
+
+ public HouseTaskService(IRepository HouseTaskRep, IRepository HouseInfoRep, IDapperRepository dapperRepository, IUserManager userManager, IHouseLogService houseLogService)
+ {
+ _houseTaskRep = HouseTaskRep;
+ _houseInfoRep = HouseInfoRep;
+ _dapperRepository = dapperRepository;
+ _userManager = userManager;
+
+ _houseLogService = houseLogService;
+ }
+
+ [HttpPost("/houseTask/page")]
+ public async Task QueryPage([FromBody] QueryHouseTaskInput input)
+ {
+ var sql = @"SELECT T.Id,AA.Name AreaName,RA.Name RoadName,CA.Name CommName,Proj.AreaCode,Proj.Note,Proj.Name,CONCAT(Proj.`Name`, IFNULL(CONCAT('(',Proj.Note,')'), '')) FullProjName,HC.HouseCode,HC.Address,T.EndTime,HC.Type,HC.Industry,HC.No,T.Status,IFNULL(HI.State,0) State FROM `bs_house_task` T
+LEFT JOIN bs_house_code HC ON T.HouseCodeId = HC.Id
+LEFT JOIN bs_house_info HI ON HI.HouseCodeId = T.HouseCodeId
+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 T.IsEnabled = 1 {0}";
+ var user = await _userManager.CheckUserAsync();
+ if (user == null) throw Oops.Oh("登录信息丢失");
+
+ var userRoles = await _userManager.GetUserRoleList();
+ var userOrg = await _userManager.GetUserOrgInfo();
+ var param = new DynamicParameters();
+ if (userRoles.Where(r => r.Code == Enum.GetName(HouseManagerRole.HouseSecurityManager).ToUnderScoreCase()).Any())
+ {
+ sql = String.Format(sql, " AND T.UserID=@UserID ");
+ param.Add("UserID", user.Id);
+ }
+
+ if (userRoles.Where(r => r.Code == Enum.GetName(HouseManagerRole.ZoneManager).ToUnderScoreCase()).Any())
+ {
+ sql = String.Format(sql, " AND (T.Status=3 OR T.Status=6) AND HC.ZoneId = @ZoneId ");
+ param.Add("ZoneId", userOrg.Id);
+ }
+
+ return await _dapperRepository.QueryPageDataDynamic(sql, input, param, filterFields: new string[] { "Type", "Address", "HouseCode", "Status","State" });
+ }
+
+ [HttpPost("/houseTask/submit")]
+ [UnitOfWork]
+ [AllowAnonymous]
+ public async Task Submit([FromBody] SubmitHouseTaskInput input)
+ {
+ //获取任务实体
+ var houseTask = await _houseTaskRep.DetachedEntities.FirstOrDefaultAsync(t => t.Id == input.TaskId);
+ if (houseTask == null) throw Oops.Oh("任务不存在");
+ houseTask.Status = 2;
+ houseTask.LastSubmitTime = DateTime.Now;
+ if (!houseTask.SubmitTime.HasValue) houseTask.SubmitTime = houseTask.LastSubmitTime;
+ await houseTask.UpdateExcludeAsync(new string[] { nameof(BsHouseTask.TaskType) }, ignoreNullValues: true);
+
+ if(houseTask.TaskType == 0)
+ {
+ var houseInfo = await _houseInfoRep.DetachedEntities.FirstOrDefaultAsync(h => h.HouseCodeId == houseTask.HouseCodeId);
+ if (houseInfo == null) throw Oops.Oh("提交审核失败:请先保存后再提交");
+
+ houseInfo.State = 5;
+ await houseInfo.UpdateExcludeAsync(new[] { nameof(BsHouseInfo.HouseGrade) }, true);
+ }
+
+ // 提交时流转日志
+ await _houseLogService.Done(houseTask.HouseCodeId);
+ }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseTask/IHouseTaskService.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseTask/IHouseTaskService.cs
new file mode 100644
index 0000000..75b2d3d
--- /dev/null
+++ b/framework/Api/Ewide.Application/Service/HouseSafety/HouseTask/IHouseTaskService.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 IHouseTaskService
+ {
+ Task QueryPage(QueryHouseTaskInput input);
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseTaskCheckRecord/Dto/HouseTaskCheckRecordInput.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseTaskCheckRecord/Dto/HouseTaskCheckRecordInput.cs
new file mode 100644
index 0000000..497a3a7
--- /dev/null
+++ b/framework/Api/Ewide.Application/Service/HouseSafety/HouseTaskCheckRecord/Dto/HouseTaskCheckRecordInput.cs
@@ -0,0 +1,46 @@
+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 HouseTaskCheckRecordInput
+ {
+ ///
+ /// 任务Id
+ ///
+ [Required(ErrorMessage = "任务参数有误")]
+ public string TaskId { get; set; }
+
+ ///
+ /// 通过3;退回-1
+ ///
+ [Required(ErrorMessage = "审核结果不能为空")]
+ public int PassOrBack { get; set; }
+
+ public DataStatus PassOrBackDataStatus
+ {
+ get
+ {
+ return PassOrBack switch
+ {
+ -1 => DataStatus.Back,
+ 1 => DataStatus.TempSaved,
+ 2 => DataStatus.Saved,
+ 3 => DataStatus.Submited,
+ 6 => DataStatus.Passed,
+ _ => DataStatus.Init,
+ };
+ }
+ }
+
+ ///
+ /// 审核内容
+ ///
+ [Required(ErrorMessage = "审核内容不能为空")]
+ public string Content { get; set; }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseTaskCheckRecord/Dto/HouseTaskCheckRecordOutput.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseTaskCheckRecord/Dto/HouseTaskCheckRecordOutput.cs
new file mode 100644
index 0000000..bdfa2ab
--- /dev/null
+++ b/framework/Api/Ewide.Application/Service/HouseSafety/HouseTaskCheckRecord/Dto/HouseTaskCheckRecordOutput.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.HouseTaskCheckRecord.Dto
+{
+ public class HouseTaskCheckRecordOutput
+ {
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseZone/Dto/HouseZoneInput.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseZone/Dto/HouseZoneInput.cs
new file mode 100644
index 0000000..1d69b94
--- /dev/null
+++ b/framework/Api/Ewide.Application/Service/HouseSafety/HouseZone/Dto/HouseZoneInput.cs
@@ -0,0 +1,41 @@
+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
+{
+ public class HouseZoneInput
+ {
+ [Required(ErrorMessage = "区域编码不可为空")]
+ [MinLength(9, ErrorMessage = "区域编码长度必须为9位及以上")]
+ public string AreaCode { get; set; }
+ }
+
+ public class AddHouseZoneInput : OrgInput
+ {
+ ///
+ /// 所属街道
+ ///
+ [Required(ErrorMessage = "所属街道不能为空")]
+ public override string Pid { get; set; }
+ ///
+ /// 名称
+ ///
+ [Required(ErrorMessage = "片区名称不能为空")]
+ public override string Name { get; set; }
+
+ }
+
+ public class UpdateHouseZoneInput : AddHouseZoneInput
+ {
+ ///
+ /// 机构Id
+ ///
+ [Required(ErrorMessage = "片区Id不能为空")]
+ public string Id { get; set; }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseZone/Dto/HouseZoneOutput.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseZone/Dto/HouseZoneOutput.cs
new file mode 100644
index 0000000..d95ac21
--- /dev/null
+++ b/framework/Api/Ewide.Application/Service/HouseSafety/HouseZone/Dto/HouseZoneOutput.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application
+{
+ class HouseZoneOutput
+ {
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseZone/HouseZoneService.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseZone/HouseZoneService.cs
new file mode 100644
index 0000000..791374b
--- /dev/null
+++ b/framework/Api/Ewide.Application/Service/HouseSafety/HouseZone/HouseZoneService.cs
@@ -0,0 +1,175 @@
+using Ewide.Core;
+using Ewide.Core.Extension;
+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;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Ewide.Application.Service
+{
+ ///
+ /// 片区相关
+ ///
+ [ApiDescriptionSettings(Name = "HouseZone", Order = 180)]
+ public class HouseZoneService : IHouseZoneService, IDynamicApiController, ITransient
+ {
+ private readonly IUserManager _userManager;
+ private readonly IRepository _sysOrgRep;
+ private readonly IRepository _sysEmpRep;
+ private readonly ISysOrgService _sysOrgService;
+
+ public HouseZoneService(
+ IUserManager userManager,
+ IRepository sysOrgRep,
+ IRepository sysEmpRep,
+ ISysOrgService sysOrgService
+ )
+ {
+ _userManager = userManager;
+ _sysOrgRep = sysOrgRep;
+ _sysEmpRep = sysEmpRep;
+ _sysOrgService = sysOrgService;
+ }
+
+ ///
+ /// 获取片区列表
+ ///
+ ///
+ ///
+ [HttpGet("/houseZone/list")]
+ public async Task GetHouseZoneList([FromQuery] HouseZoneInput input)
+ {
+ var areaCode = input.AreaCode.Substring(0, 9);
+ var road = await _sysOrgRep.DetachedEntities.FirstOrDefaultAsync(p => p.AreaCode == areaCode);
+ if (road == null) throw Oops.Oh("未在组织机构中配置街道");
+ return await _sysOrgRep.DetachedEntities
+ .Where(p => p.Pid == road.Id)
+ .Where(p => p.Type == (int)OrgType.片区)
+ .OrderBy(p => p.Sort)
+ .Select(p => new
+ {
+ p.Id,
+ p.Name
+ })
+ .ToListAsync();
+ }
+
+ [HttpGet("/houseZone/getById")]
+ public async Task GetById([Required] string zoneId)
+ {
+ return await _sysOrgRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id == zoneId);
+ }
+
+ ///
+ /// 分页查询片区
+ ///
+ ///
+ ///
+ [HttpPost("/houseZone/page")]
+ public async Task QueryZonePageList([FromBody] PageOrgInput input)
+ {
+ var dataScopeList = _sysOrgService.GetDataScopeList(await _userManager.GetUserAllDataScopeList());
+
+ var name = !string.IsNullOrEmpty(input.Name?.Trim());
+ var id = !string.IsNullOrEmpty(input.Id?.Trim());
+ var pId = !string.IsNullOrEmpty(input.Pid?.Trim());
+ var orgs = await _sysOrgRep.DetachedEntities
+ .Where((name, u => EF.Functions.Like(u.Name, $"%{input.Name.Trim()}%")), // 根据机构名称模糊查询
+ (id, u => u.Id == input.Id.Trim()), // 根据机构id查询
+ (pId, u => EF.Functions.Like(u.Pids, $"%[{input.Pid.Trim()}]%")
+ || u.Id == input.Pid.Trim())) // 根据父机构id查询
+ .Where(dataScopeList.Count > 0, u => dataScopeList.Contains(u.Id)) // 非管理员范围限制
+ .Where(u => u.Status != CommonStatus.DELETED)
+ .Where(u => u.Type == (int)OrgType.片区)
+ .OrderBy(u => u.Sort)
+ .ToPageData(input);
+ return PageDataResult.PageResult(orgs);
+ }
+
+ ///
+ /// 根据用户Id获取所在片区的Id
+ ///
+ ///
+ ///
+ [HttpGet("/houseZone/getByUser")]
+ public async Task GetZoneByUser([FromQuery][Required(ErrorMessage = "用户Id不能为空")] string userId)
+ {
+ var data = await _sysEmpRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id == userId);
+ if(data == null) throw Oops.Oh("用户不在组织机构中");
+ var org = await _sysOrgRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id == data.OrgId && p.Type == (int)OrgType.片区);
+ if(org == null) throw Oops.Oh("用户不在片区中");
+ return org.Id;
+ }
+
+ [HttpGet("/houseZone/autoIncrement")]
+ public async Task AutoIncrement([FromQuery] string roadId)
+ {
+ var road = await _sysOrgRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id == roadId && p.Type == 3);
+ if (road == null) throw Oops.Oh("组织机构错误");
+ return await AutoIncrement(road);
+ }
+
+ [NonAction]
+ public async Task AutoIncrement(SysOrg road)
+ {
+ var maxZone = (await _sysOrgRep.DetachedEntities.Where(p => p.Pid == road.Id && p.Type == (int)OrgType.片区).MaxAsync(p => p.Code)) ?? "000";
+ return Convert.ToInt32(maxZone[^3..]) + 1;
+ }
+
+ [HttpPost("/houseZone/add")]
+ public async Task AddZone(AddHouseZoneInput input)
+ {
+ /*
+ * 区县市限定所属区域/上级机构是否为当前区
+ * 街道自动获取所属区域/上级机构
+ * 自动生成唯一编码, 街道Code+三位编号
+ *
+ * 机构类型默认为片区
+ */
+
+ var org = await _userManager.GetUserOrgInfo();
+
+ var areaManager = Enum.GetName(HouseManagerRole.AreaManager).ToUnderScoreCase();
+ var roadManager = Enum.GetName(HouseManagerRole.RoadManager).ToUnderScoreCase();
+ var roles = await _userManager.GetUserRoleList();
+ if (roles.Any(p => p.Code == areaManager))
+ {
+ var road = await _sysOrgRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id == input.Pid);
+ if (!road.Pids.Contains(org.Id)) throw Oops.Oh("当前用户组织机构错误");
+
+ input.AreaCode = road.AreaCode;
+ input.Code = road.Code + (await AutoIncrement(road)).ToString().PadLeft(3, '0');
+ }
+ else if (roles.Any(p => p.Code == roadManager))
+ {
+ input.AreaCode = org.AreaCode;
+
+ input.Code = org.Code + (await AutoIncrement(org)).ToString().PadLeft(3, '0');
+ }
+
+ input.Type = (int)OrgType.片区;
+
+ AddOrgInput addOrgInput = input.Adapt();
+ await _sysOrgService.AddOrg(addOrgInput);
+ }
+
+ [HttpPost("/houseZone/edit")]
+ public async Task EditZone(UpdateHouseZoneInput input)
+ {
+ var zone = await _sysOrgRep.DetachedEntities.FirstOrDefaultAsync(z => z.Id == input.Id);
+ if(zone == null) throw Oops.Oh("修改失败:数据有误,刷新列表后再尝试修改");
+ zone.Remark = input.Remark;
+ await zone.UpdateIncludeAsync(new[] { nameof(SysOrg.Remark) }, true);
+ }
+ }
+}
diff --git a/framework/Api/Ewide.Application/Service/HouseSafety/HouseZone/IHouseZoneService.cs b/framework/Api/Ewide.Application/Service/HouseSafety/HouseZone/IHouseZoneService.cs
new file mode 100644
index 0000000..9c0b138
--- /dev/null
+++ b/framework/Api/Ewide.Application/Service/HouseSafety/HouseZone/IHouseZoneService.cs
@@ -0,0 +1,15 @@
+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 IHouseZoneService
+ {
+ Task GetHouseZoneList([FromQuery] HouseZoneInput input);
+ Task GetZoneByUser([FromQuery] string userId);
+ }
+}
diff --git a/framework/Api/Ewide.Application/Startup.cs b/framework/Api/Ewide.Application/Startup.cs
new file mode 100644
index 0000000..ade1ce8
--- /dev/null
+++ b/framework/Api/Ewide.Application/Startup.cs
@@ -0,0 +1,30 @@
+using Furion;
+using Microsoft.Extensions.DependencyInjection;
+using System.Linq;
+
+namespace Ewide.Application
+{
+ public class Startup : AppStartup
+ {
+ public void ConfigureServices(IServiceCollection services)
+ {
+ //services.AddSqlSugar(new ConnectionConfig
+ //{
+ // ConnectionString = App.Configuration["ConnectionStrings:DefaultConnection"],
+ // DbType = DbType.Sqlite,
+ // IsAutoCloseConnection = true,
+ // InitKeyType = InitKeyType.Attribute
+ //},
+ //db =>
+ //{
+ // // db.DbMaintenance.CreateDatabase();
+ // // db.CodeFirst.SetStringDefaultLength(200).InitTables(typeof(Test));
+
+ // db.Aop.OnLogExecuting = (sql, pars) =>
+ // {
+ // App.PrintToMiniProfiler("SqlSugar", "Info", sql + "\r\n" + string.Join(",", pars?.Select(it => it.ParameterName + ":" + it.Value)));
+ // };
+ //});
+ }
+ }
+}
diff --git a/framework/Api/Ewide.Application/applicationsettings.json b/framework/Api/Ewide.Application/applicationsettings.json
new file mode 100644
index 0000000..29091fa
--- /dev/null
+++ b/framework/Api/Ewide.Application/applicationsettings.json
@@ -0,0 +1,3 @@
+{
+
+}
\ No newline at end of file
diff --git a/framework/Api/Ewide.Core/Attributes/OpAttribute.cs b/framework/Api/Ewide.Core/Attributes/OpAttribute.cs
new file mode 100644
index 0000000..897608b
--- /dev/null
+++ b/framework/Api/Ewide.Core/Attributes/OpAttribute.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Core.Attributes
+{
+ public class OpAttribute : Attribute
+ {
+ private readonly LogOpType logOpType;
+ public OpAttribute(LogOpType logOpType)
+ {
+ this.logOpType = logOpType;
+ }
+ public int OpType { get => (int)logOpType; }
+ }
+}
diff --git a/framework/Api/Ewide.Core/Cache/CacheOptions.cs b/framework/Api/Ewide.Core/Cache/CacheOptions.cs
new file mode 100644
index 0000000..76d8f05
--- /dev/null
+++ b/framework/Api/Ewide.Core/Cache/CacheOptions.cs
@@ -0,0 +1,33 @@
+using Furion.ConfigurableOptions;
+
+namespace Ewide.Core
+{
+ ///
+ /// 缓存配置
+ ///
+ public class CacheOptions : IConfigurableOptions
+ {
+ ///
+ /// 缓存类型
+ ///
+ public CacheType CacheType { get; set; }
+
+ ///
+ /// Redis配置
+ ///
+ public string RedisConnectionString { get; set; }
+ }
+
+ public enum CacheType
+ {
+ ///
+ /// 内存缓存
+ ///
+ MemoryCache,
+
+ ///
+ /// Redis缓存
+ ///
+ RedisCache
+ }
+}
diff --git a/framework/Api/Ewide.Core/Cache/ICache.cs b/framework/Api/Ewide.Core/Cache/ICache.cs
new file mode 100644
index 0000000..2122c3e
--- /dev/null
+++ b/framework/Api/Ewide.Core/Cache/ICache.cs
@@ -0,0 +1,107 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Ewide.Core
+{
+ ///
+ /// 缓存接口
+ ///
+ public interface ICache
+ {
+ ///
+ /// 用于在 key 存在时删除 key
+ ///
+ /// 键
+ long Del(params string[] key);
+
+ ///
+ /// 用于在 key 存在时删除 key
+ ///
+ /// 键
+ ///
+ Task DelAsync(params string[] key);
+
+ ///
+ /// 用于在 key 模板存在时删除
+ ///
+ /// key模板
+ ///
+ Task DelByPatternAsync(string pattern);
+
+ ///
+ /// 检查给定 key 是否存在
+ ///
+ /// 键
+ ///
+ bool Exists(string key);
+
+ ///
+ /// 检查给定 key 是否存在
+ ///
+ /// 键
+ ///
+ Task ExistsAsync(string key);
+
+ ///
+ /// 获取指定 key 的值
+ ///
+ /// 键
+ ///
+ string Get(string key);
+
+ ///
+ /// 获取指定 key 的值
+ ///
+ /// byte[] 或其他类型
+ /// 键
+ ///
+ T Get(string key);
+
+ ///
+ /// 获取指定 key 的值
+ ///
+ /// 键
+ ///
+ Task GetAsync(string key);
+
+ ///
+ /// 获取指定 key 的值
+ ///
+ /// byte[] 或其他类型
+ /// 键
+ ///
+ Task GetAsync(string key);
+
+ ///
+ /// 设置指定 key 的值,所有写入参数object都支持string | byte[] | 数值 | 对象
+ ///
+ /// 键
+ /// 值
+ bool Set(string key, object value);
+
+ ///
+ /// 设置指定 key 的值,所有写入参数object都支持string | byte[] | 数值 | 对象
+ ///
+ /// 键
+ /// 值
+ /// 有效期
+ bool Set(string key, object value, TimeSpan expire);
+
+ ///
+ /// 设置指定 key 的值,所有写入参数object都支持string | byte[] | 数值 | 对象
+ ///
+ /// 键
+ /// 值
+ ///
+ Task SetAsync(string key, object value);
+
+ ///
+ /// 设置指定 key 的值,所有写入参数object都支持string | byte[] | 数值 | 对象
+ ///
+ /// 键
+ /// 值
+ /// 有效期
+ ///
+ Task SetAsync(string key, object value, TimeSpan expire);
+ }
+}
diff --git a/framework/Api/Ewide.Core/Cache/MemoryCache.cs b/framework/Api/Ewide.Core/Cache/MemoryCache.cs
new file mode 100644
index 0000000..5e9c623
--- /dev/null
+++ b/framework/Api/Ewide.Core/Cache/MemoryCache.cs
@@ -0,0 +1,125 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Furion.DependencyInjection;
+using Microsoft.Extensions.Caching.Memory;
+
+namespace Ewide.Core
+{
+ ///
+ /// 内存缓存
+ ///
+ public class MemoryCache : ICache, ISingleton
+ {
+ private readonly IMemoryCache _memoryCache;
+
+ public MemoryCache(IMemoryCache memoryCache)
+ {
+ _memoryCache = memoryCache;
+ }
+
+ public long Del(params string[] key)
+ {
+ foreach (var k in key)
+ {
+ _memoryCache.Remove(k);
+ }
+ return key.Length;
+ }
+
+ public Task DelAsync(params string[] key)
+ {
+ foreach (var k in key)
+ {
+ _memoryCache.Remove(k);
+ }
+
+ return Task.FromResult((long)key.Length);
+ }
+
+ public async Task DelByPatternAsync(string pattern)
+ {
+ if (string.IsNullOrEmpty(pattern))
+ return default;
+
+ //pattern = Regex.Replace(pattern, @"\{*.\}", "(.*)");
+ var keys = GetAllKeys().Where(k => k.StartsWith(pattern));
+ if (keys != null && keys.Any())
+ return await DelAsync(keys.ToArray());
+
+ return default;
+ }
+
+ public bool Exists(string key)
+ {
+ return _memoryCache.TryGetValue(key, out _);
+ }
+
+ public Task ExistsAsync(string key)
+ {
+ return Task.FromResult(_memoryCache.TryGetValue(key, out _));
+ }
+
+ public string Get(string key)
+ {
+ return _memoryCache.Get(key)?.ToString();
+ }
+
+ public T Get(string key)
+ {
+ return _memoryCache.Get(key);
+ }
+
+ public Task GetAsync(string key)
+ {
+ return Task.FromResult(Get(key));
+ }
+
+ public Task GetAsync(string key)
+ {
+ return Task.FromResult(Get(key));
+ }
+
+ public bool Set(string key, object value)
+ {
+ _memoryCache.Set(key, value);
+ return true;
+ }
+
+ public bool Set(string key, object value, TimeSpan expire)
+ {
+ _memoryCache.Set(key, value, expire);
+ return true;
+ }
+
+ public Task SetAsync(string key, object value)
+ {
+ Set(key, value);
+ return Task.FromResult(true);
+ }
+
+ public Task SetAsync(string key, object value, TimeSpan expire)
+ {
+ Set(key, value, expire);
+ return Task.FromResult(true);
+ }
+
+ private List GetAllKeys()
+ {
+ const BindingFlags flags = BindingFlags.Instance | BindingFlags.NonPublic;
+ var entries = _memoryCache.GetType().GetField("_entries", flags).GetValue(_memoryCache);
+ var cacheItems = entries.GetType().GetProperty("Keys").GetValue(entries) as ICollection