ewide/zsxt_nbzs_h5
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update 前端页面字段更新

Browse Source 
add 登记页面读取信息接口
This commit is contained in:
ky_yusj
2021-06-02 14:29:57 +08:00
parent 1488a0ef2d
commit 6e87e8add7
17 changed files with 985 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Api/Ewide.Application/Entity/BsHouseInfo.cs
View File

@@ -358,7 +358,7 @@ namespace Ewide.Application
/// </summary>
[Comment("竣工验收备案")]
[MaxLength(2000)]
public string CompletionRecord { get; set; }
public string CompletedRecord { get; set; }
/// <summary>
/// 监理资料

245
Api/Ewide.Application/Ewide.Application.xml
View File

@@ -269,7 +269,7 @@
规划许可
</summary>
</member>
<member name="P:Ewide.Application.BsHouseInfo.CompletionRecord">
<member name="P:Ewide.Application.BsHouseInfo.CompletedRecord">
<summary>
竣工验收备案
</summary>
@@ -539,7 +539,22 @@
是否选中
</summary>
</member>
<member name="F:Ewide.Application.ZoneRole.ZoneManager">
<member name="F:Ewide.Application.HouseManagerRole.CityManager">
<summary>
市住建部门
</summary>
</member>
<member name="F:Ewide.Application.HouseManagerRole.AreaManager">
<summary>
区住建部门
</summary>
</member>
<member name="F:Ewide.Application.HouseManagerRole.RoadManager">
<summary>
街道管理员
</summary>
</member>
<member name="F:Ewide.Application.HouseManagerRole.ZoneManager">
<summary>
片区监管员
</summary>
@@ -561,6 +576,11 @@
<param name="projectId"></param>
<returns></returns>
</member>
<member name="T:Ewide.Application.Service.HouseSafety.HouseInfo.HouseInfoService">
<summary>
房屋详细信息
</summary>
</member>
<member name="M:Ewide.Application.Service.HouseMemberService.QueryMemberPageList(Ewide.Core.Service.UserInput)">
<summary>
分页查询用户
@@ -749,6 +769,227 @@
<param name="userId"></param>
<returns></returns>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.TotalArea">
<summary>
总建筑面积
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.HouseHolds">
<summary>
总户数（户）
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.Units">
<summary>
房屋单元数
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.UnitFloorHolds">
<summary>
各单元每层户数（户）
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.TotalFloor">
<summary>
总层数
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.LandFloorCount">
<summary>
地上层数
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.LandBsFloorStart">
<summary>
地上商业层数开始
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.LandBsFloorEnd">
<summary>
地上商业层数结束
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.LandBikeFloorStart">
<summary>
地上车棚层开始
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.LandResidenceFloorStart">
<summary>
地上住宅层开始
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.LandResidenceFloorEnd">
<summary>
地上住宅层结束
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.UnderFloorCount">
<summary>
地下层数
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.PropertyRights">
<summary>
产权性质
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.HouseCount">
<summary>
总共套数
</summary>
</member>
<!-- Badly formed XML comment ignored for member "P:Ewide.Application.HouseInfoOutput.StraightHouseCount" -->
<member name="P:Ewide.Application.HouseInfoOutput.SelfHouseCount">
<summary>
自管公房套数
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.PrivateHouseCount">
<summary>
私房套数
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.BusinessCount">
<summary>
商品房套数
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.ChangeHouseCount">
<summary>
房改房套数
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.ResettlementHouseCount">
<summary>
拆迁安置房套数
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.OtherCount">
<summary>
其它套数
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.HouseSite">
<summary>
房屋场地
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.AdjacentConstruction">
<summary>
相邻施工
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.ChemicalErosion">
<summary>
化学侵蚀
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.StructuralDismantling">
<summary>
结构拆改
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.AddingLayer">
<summary>
加层改造
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.RepairAndReinforce">
<summary>
修缮加固
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.HistoricalCalamity">
<summary>
历史灾害
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.FunctionalChange">
<summary>
使用功能变更
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.OtherContents">
<summary>
其他调查内容
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.HouseLevel">
<summary>
房屋等级 1,2,3,4,C,d
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.UsedStatus">
<summary>
房屋使用状态
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.DrawingMaterial">
<summary>
图纸资料存档处
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.DrawingMaterialText">
<summary>
其他图纸存档
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.AnEntryDocument">
<summary>
立项文件
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.PlanningPermission">
<summary>
规划许可
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.CompletedRecord">
<summary>
竣工验收备案
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.MonitorDocument">
<summary>
监理资料
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.IdentificationReport">
<summary>
鉴定报告
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.OtherDocument">
<summary>
其它资料
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.FacadePhoto">
<summary>
外立面照片
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.InvestigateAgency">
<summary>
调查登记机构
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.InvestigateUser">
<summary>
纸质资料调查人
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.OfflineAuditor">
<summary>
纸质资料审核人
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.CompetentDepartment">
<summary>
主管部门
</summary>
</member>
<member name="P:Ewide.Application.HouseTaskInput.SettlementTilt">
<summary>
沉降倾斜

