diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoInput.cs b/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoInput.cs index bf4200f..191fb3a 100644 --- a/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoInput.cs +++ b/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoInput.cs @@ -271,14 +271,7 @@ namespace Ewide.Application public string CompetentDepartment { get; set; } #endregion - public DataStatus StateDataStatus { get; set; } - public int State - { - get - { - return (int)StateDataStatus; - } - } + public int State { get; set; } } public class HouseInfoInputSave diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs b/Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs index a61bc99..3813291 100644 --- a/Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs +++ b/Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs @@ -131,7 +131,7 @@ WHERE HC.Id=@HouseCodeId", new { houseTask.HouseCodeId } //判断房屋建档状态 //dataStatus == DataStatus.Saved 若是保存操作 则判断是新增/更新 //判断是新增/更新 根据传入参数dataStatus确定 - input.houseInfo.StateDataStatus = dataStatus == DataStatus.Saved ? (houseEntity == null ? DataStatus.Saved : GetDataStatus(houseEntity.State)) : 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; @@ -154,18 +154,5 @@ WHERE HC.Id=@HouseCodeId", new { houseTask.HouseCodeId } await checkRecord.InsertAsync(); } } - - private DataStatus GetDataStatus(int status) - { - return status switch - { - -1 => DataStatus.Back, - 1 => DataStatus.TempSaved, - 2 => DataStatus.Saved, - 3 => DataStatus.Submited, - 6 => DataStatus.Passed, - _ => DataStatus.Init, - }; - } } } diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseSelector/HouseSelectorService.cs b/Api/Ewide.Application/Service/HouseSafety/HouseSelector/HouseSelectorService.cs index 4a2d166..f040d2e 100644 --- a/Api/Ewide.Application/Service/HouseSafety/HouseSelector/HouseSelectorService.cs +++ b/Api/Ewide.Application/Service/HouseSafety/HouseSelector/HouseSelectorService.cs @@ -44,7 +44,7 @@ namespace Ewide.Application.Service /// /// 获取人员允许绑定的房屋编码列表 /// - /// + /// /// [HttpPost("/houseSelector/selectorPage")] public async Task HouseSelectorList([FromBody] QueryHouseSelectorInput input) @@ -71,7 +71,7 @@ WHERE HM.Id IS NULL"; /// /// 获取人员已经绑定的房屋编码列表 /// - /// + /// /// [HttpPost("/houseSelector/selectedPage")] public async Task HouseSelectedList([FromBody] QueryHouseSelectorInput input)