add 任务管理

Api/Ewide.Application/Entity/BsHouseInfo.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Ewide.Application.Entity
+namespace Ewide.Application
 {
 	[Table("bs_house_info")]
 	[Comment("房屋信息表")]

Api/Ewide.Application/Entity/BsHouseTask.cs

@@ -0,0 +1,200 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Ewide.Application
+{
+	[Table("bs_house_task")]
+	[Comment("房屋巡查任务表")]
+	public class BsHouseTask : Core.DEntityBase
+	{
+		/// <summary>
+		/// bs_house_code主键Id
+		/// </summary>
+		[Comment("bs_house_code主键Id")]
+		[MaxLength(36)]
+		[Required]
+		public string HouseCodeId { get; set; }
+
+		/// <summary>
+		/// 巡查日期
+		/// </summary>
+		[Comment("巡查日期")]
+		public DateTime? PatrolDate { get; set; }
+
+		/// <summary>
+		/// 巡查人姓名
+		/// </summary>
+		[Comment("巡查人姓名")]
+		[MaxLength(50)]
+		public string PatrolUser { get; set; }
+
+		/// <summary>
+		/// 沉降倾斜
+		/// </summary>
+		[Comment("沉降倾斜")]
+		[MaxLength(1000)]
+		public string SettlementTilt { get; set; }
+
+		/// <summary>
+		/// 沉降倾斜附件
+		/// </summary>
+		[Comment("沉降倾斜附件")]
+		[MaxLength(2000)]
+		public string SettlementTiltFiles { get; set; }
+
+		/// <summary>
+		/// 其他情况
+		/// </summary>
+		[Comment("其他情况")]
+		[MaxLength(1000)]
+		public string OtherInfo { get; set; }
+
+		/// <summary>
+		/// 其他情况附件
+		/// </summary>
+		[Comment("其他情况附件")]
+		[MaxLength(2000)]
+		public string OtherInfoFiles { get; set; }
+
+		/// <summary>
+		/// 初始等级
+		/// </summary>
+		[Comment("初始等级")]
+		public int? InitLevel { get; set; }
+
+		/// <summary>
+		/// 损坏等级
+		/// </summary>
+		[Comment("损坏等级")]
+		public int? DamageLevel { get; set; }
+
+		/// <summary>
+		/// 综合等级
+		/// </summary>
+		[Comment("综合等级")]
+		public int? ComprehensiveLevel { get; set; }
+
+		/// <summary>
+		/// 主要安全隐患综述
+		/// </summary>
+		[Comment("主要安全隐患综述")]
+		[MaxLength(1000)]
+		public string MainSafety { get; set; }
+
+		/// <summary>
+		/// 处理意见
+		/// </summary>
+		[Comment("处理意见")]
+		public int? HandlingOpinion { get; set; }
+
+		/// <summary>
+		/// 处理意见备注
+		/// </summary>
+		[Comment("处理意见备注")]
+		[MaxLength(1000)]
+		public string HandlingOpinionRemark { get; set; }
+
+		/// <summary>
+		/// 整改情况
+		/// </summary>
+		[Comment("整改情况")]
+		public int? RectifyAndReform { get; set; }
+
+		/// <summary>
+		/// 整改情况备注
+		/// </summary>
+		[Comment("整改情况备注")]
+		[MaxLength(1000)]
+		public string RectifyAndReformRemark { get; set; }
+
+		/// <summary>
+		/// 巡查结果：1正常,-1异常
+		/// </summary>
+		[Comment("巡查结果：1正常,-1异常")]
+		public int? PatrolResult { get; set; }
+
+		/// <summary>
+		/// 巡查异常描述
+		/// </summary>
+		[Comment("巡查异常描述")]
+		[MaxLength(1000)]
+		public string PatrolResultRemark { get; set; }
+
+		/// <summary>
+		/// 任务人员ID
+		/// </summary>
+		[Comment("任务人员ID")]
+		[MaxLength(36)]
+		public string UserID { get; set; }
+
+		/// <summary>
+		/// 任务截止时间
+		/// </summary>
+		[Comment("任务截止时间")]
+		public DateTime? EndTime { get; set; }
+
+		/// <summary>
+		/// 是否过期
+		/// </summary>
+		[Comment("是否过期")]
+		public bool? IsDelay { get; set; }
+
+		/// <summary>
+		/// -1：退回0：待处理1：保存待提交2：待审核3：审核通过
+		/// </summary>
+		[Comment("-1：退回0：待处理1：保存待提交2：待审核3：审核通过")]
+		public int Status { get; set; } = 0;
+
+		/// <summary>
+		/// 0：建档任务1：系统派发的巡查任务2：主动巡查任务
+		/// </summary>
+		[Comment("0：建档任务1：系统派发的巡查任务2：主动巡查任务")]
+		public int? TaskType { get; set; }
+
+		/// <summary>
+		/// 上报街道
+		/// </summary>
+		[Comment("上报街道")]
+		public int? ReportRoad { get; set; }
+
+		/// <summary>
+		/// 上报街道时间
+		/// </summary>
+		[Comment("上报街道时间")]
+		public DateTime? ReportRoadTime { get; set; }
+
+		/// <summary>
+		/// 上报区住建
+		/// </summary>
+		[Comment("上报区住建")]
+		public int? ReportArea { get; set; }
+
+		/// <summary>
+		/// 上报区住建时间
+		/// </summary>
+		[Comment("上报区住建时间")]
+		public DateTime? ReportAreaTime { get; set; }
+
+		/// <summary>
+		/// 上报备注
+		/// </summary>
+		[Comment("上报备注")]
+		[MaxLength(1000)]
+		public string ReportRemark { get; set; }
+
+		/// <summary>
+		/// 提交时间
+		/// </summary>
+		[Comment("提交时间")]
+		public DateTime? SubmitTime { get; set; }
+
+		/// <summary>
+		/// 最后提交时间
+		/// </summary>
+		[Comment("最后提交时间")]
+		public DateTime? LastSubmitTime { get; set; }
+
+	}
+}

Api/Ewide.Application/Entity/BsHouseTaskOptions.cs

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

Api/Ewide.Application/Ewide.Application.xml

@@ -4,327 +4,327 @@
         <name>Ewide.Application</name>
     </assembly>
     <members>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.HouseCodeId">
+        <member name="P:Ewide.Application.BsHouseInfo.HouseCodeId">
             <summary>
             HouseCode主键ID
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.BuildingName">
+        <member name="P:Ewide.Application.BsHouseInfo.BuildingName">
             <summary>
             幢名称
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.LandAttribute">
+        <member name="P:Ewide.Application.BsHouseInfo.LandAttribute">
             <summary>
             土地性质
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.StructureType">
+        <member name="P:Ewide.Application.BsHouseInfo.StructureType">
             <summary>
             结构类型
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.BaseInfo">
+        <member name="P:Ewide.Application.BsHouseInfo.BaseInfo">
             <summary>
             基础情况
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.SeismicGrade">
+        <member name="P:Ewide.Application.BsHouseInfo.SeismicGrade">
             <summary>
             抗震等级
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.CompletedDate">
+        <member name="P:Ewide.Application.BsHouseInfo.CompletedDate">
             <summary>
             竣工日期
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.UsefulYear">
+        <member name="P:Ewide.Application.BsHouseInfo.UsefulYear">
             <summary>
             设计使用年限
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.TotalFloor">
+        <member name="P:Ewide.Application.BsHouseInfo.TotalFloor">
             <summary>
             总层数
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.LandFloorCount">
+        <member name="P:Ewide.Application.BsHouseInfo.LandFloorCount">
             <summary>
             地上层数
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.LandBsFloorStart">
+        <member name="P:Ewide.Application.BsHouseInfo.LandBsFloorStart">
             <summary>
             地上商业层数开始
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.LandBsFloorEnd">
+        <member name="P:Ewide.Application.BsHouseInfo.LandBsFloorEnd">
             <summary>
             地上商业层数结束
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.LandBikeFloorStart">
+        <member name="P:Ewide.Application.BsHouseInfo.LandBikeFloorStart">
             <summary>
             地上车棚层开始
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.LandResidenceFloorStart">
+        <member name="P:Ewide.Application.BsHouseInfo.LandResidenceFloorStart">
             <summary>
             地上住宅层开始
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.LandResidenceFloorEnd">
+        <member name="P:Ewide.Application.BsHouseInfo.LandResidenceFloorEnd">
             <summary>
             地上住宅层结束
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.UnderFloorCount">
+        <member name="P:Ewide.Application.BsHouseInfo.UnderFloorCount">
             <summary>
             地下层数
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.TotalArea">
+        <member name="P:Ewide.Application.BsHouseInfo.TotalArea">
             <summary>
             总建筑面积
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.CurtainWall">
+        <member name="P:Ewide.Application.BsHouseInfo.CurtainWall">
             <summary>
             有无建筑幕墙
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.FaceBrick">
+        <member name="P:Ewide.Application.BsHouseInfo.FaceBrick">
             <summary>
             有无面砖
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.Coating">
+        <member name="P:Ewide.Application.BsHouseInfo.Coating">
             <summary>
             有无涂料
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.Painting">
+        <member name="P:Ewide.Application.BsHouseInfo.Painting">
             <summary>
             有无粉刷
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.Elevator">
+        <member name="P:Ewide.Application.BsHouseInfo.Elevator">
             <summary>
             电梯
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.HouseHolds">
+        <member name="P:Ewide.Application.BsHouseInfo.HouseHolds">
             <summary>
             总户数（户）
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.Units">
+        <member name="P:Ewide.Application.BsHouseInfo.Units">
             <summary>
             房屋单元数
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.UnitFloorHolds">
+        <member name="P:Ewide.Application.BsHouseInfo.UnitFloorHolds">
             <summary>
             各单元每层户数（户）
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.BuildingUnitId">
+        <member name="P:Ewide.Application.BsHouseInfo.BuildingUnitId">
             <summary>
             建设单位ID
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.DesingerUnitId">
+        <member name="P:Ewide.Application.BsHouseInfo.DesingerUnitId">
             <summary>
             设计单位ID
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.ConstructionUnitId">
+        <member name="P:Ewide.Application.BsHouseInfo.ConstructionUnitId">
             <summary>
             施工单位ID
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.MonitorUnitId">
+        <member name="P:Ewide.Application.BsHouseInfo.MonitorUnitId">
             <summary>
             监理单位ID
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.PropertyRights">
+        <member name="P:Ewide.Application.BsHouseInfo.PropertyRights">
             <summary>
             产权性质
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.HouseCount">
+        <member name="P:Ewide.Application.BsHouseInfo.HouseCount">
             <summary>
             总共套数
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.StraightHouseCount">
+        <member name="P:Ewide.Application.BsHouseInfo.StraightHouseCount">
             <summary>
             直管公房套数
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.SelfHouseCount">
+        <member name="P:Ewide.Application.BsHouseInfo.SelfHouseCount">
             <summary>
             自管公房套数
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.PrivateHouseCount">
+        <member name="P:Ewide.Application.BsHouseInfo.PrivateHouseCount">
             <summary>
             私房套数
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.BusinessCount">
+        <member name="P:Ewide.Application.BsHouseInfo.BusinessCount">
             <summary>
             商品房套数
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.ChangeHouseCount">
+        <member name="P:Ewide.Application.BsHouseInfo.ChangeHouseCount">
             <summary>
             房改房套数
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.ResettlementHouseCount">
+        <member name="P:Ewide.Application.BsHouseInfo.ResettlementHouseCount">
             <summary>
             拆迁安置房套数
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.OtherCount">
+        <member name="P:Ewide.Application.BsHouseInfo.OtherCount">
             <summary>
             其它套数
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.PropertyUnitId">
+        <member name="P:Ewide.Application.BsHouseInfo.PropertyUnitId">
             <summary>
             产权单位ID
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.WuYeUnitId">
+        <member name="P:Ewide.Application.BsHouseInfo.WuYeUnitId">
             <summary>
             物业单位ID
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.HouseSite">
+        <member name="P:Ewide.Application.BsHouseInfo.HouseSite">
             <summary>
             房屋场地
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.AdjacentConstruction">
+        <member name="P:Ewide.Application.BsHouseInfo.AdjacentConstruction">
             <summary>
             相邻施工
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.ChemicalErosion">
+        <member name="P:Ewide.Application.BsHouseInfo.ChemicalErosion">
             <summary>
             化学侵蚀
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.StructuralDismantling">
+        <member name="P:Ewide.Application.BsHouseInfo.StructuralDismantling">
             <summary>
             结构拆改
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.AddingLayer">
+        <member name="P:Ewide.Application.BsHouseInfo.AddingLayer">
             <summary>
             加层改造
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.RepairAndReinforce">
+        <member name="P:Ewide.Application.BsHouseInfo.RepairAndReinforce">
             <summary>
             修缮加固
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.HistoricalCalamity">
+        <member name="P:Ewide.Application.BsHouseInfo.HistoricalCalamity">
             <summary>
             历史灾害
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.FunctionalChange">
+        <member name="P:Ewide.Application.BsHouseInfo.FunctionalChange">
             <summary>
             使用功能变更
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.OtherContents">
+        <member name="P:Ewide.Application.BsHouseInfo.OtherContents">
             <summary>
             其他调查内容
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.DrawingMaterial">
+        <member name="P:Ewide.Application.BsHouseInfo.DrawingMaterial">
             <summary>
             图纸资料存档处
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.DrawingMaterialText">
+        <member name="P:Ewide.Application.BsHouseInfo.DrawingMaterialText">
             <summary>
             其他图纸存档
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.AnEntryDocument">
+        <member name="P:Ewide.Application.BsHouseInfo.AnEntryDocument">
             <summary>
             立项文件
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.PlanningPermission">
+        <member name="P:Ewide.Application.BsHouseInfo.PlanningPermission">
             <summary>
             规划许可
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.CompletionRecord">
+        <member name="P:Ewide.Application.BsHouseInfo.CompletionRecord">
             <summary>
             竣工验收备案
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.MonitorDocument">
+        <member name="P:Ewide.Application.BsHouseInfo.MonitorDocument">
             <summary>
             监理资料
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.IdentificationReport">
+        <member name="P:Ewide.Application.BsHouseInfo.IdentificationReport">
             <summary>
             鉴定报告
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.OtherDocument">
+        <member name="P:Ewide.Application.BsHouseInfo.OtherDocument">
             <summary>
             其它资料
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.FacadePhoto">
+        <member name="P:Ewide.Application.BsHouseInfo.FacadePhoto">
             <summary>
             外立面照片
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.HouseLevel">
+        <member name="P:Ewide.Application.BsHouseInfo.HouseLevel">
             <summary>
             房屋等级 1,2,3,4,C,d
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.UsedStatus">
+        <member name="P:Ewide.Application.BsHouseInfo.UsedStatus">
             <summary>
             房屋使用状态
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.State">
+        <member name="P:Ewide.Application.BsHouseInfo.State">
             <summary>
             1、待建档（需要建档的数据未暂存未保存的）2、暂存（点击了暂存的数据）3、待提交（点击了保存的数据） 4、退回（审核被退回的数据）5、审核中6、审核通过
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.InvestigateAgency">
+        <member name="P:Ewide.Application.BsHouseInfo.InvestigateAgency">
             <summary>
             调查登记机构
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.InvestigateUser">
+        <member name="P:Ewide.Application.BsHouseInfo.InvestigateUser">
             <summary>
             纸质资料调查人
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.OfflineAuditor">
+        <member name="P:Ewide.Application.BsHouseInfo.OfflineAuditor">
             <summary>
             纸质资料审核人
             </summary>
         </member>
-        <member name="P:Ewide.Application.Entity.BsHouseInfo.CompetentDepartment">
+        <member name="P:Ewide.Application.BsHouseInfo.CompetentDepartment">
             <summary>
             主管部门
             </summary>
@@ -359,6 +359,186 @@
             单位联系人电话
             </summary>
         </member>
+        <member name="P:Ewide.Application.BsHouseTask.HouseCodeId">
+            <summary>
+            bs_house_code主键Id
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.PatrolDate">
+            <summary>
+            巡查日期
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.PatrolUser">
+            <summary>
+            巡查人姓名
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.SettlementTilt">
+            <summary>
+            沉降倾斜
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.SettlementTiltFiles">
+            <summary>
+            沉降倾斜附件
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.OtherInfo">
+            <summary>
+            其他情况
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.OtherInfoFiles">
+            <summary>
+            其他情况附件
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.InitLevel">
+            <summary>
+            初始等级
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.DamageLevel">
+            <summary>
+            损坏等级
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.ComprehensiveLevel">
+            <summary>
+            综合等级
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.MainSafety">
+            <summary>
+            主要安全隐患综述
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.HandlingOpinion">
+            <summary>
+            处理意见
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.HandlingOpinionRemark">
+            <summary>
+            处理意见备注
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.RectifyAndReform">
+            <summary>
+            整改情况
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.RectifyAndReformRemark">
+            <summary>
+            整改情况备注
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.PatrolResult">
+            <summary>
+            巡查结果：1正常,-1异常
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.PatrolResultRemark">
+            <summary>
+            巡查异常描述
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.UserID">
+            <summary>
+            任务人员ID
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.EndTime">
+            <summary>
+            任务截止时间
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.IsDelay">
+            <summary>
+            是否过期
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.Status">
+            <summary>
+            -1：退回0：待处理1：保存待提交2：待审核3：审核通过
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.TaskType">
+            <summary>
+            0：建档任务1：系统派发的巡查任务2：主动巡查任务
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.ReportRoad">
+            <summary>
+            上报街道
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.ReportRoadTime">
+            <summary>
+            上报街道时间
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.ReportArea">
+            <summary>
+            上报区住建
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.ReportAreaTime">
+            <summary>
+            上报区住建时间
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.ReportRemark">
+            <summary>
+            上报备注
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.SubmitTime">
+            <summary>
+            提交时间
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTask.LastSubmitTime">
+            <summary>
+            最后提交时间
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTaskOptions.TaskId">
+            <summary>
+            bs_house_code主键Id
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTaskOptions.DictType">
+            <summary>
+            字典类型
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTaskOptions.DictCode">
+            <summary>
+            字典code
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTaskOptions.DictValue">
+            <summary>
+            字典值
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTaskOptions.Remark">
+            <summary>
+            备注
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTaskOptions.File">
+            <summary>
+            附件
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.BsHouseTaskOptions.Checked">
+            <summary>
+            是否选中
+            </summary>
+        </member>
         <member name="F:Ewide.Application.ZoneRole.ZoneManager">
             <summary>
             片区监管员
@@ -545,6 +725,11 @@
             <param name="input"></param>
             <returns></returns>
         </member>
+        <member name="T:Ewide.Application.Service.HouseTaskService">
+            <summary>
+            房屋任务（巡查任务/建档任务）
+            </summary>
+        </member>
         <member name="T:Ewide.Application.Service.HouseZoneService">
             <summary>
             片区相关
@@ -564,5 +749,85 @@
             <param name="userId"></param>
             <returns></returns>
         </member>
+        <member name="P:Ewide.Application.HouseTaskInput.SettlementTilt">
+            <summary>
+            沉降倾斜
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.HouseTaskInput.SettlementTiltFiles">
+            <summary>
+            沉降倾斜附件
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.HouseTaskInput.OtherInfo">
+            <summary>
+            其他情况
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.HouseTaskInput.OtherInfoFiles">
+            <summary>
+            其他情况附件
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.HouseTaskInput.MainSafety">
+            <summary>
+            主要安全隐患综述
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.HouseTaskInput.HandlingOpinion">
+            <summary>
+            处理意见
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.HouseTaskInput.HandlingOpinionRemark">
+            <summary>
+            处理意见备注
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.HouseTaskInput.RectifyAndReform">
+            <summary>
+            整改情况
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.HouseTaskInput.RectifyAndReformRemark">
+            <summary>
+            整改情况备注
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.HouseTaskInput.PatrolResult">
+            <summary>
+            巡查结果：1正常,-1异常
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.HouseTaskInput.Status">
+            <summary>
+            -1：退回 0：待处理 1：保存待提交 2：待审核 3：审核通过
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.HouseTaskInput.ReportRoad">
+            <summary>
+            上报街道
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.HouseTaskInput.ReportRoadTime">
+            <summary>
+            上报街道时间
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.HouseTaskInput.ReportArea">
+            <summary>
+            上报区住建
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.HouseTaskInput.ReportAreaTime">
+            <summary>
+            上报区住建时间
+            </summary>
+        </member>
+        <member name="P:Ewide.Application.HouseTaskInput.ReportRemark">
+            <summary>
+            上报备注
+            </summary>
+        </member>
     </members>
 </doc>

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

@@ -66,12 +66,12 @@ namespace Ewide.Application.Service.HouseCode
         [HttpPost("/houseCode/page")]
         public async Task<dynamic> QueryPage([FromBody] QueryHouseCodeInput input)
         {
-            var sql = @"SELECT HC.*,AA.Name AreaName,RA.Name RoadName,CA.Name CommName,Proj.AreaCode,Proj.Note,Proj.Name+'('+Proj.Note+')' FullProjName FROM bs_house_code HC
+            var sql = @"SELECT HC.*,AA.Name AreaName,RA.Name RoadName,CA.Name CommName,Proj.AreaCode,Proj.Note,CONCAT(Proj.Name,'(',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) WHERE HC.Address LIKE @Address AND HC.HouseCode LIKE @HouseCode";
-            return await _dapperRepository.QueryPageData(sql, input, param: new { Address = '%' + input.Address + '%', HouseCode = '%' + input.HouseCode + '%'});
+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" });
         }
 
         /// <summary>

Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoInput.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 HouseInfoInput
+    {
+    }
+}

Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoOutput.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 HouseInfoOutput
+    {
+    }
+}

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

