update 项目管理

This commit is contained in:
2021-05-06 19:21:14 +08:00
parent aa32dcf8e7
commit 3cca6b0e48
9 changed files with 341 additions and 72 deletions

View File

@@ -23,7 +23,7 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Ewide.Application.Service.HouseProjectInfo.HouseProjectInfoService.UpdateProject(Ewide.Application.Service.HouseProjectInfo.Dto.AddProjectInput)">
<member name="M:Ewide.Application.Service.HouseProjectInfo.HouseProjectInfoService.UpdateProject(Ewide.Application.Service.HouseProjectInfo.Dto.UpdateProjectInput)">
<summary>
编辑项目
</summary>

View File

@@ -13,39 +13,27 @@ namespace Ewide.Application.Service.HouseProjectInfo.Dto
public string Name { get; set; }
public string Note { get; set; }
public int Sort { get; set; }
public string AreaID { get; set; }
public string AreaId { get; set; }
public string AreaName { get; set; }
public int Type { get; set; }
public DateTime? CreatedTime { get; set; }
public DateTime? UpdatedTime { get; set; }
public string CreatedUserId { get; set; }
public string CreatedUserName { get; set; }
public string UpdatedUserId { get; set; }
public string UpdatedUserName { get; set; }
}
public class AddProjectInput : HouseProjectInfoInput
{
[Required(ErrorMessage = "项目ID不可为空")]
public string ID { get; set; }
}
public class UpdateProjectInput
public class UpdateProjectInput : HouseProjectInfoInput
{
public string ID { get; set; }
public string Note { get; set; }
public int Type { get; set; }
public DateTime? UpdatedTime { get; set; }
public string UpdatedUserId { get; set; }
public string UpdatedUserName { get; set; }
[Required(ErrorMessage = "项目ID不可为空")]
public string Id { get; set; }
}
public class DeleteProjectInput
{
[Required(ErrorMessage = "项目ID不可为空")]
public string ID { get; set; }
public string Id { get; set; }
}
public class QueryProjectInput : AddProjectInput
public class QueryProjectInput : UpdateProjectInput
{
}

View File

@@ -8,18 +8,12 @@ namespace Ewide.Application.Service.HouseProjectInfo.Dto
{
public class HouseProjectOutput
{
public string ID { get; set; }
public string Id { get; set; }
public string Name { get; set; }
public string Note { get; set; }
public int Sort { get; set; }
public string AreaID { get; set; }
public string AreaId { get; set; }
public string AreaName { get; set; }
public int Type { get; set; }
public DateTime CreatedTime { get; set; }
public DateTime UpdatedTime { get; set; }
public string CreatedUserId { get; set; }
public string CreatedUserName { get; set; }
public string UpdatedUserId { get; set; }
public string UpdatedUserName { get; set; }
}
}

View File

@@ -50,7 +50,7 @@ namespace Ewide.Application.Service.HouseProjectInfo
[HttpPost("/houseProjectInfo/delete")]
public async Task DeleteProject(DeleteProjectInput input)
{
var project = _houseProjectInfoRep.FirstOrDefault(p => p.Id == input.ID) ;
var project = _houseProjectInfoRep.FirstOrDefault(p => p.Id == input.Id) ;
await project.DeleteNowAsync();
}
@@ -60,10 +60,10 @@ namespace Ewide.Application.Service.HouseProjectInfo
/// <param name="input"></param>
/// <returns></returns>
[HttpPost("/houseProjectInfo/edit")]
public async Task UpdateProject(AddProjectInput input)
public async Task UpdateProject(UpdateProjectInput input)
{
var project = input.Adapt<BsHouseProjectInfo>();
await project.UpdateNowAsync();
await project.UpdateExcludeAsync(new[] { nameof(BsHouseProjectInfo.AreaId), nameof(BsHouseProjectInfo.AreaName)}, true);
}
/// <summary>
@@ -82,14 +82,14 @@ namespace Ewide.Application.Service.HouseProjectInfo
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpGet("/houseProjectInfo/page")]
public async Task<dynamic> QueryProjectPageList([FromQuery] HouseProjectInfoInput input)
[HttpPost("/houseProjectInfo/page")]
public async Task<dynamic> QueryProjectPageList([FromBody] HouseProjectInfoInput input)
{
var areaID = !string.IsNullOrEmpty(input.AreaID);
var areaID = !string.IsNullOrEmpty(input.AreaId);
var projects = await _houseProjectInfoRep.DetachedEntities
.Where(areaID, p => p.AreaId == input.AreaID)
.Select(p => p.Adapt<BsHouseProjectInfo>()).ToPagedListAsync(input.PageNo, input.PageSize);
return XnPageResult<BsHouseProjectInfo>.PageResult(projects);
.Where(areaID, p => p.AreaId == input.AreaId)
.Select(p => p.Adapt<HouseProjectOutput>()).ToPagedListAsync(input.PageNo, input.PageSize);
return XnPageResult<HouseProjectOutput>.PageResult(projects);
}
/// <summary>
@@ -100,7 +100,7 @@ namespace Ewide.Application.Service.HouseProjectInfo
[HttpGet("/houseProjectInfo/detail")]
public async Task<dynamic> GetProject([FromQuery] QueryProjectInput input)
{
var user = await _houseProjectInfoRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id == input.ID);
var user = await _houseProjectInfoRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id == input.Id);
var userDto = user.Adapt<UserOutput>();
return userDto;

View File

@@ -13,7 +13,7 @@ namespace Ewide.Application.Service.HouseProjectInfo
{
Task AddProject(AddProjectInput input);
Task DeleteProject(DeleteProjectInput input);
Task UpdateProject(AddProjectInput input);
Task UpdateProject(UpdateProjectInput input);
Task<BsHouseProjectInfo> GetProjectById([FromRoute] string id);
Task<dynamic> GetProject([FromQuery] QueryProjectInput input);
Task<dynamic> QueryProjectPageList([FromQuery] HouseProjectInfoInput input);