diff --git a/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyApp.cs b/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyApp.cs index 01353e0..83ed66f 100644 --- a/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyApp.cs +++ b/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyApp.cs @@ -574,7 +574,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage public async Task ProjectMaintain(DroneSsnydEditReq req) { - // todo shp 解析 + // shp 解析 var project = req.MapTo(); var oldProject = await Repository.GetByIdAsync(project.Id); using var uow = base.UnitWork.CreateContext(); @@ -609,8 +609,8 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage var list = await Repository .ChangeRepository>() .AsQueryable() - .LeftJoin((a, b) => a.Id == b.ProcessId) - .LeftJoin((a, b,c) => a.ssnyd_id == c.ProcessId) + .LeftJoin((a, b) => a.Id == b.ProcessId && b.State == 1) + .LeftJoin((a, b,c) => a.ssnyd_id == c.ProcessId && c.State == 1) .Where((a, b) => a.ssnyd_id == req.ProjectId) .WhereIF(req.IsLishi != null, (a, b) => a.is_lishi == req.IsLishi) .OrderBy((a, b) => a.create_time, OrderByType.Desc) diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyController.cs index 233e6d0..476174e 100644 --- a/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyController.cs +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyController.cs @@ -109,28 +109,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers return response; } - /// - /// 监管信息列表 - /// - /// - /// - [HttpGet] - public async Task>>> ProjectSupervise( - [FromQuery] DroneSsnydRcjgPageReq req) - { - var response = new Response>>(); - try - { - response.Result = await droneSsnyApp.ProjectSupervise(req); - } - catch (Exception ex) - { - response.Code = 500; - response.Message = ex.InnerException?.Message ?? ex.Message; - } - - return response; - } /// /// 项目变更列表 @@ -154,6 +132,29 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers return response; } + /// + /// 监管信息列表 + /// + /// + /// + [HttpGet] + public async Task>>> ProjectSupervise( + [FromQuery] DroneSsnydRcjgPageReq req) + { + var response = new Response>>(); + try + { + response.Result = await droneSsnyApp.ProjectSupervise(req); + } + catch (Exception ex) + { + response.Code = 500; + response.Message = ex.InnerException?.Message ?? ex.Message; + } + + return response; + } + /// /// 项目维护 ///