@@ -0,0 +1,32 @@
+using Dapper;
+using Furion.DatabaseAccessor;
+using Furion.DependencyInjection;
+using Furion.DynamicApiController;
+using Microsoft.AspNetCore.Mvc;
+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
+{
+    public class HouseInfoService : IHouseInfoService, IDynamicApiController, ITransient
+    {
+        private readonly IRepository<BsHouseInfo> _houseInfoRep;
+        private readonly IDapperRepository _dapperRepository;
+
+        public HouseInfoService(IRepository<BsHouseInfo> HouseInfoRep, IDapperRepository dapperRepository)
+        {
+            _houseInfoRep = HouseInfoRep;
+            _dapperRepository = dapperRepository;
+        }
+
+        //[HttpGet("/houseInfo/getByTaskId")]
+        //public async Task<HouseInfoOutput> GetByTaskId([Required] string taskId)
+        //{
+
+        //}
+    }
+}

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
+    {
+        //async Task<HouseInfoOutput> GetByTaskId(string taskId);
+    }
+}

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

@@ -23,18 +23,21 @@ namespace Ewide.Application.Service
 
         private readonly IRepository<BsHouseMemberRelation> _bsHouseMemberRelationRep;
         private readonly IRepository<BsHouseCode> _bsHouseCodeRep;