22
Api/Ewide.Application/Service/HouseSafety/HouseCode/Dto/HouseCodeOutput.cs
View File

@@ -5,19 +5,23 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Ewide.Application.Service.HouseCode.Dto
namespace Ewide.Application
{
public class HouseCodeOutput : PageInputBase
public class HouseCodeOutput
{
public string HouseCode { get; set; }
public string Id { get; set; }
public string Address { get; set; }
public string ProjectId { get; set; }
public string ZoonId { get; set; }
public string ZoneId { get; set; }
public int Type { get; set; }
public int ProjectFullName { get; set; }
public int ProjectName { get; set; }
public int AreaName { get; set; }
public int RoadName { get; set; }
public int CommName { 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 ProjectFullName { get; set; }
public string HouseCode { get; set; }
public string Lng { get; set; }
public string Lat { get; set; }
}
}

1
Api/Ewide.Application/Service/HouseSafety/HouseCode/HouseCodeService.cs
View File

@@ -1,5 +1,4 @@
using Ewide.Application.Entity;
using Ewide.Application.Service.HouseCode.Dto;
using Ewide.Core;
using Furion.DatabaseAccessor;
using Furion.DatabaseAccessor.Extensions;

3
Api/Ewide.Application/Service/HouseSafety/HouseCode/IHouseCodeService.cs
View File

@@ -1,5 +1,4 @@
using Ewide.Application.Service.HouseCode.Dto;
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

2
Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoInput.cs
View File

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace Ewide.Application
{
class HouseInfoInput
public class HouseInfoInput
{
}
}

280
Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoOutput.cs
View File

@@ -6,7 +6,285 @@ using System.Threading.Tasks;
namespace Ewide.Application
{
public class HouseInfoOutput
public class HouseInfoOutput
{
#region 建筑物基本信息building
public string BuildingName { get; set; }
public int? LandAttribute { get; set; }
public int? StructureType { get; set; }
public int? SeismicGrade { get; set; }
public int? BaseInfo { get; set; }
public string InsulationMaterial { get; set; }
public string WallMaterial { get; set; }
public string FireproofGrade { get; set; }
public int? CurtainWall { get; set; }
public int? FaceBrick { get; set; }
public int? WhiteWash { get; set; }
public int? Coating { get; set; }
public string Elevator { get; set; }
public DateTime? CompletedDate { get; set; }
public int? UsefulYear { get; set; }
/// <summary>
/// 总建筑面积
/// </summary>
public float? TotalArea { get; set; }
/// <summary>
/// 总户数（户）
/// </summary>
public int? HouseHolds { get; set; }
/// <summary>
/// 房屋单元数
/// </summary>
public int? Units { get; set; }
/// <summary>
/// 各单元每层户数（户）
/// </summary>
public int? UnitFloorHolds { get; set; }
/// <summary>
/// 总层数
/// </summary>
public int? TotalFloor { get; set; }
/// <summary>
/// 地上层数
/// </summary>
public int? LandFloorCount { get; set; }
/// <summary>
/// 地上商业层数开始
/// </summary>
public int? LandBsFloorStart { get; set; }
/// <summary>
/// 地上商业层数结束
/// </summary>
public int? LandBsFloorEnd { get; set; }
/// <summary>
/// 地上车棚层开始
/// </summary>
public int? LandBikeFloorStart { get; set; }
/// <summary>
/// 地上住宅层开始
/// </summary>
public int? LandResidenceFloorStart { get; set; }
/// <summary>
/// 地上住宅层结束
/// </summary>
public int? LandResidenceFloorEnd { get; set; }
/// <summary>
/// 地下层数
/// </summary>
public int? UnderFloorCount { get; set; }
#endregion
#region 权属情况ownership
/// <summary>
/// 产权性质
/// </summary>
public string PropertyRights { get; set; }
/// <summary>
/// 总共套数
/// </summary>
public int? HouseCount { get; set; }
/// 直管公房套数
/// </summary>
public int? StraightHouseCount { get; set; }
/// <summary>
/// 自管公房套数
/// </summary>
public int? SelfHouseCount { get; set; }
/// <summary>
/// 私房套数
/// </summary>
public int? PrivateHouseCount { get; set; }
/// <summary>
/// 商品房套数
/// </summary>
public int? BusinessCount { get; set; }
/// <summary>
/// 房改房套数
/// </summary>
public int? ChangeHouseCount { get; set; }
/// <summary>
/// 拆迁安置房套数
/// </summary>
public int? ResettlementHouseCount { get; set; }
/// <summary>
/// 其它套数
/// </summary>
public int? OtherCount { get; set; }
#endregion
#region 管理情况manager
#endregion
#region 调查情况investigation
/// <summary>
/// 房屋场地
/// </summary>
public string HouseSite { get; set; }
/// <summary>
/// 相邻施工
/// </summary>
public string AdjacentConstruction { get; set; }
/// <summary>
/// 化学侵蚀
/// </summary>
public string ChemicalErosion { get; set; }
/// <summary>
/// 结构拆改
/// </summary>
public int? StructuralDismantling { get; set; }
/// <summary>
/// 加层改造
/// </summary>
public int? AddingLayer { get; set; }
/// <summary>
/// 修缮加固
/// </summary>
public string RepairAndReinforce { get; set; }
/// <summary>
/// 历史灾害
/// </summary>
public string HistoricalCalamity { get; set; }
/// <summary>
/// 使用功能变更
/// </summary>
public string FunctionalChange { get; set; }
/// <summary>
/// 其他调查内容
/// </summary>
public string OtherContents { get; set; }
#endregion
#region 鉴定治理identification
/// <summary>
/// 房屋等级 1,2,3,4,C,d
/// </summary>
public int? HouseLevel { get; set; }
/// <summary>
/// 房屋使用状态
/// </summary>
public int? UsedStatus { get; set; }
#endregion
#region 图纸资料存档处drawing
/// <summary>
/// 图纸资料存档处
/// </summary>
public string DrawingMaterial { get; set; }
/// <summary>
/// 其他图纸存档
/// </summary>
public string DrawingMaterialText { get; set; }
#endregion
#region 相关附件资料attachments
/// <summary>
/// 立项文件
/// </summary>
public string AnEntryDocument { get; set; }
/// <summary>
/// 规划许可
/// </summary>
public string PlanningPermission { get; set; }
/// <summary>
/// 竣工验收备案
/// </summary>
public string CompletedRecord { get; set; }
/// <summary>
/// 监理资料
/// </summary>
public string MonitorDocument { get; set; }
/// <summary>
/// 鉴定报告
/// </summary>
public string IdentificationReport { get; set; }
/// <summary>
/// 其它资料
/// </summary>
public string OtherDocument { get; set; }
#endregion
#region 建筑概貌aspect
/// <summary>
/// 外立面照片
/// </summary>
public string FacadePhoto { get; set; }
#endregion
#region 调查单位unit
/// <summary>
/// 调查登记机构
/// </summary>
public string InvestigateAgency { get; set; }
/// <summary>
/// 纸质资料调查人
/// </summary>
public string InvestigateUser { get; set; }
/// <summary>
/// 纸质资料审核人
/// </summary>
public string OfflineAuditor { get; set; }
/// <summary>
/// 主管部门
/// </summary>
public string CompetentDepartment { get; set; }
#endregion
}
public class HouseInfoOutputForDetailPage
{
#region header
public HouseCodeOutput houseCode { get; set; }
#endregion
public HouseInfoOutput houseInfoOutput { get; set; }
public PatrolInfo PatrolInfo { get; set; }
}
public class PatrolInfo
{
public DateTime? PatrolDate { get; set; }
public string PatrolUser { get; set; }
}
}

60
Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs
View File

@@ -1,8 +1,12 @@
using Dapper;
using Ewide.Core;
using Furion.DatabaseAccessor;
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;
@@ -12,21 +16,67 @@ using System.Threading.Tasks;
namespace Ewide.Application.Service.HouseSafety.HouseInfo
{
/// <summary>
/// 房屋详细信息
/// </summary>
[ApiDescriptionSettings(Name = "HouseInfo", Order = 200)]
public class HouseInfoService : IHouseInfoService, IDynamicApiController, ITransient
{
private readonly IRepository<BsHouseCode> _houseCodeRep;
private readonly IRepository<BsHouseInfo> _houseInfoRep;
private readonly IUserManager _userManager;
private readonly IDapperRepository _dapperRepository;
public HouseInfoService(IRepository<BsHouseInfo> HouseInfoRep, IDapperRepository dapperRepository)
public HouseInfoService(IRepository<BsHouseCode> HouseCodeRep,IRepository<BsHouseInfo> HouseInfoRep, IUserManager userManager, IDapperRepository dapperRepository)
{
_houseCodeRep = HouseCodeRep;
_houseInfoRep = HouseInfoRep;
_userManager = userManager;
_dapperRepository = dapperRepository;
}
//[HttpGet("/houseInfo/getByTaskId")]
//public async Task<HouseInfoOutput> GetByTaskId([Required] string taskId)
//{
[HttpGet("/houseInfo/getByTaskId")]
[AllowAnonymous]
public async Task<HouseInfoOutputForDetailPage> GetByTaskId([Required] string taskId)
{
var houseTaskRep = Db.GetRepository<BsHouseTask>();
var houseTask = await houseTaskRep.DetachedEntities.FirstOrDefaultAsync(t=>t.Id == taskId);
if(houseTask == null) throw Oops.Oh("任务不存在");
//}
var houseCodeOutputAsync = await _dapperRepository.QueryAsync<HouseCodeOutput>(
@"SELECT HC.Id,HC.Address,HC.ProjectId,HC.ZoneId,HC.Type,AA.Name AreaName,RA.Name RoadName,CA.Name CommName,Proj.Note ProjectNote,CONCAT(Proj.Name,'(',Proj.Note,')') ProjectFullName,HC.HouseCode,HC.Lng,HC.Lat 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.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
};
houseInfoOutputForDetailPage.PatrolInfo = new PatrolInfo();
houseInfoOutputForDetailPage.PatrolInfo.PatrolDate = houseTask.PatrolDate.GetValueOrDefault(DateTime.Now);
houseInfoOutputForDetailPage.PatrolInfo.PatrolUser = String.IsNullOrEmpty(houseTask.PatrolUser) ? currentUser.Name : houseTask.PatrolUser;
if (houseInfo == null)
{
houseInfoOutputForDetailPage.houseInfoOutput = new HouseInfoOutput();
return houseInfoOutputForDetailPage;
}
var houseInfoOutputAsync = await _dapperRepository.QueryAsync<HouseInfoOutput>("SELECT * FROM bs_house_info HI WHERE Id = @HouseCodeId", new { houseTask.HouseCodeId });
var houseInfoOutput = houseInfoOutputAsync.SingleOrDefault();
houseInfoOutputForDetailPage.houseInfoOutput = houseInfoOutput;
return houseInfoOutputForDetailPage;
}
}
}

2
Api/Ewide.Application/Service/HouseSafety/HouseInfo/IHouseInfoService.cs
View File

@@ -8,6 +8,6 @@ namespace Ewide.Application.Service
{
public interface IHouseInfoService
{
//async Task<HouseInfoOutput> GetByTaskId(string taskId);
Task<HouseInfoOutputForDetailPage> GetByTaskId(string taskId);
}
}