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

update

Browse Source
This commit is contained in:
ky_yusj
2021-06-10 21:59:22 +08:00
parent c1a0c836fb
commit f42fc9c438
3 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -271,14 +271,7 @@ namespace Ewide.Application
public string CompetentDepartment { get; set; } public string CompetentDepartment { get; set; }
#endregion #endregion
public DataStatus StateDataStatus { get; set; } public int State { get; set; }
public int State
{
get
{
return (int)StateDataStatus;
}
}
} }
public class HouseInfoInputSave public class HouseInfoInputSave

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

@@ -131,7 +131,7 @@ WHERE HC.Id=@HouseCodeId", new { houseTask.HouseCodeId }
//判断房屋建档状态 //判断房屋建档状态
//dataStatus == DataStatus.Saved 若是保存操作 则判断是新增/更新 //dataStatus == DataStatus.Saved 若是保存操作 则判断是新增/更新
//判断是新增/更新 根据传入参数dataStatus确定 //判断是新增/更新 根据传入参数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<BsHouseInfo>(); var houseInfo = input.houseInfo.Adapt<BsHouseInfo>();
houseInfo.HouseCodeId = input.houseCode.Id; houseInfo.HouseCodeId = input.houseCode.Id;
@@ -154,18 +154,5 @@ WHERE HC.Id=@HouseCodeId", new { houseTask.HouseCodeId }
await checkRecord.InsertAsync(); 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,
};
}
} }
} }

4
Api/Ewide.Application/Service/HouseSafety/HouseSelector/HouseSelectorService.cs
View File

@@ -44,7 +44,7 @@ namespace Ewide.Application.Service
/// <summary> /// <summary>
/// 获取人员允许绑定的房屋编码列表 /// 获取人员允许绑定的房屋编码列表
/// </summary> /// </summary>
/// <param name="userId"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("/houseSelector/selectorPage")] [HttpPost("/houseSelector/selectorPage")]
public async Task<dynamic> HouseSelectorList([FromBody] QueryHouseSelectorInput input) public async Task<dynamic> HouseSelectorList([FromBody] QueryHouseSelectorInput input)
@@ -71,7 +71,7 @@ WHERE HM.Id IS NULL";
/// <summary> /// <summary>
/// 获取人员已经绑定的房屋编码列表 /// 获取人员已经绑定的房屋编码列表
/// </summary> /// </summary>
/// <param name="userId"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("/houseSelector/selectedPage")] [HttpPost("/houseSelector/selectedPage")]
public async Task<dynamic> HouseSelectedList([FromBody] QueryHouseSelectorInput input) public async Task<dynamic> HouseSelectedList([FromBody] QueryHouseSelectorInput input)