+        private readonly IRepository<BsHouseTask> _bsHouseTaskRep;
         private readonly IHouseZoneService _houseZoneService;
 
         public HouseSelectorService(
             IDapperRepository dapperRep,
             IRepository<BsHouseMemberRelation> bsHouseMemberRelationRep,
             IRepository<BsHouseCode> bsHouseCodeRep,
+            IRepository<BsHouseTask> bsHouseTaskRep,
             IHouseZoneService houseZoneService
         )
         {
             _dapperRep = dapperRep;
             _bsHouseMemberRelationRep = bsHouseMemberRelationRep;
             _bsHouseCodeRep = bsHouseCodeRep;
+            _bsHouseTaskRep = bsHouseTaskRep;
             _houseZoneService = houseZoneService;
         }
 
@@ -145,6 +148,25 @@ WHERE 1=1
                     SysUserId = input.UserId,
                     HouseCodeId = p
                 }.Insert();
+
+                var initTask = _bsHouseTaskRep.DetachedEntities.FirstOrDefault(t => t.TaskType == 0);
+                if (initTask == null)
+                {
+                    new BsHouseTask
+                    {
+                        Id = System.Guid.NewGuid().ToString(),
+                        HouseCodeId = p,
+                        UserID = input.UserId,
+                        EndTime = System.DateTime.Now.AddMonths(1),
+                        Status = 0,
+                        TaskType = 0
+                    }.Insert();
+                }
+                else
+                {
+                    initTask.UserID = input.UserId;
+                    initTask.Update();
+                }
             });
         }
 

