update 建档登记页面完善

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

@@ -189,7 +189,7 @@ namespace Ewide.Application
 		/// <summary>
 		/// 房屋等级 1,2,3,4,C,d
 		/// </summary>
-		public int? HouseLevel { get; set; }
+		public int? HouseGrade { get; set; }
 
 		/// <summary>
 		/// 房屋使用状态

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

@@ -189,12 +189,12 @@ namespace Ewide.Application
 		/// <summary>
 		/// 房屋等级 1,2,3,4,C,d
 		/// </summary>
-		public int? HouseLevel { get; set; }
+		public int? HouseGrade { get; set; }
 
 		/// <summary>
 		/// 房屋使用状态
 		/// </summary>
-		public int? UsedStatus { get; set; }
+		public int? HouseUsedStatus { get; set; }
 		#endregion
 
 		#region 图纸资料存档处drawing
@@ -275,10 +275,10 @@ namespace Ewide.Application
 	public class HouseInfoOutputForDetailPage
     {
 		#region header
-		public HouseCodeOutput houseCode { get; set; }
+		public HouseCodeOutput HouseCode { get; set; }
 		#endregion
 
-		public HouseInfoOutput houseInfo { get; set; }
+		public HouseInfoOutput HouseInfo { get; set; }
 		public HouseTaskOutput PatrolInfo { get; set; }
 	}
 }

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

@@ -81,8 +81,9 @@ namespace Ewide.Application.Service.HouseSafety.HouseInfo
 
             //获取房屋编码信息
             var houseCodeOutputAsync = await _dapperRepository.QueryAsync<HouseCodeOutput>(
-                @"SELECT HC.Id,HC.Address,HC.ProjectId,HC.ZoneId,HC.Type,AA.Name AreaName,RA.Name RoadName,CA.Name CommName,Proj.Note ProjectNote,CONCAT(Proj.Name,'(',Proj.Note,')') ProjectFullName,HC.HouseCode,HC.Lng,HC.Lat,HC.No FROM bs_house_code HC
+                @"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)
@@ -98,7 +99,7 @@ WHERE HC.Id=@HouseCodeId", new { houseTask.HouseCodeId }
             var houseInfo = await _houseInfoRep.DetachedEntities.FirstOrDefaultAsync(h => h.HouseCodeId == houseTask.HouseCodeId);
             var houseInfoOutputForDetailPage = new HouseInfoOutputForDetailPage
             {
-                houseCode = houseCodeOutput
+                HouseCode = houseCodeOutput
             };
 
             houseInfoOutputForDetailPage.PatrolInfo = new HouseTaskOutput
@@ -109,12 +110,12 @@ WHERE HC.Id=@HouseCodeId", new { houseTask.HouseCodeId }
 
             if (houseInfo == null)
             {
-                houseInfoOutputForDetailPage.houseInfo = new HouseInfoOutput();
+                houseInfoOutputForDetailPage.HouseInfo = new HouseInfoOutput();
                 return houseInfoOutputForDetailPage;
             }
 
             var houseInfoOutput = (await _houseInfoRep.DetachedEntities.FirstOrDefaultAsync(p => p.HouseCodeId == houseTask.HouseCodeId)).Adapt<HouseInfoOutput>();
-            houseInfoOutputForDetailPage.houseInfo = houseInfoOutput;
+            houseInfoOutputForDetailPage.HouseInfo = houseInfoOutput;
 
             return houseInfoOutputForDetailPage;
         }

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

@@ -37,11 +37,11 @@ namespace Ewide.Application
         public string OtherInfoFiles { get; set; }
 
         //[Required(ErrorMessage = "巡查初始等级不能为空")]
-        public int InitLevel { get; set; }
+        public int InitGrade { get; set; }
         //[Required(ErrorMessage = "巡查损坏等级不能为空")]
-        public int DamageLevel { get; set; }
+        public int DamageGrade { get; set; }
         //[Required(ErrorMessage = "巡查综合等级不能为空")]
-        public int ComprehensiveLevel { get; set; }
+        public int ComprehensiveGrade { get; set; }
 
         /// <summary>
         /// 主要安全隐患综述

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

@@ -10,5 +10,100 @@ namespace Ewide.Application
     {
         public DateTime? PatrolDate { get; set; }
         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; }
+
+		/// <summary>
+		/// 初始等级
+		/// </summary>
+		public int? InitGrade { get; set; }
+
+		/// <summary>
+		/// 损坏等级
+		/// </summary>
+		public int? DamageGrade { get; set; }
+
+		/// <summary>
+		/// 综合等级
+		/// </summary>
+		public int? ComprehensiveGrade { 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>
+		public int? PatrolResult { get; set; }
+
+		/// <summary>
+		/// 巡查异常描述
+		/// </summary>
+		public string PatrolResultRemark { 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; }
+	}
 }