Api/Ewide.Application/Service/HouseSafety/HouseTask/Dto/HouseTaskInput.cs

@@ -0,0 +1,129 @@
+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 : PageInputBase
+    {
+        [Required(ErrorMessage = "房屋编码ID不能为空")]
+        public string HouseCodeId { get; set; }
+
+        [Required(ErrorMessage = "巡查日期不能为空")]
+        public DateTime PatrolDate { get; set; }
+
+        [Required(ErrorMessage = "巡查人员/单位不能为空")]
+        public string PatrolUser { get; set; }
+
+        /// <summary>
+        /// 沉降倾斜
+        /// </summary>
+        public string SettlementTilt { get; set; }
+
+        /// <summary>
+        /// 沉降倾斜附件
+        /// </summary>
+        public string SettlementTiltFiles { get; set; }
+
+        /// <summary>
+        /// 其他情况
+        /// </summary>
+        public string OtherInfo { get; set; }
+
+        /// <summary>
+        /// 其他情况附件
+        /// </summary>
+        public string OtherInfoFiles { get; set; }
+
+        [Required(ErrorMessage = "巡查初始等级不能为空")]
+        public int InitLevel { get; set; }
+        [Required(ErrorMessage = "巡查损坏等级不能为空")]
+        public int DamageLevel { get; set; }
+        [Required(ErrorMessage = "巡查综合等级不能为空")]
+        public int ComprehensiveLevel { get; set; }
+
+        /// <summary>
+        /// 主要安全隐患综述
+        /// </summary>
+        public string MainSafety { get; set; }
+
+        /// <summary>
+        /// 处理意见
+        /// </summary>
+        public int? HandlingOpinion { get; set; }
+
+        /// <summary>
+        /// 处理意见备注
+        /// </summary>
+        public string HandlingOpinionRemark { get; set; }
+
+        /// <summary>
+        /// 整改情况
+        /// </summary>
+        public int? RectifyAndReform { get; set; }
+
+        /// <summary>
+        /// 整改情况备注
+        /// </summary>
+        public string RectifyAndReformRemark { get; set; }
+
+        /// <summary>
+        /// 巡查结果：1正常,-1异常
+        /// </summary>
+        [Required(ErrorMessage = "巡查结果不能为空")]
+        public int PatrolResult { get; set; }
+
+        public string PatrolResultRemark { get; set; }
+
+        /// <summary>
+        /// -1：退回 0：待处理 1：保存待提交 2：待审核 3：审核通过
+        /// </summary>
+        [Required(ErrorMessage = "任务目标状态能为空")]
+        public int Status { get; set; }
+
+        /// <summary>
+        /// 上报街道
+        /// </summary>
+        public int? ReportRoad { get; set; }
+
+        /// <summary>
+        /// 上报街道时间
+        /// </summary>
+        public DateTime? ReportRoadTime { get; set; }
+
+        /// <summary>
+        /// 上报区住建
+        /// </summary>
+        public int? ReportArea { get; set; }
+
+        /// <summary>
+        /// 上报区住建时间
+        /// </summary>
+        public DateTime? ReportAreaTime { get; set; }
+
+        /// <summary>
+        /// 上报备注
+        /// </summary>
+        public string ReportRemark { get; set; }
+    }
+
+    public class AddHouseTaskInput : HouseTaskInput
+    {
+
+    }
+
+    public class EditHouseTaskInput
+    {
+        [Required(ErrorMessage = "任务Id不能为空")]
+        public string Id { get; set; }
+    }
+
+    public class QueryHouseTaskInput : PageInputBase
+    {
+
+    }
+}

Api/Ewide.Application/Service/HouseSafety/HouseTask/Dto/HouseTaskOutput.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 HouseTaskOutput
+    {
+    }
+}

Api/Ewide.Application/Service/HouseSafety/HouseTask/HouseTaskService.cs

@@ -0,0 +1,46 @@
+using Dapper;
+using Ewide.Core.Extension;
+using Furion.DatabaseAccessor;
+using Furion.DependencyInjection;
+using Furion.DynamicApiController;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Application.Service
+{
+    /// <summary>
+    /// 房屋任务（巡查任务/建档任务）
+    /// </summary>
+    [ApiDescriptionSettings(Name = "HouseTask", Order = 190)]
+    public class HouseTaskService : IHouseTaskService, IDynamicApiController, ITransient
+    {
+        private readonly IRepository<BsHouseTask> _houseTaskRep;
+        private readonly IDapperRepository _dapperRepository;
+
+        public HouseTaskService(IRepository<BsHouseTask> HouseTaskRep, IDapperRepository dapperRepository)
+        {
+            _houseTaskRep = HouseTaskRep;
+            _dapperRepository = dapperRepository;
+        }
+
+        [HttpPost("/houseTask/page")]
+        public async Task<dynamic> 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,'(',Proj.Note,')') FullProjName,HC.HouseCode,HC.Address,T.EndTime,HC.Type,HC.Industry,HC.No 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)";
+            return await _dapperRepository.QueryPageDataDynamic(sql, input, filterFields: new string[] { "Type", "Address", "HouseCode" });
+        }
+
+        
+    }
+}

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<dynamic> QueryPage(QueryHouseTaskInput input);
+    }
+}

Api/Ewide.Core/Ewide.Core.xml

@@ -2734,7 +2734,7 @@
             用户管理
             </summary>
         </member>
-        <member name="M:Ewide.Core.UserManager.CheckUserAsync(System.String,System.Boolean)">
+        <member name="M:Ewide.Core.UserManager.CheckUserAsync(System.String)">
             <summary>
             获取用户信息
             </summary>