|
@@ -236,7 +236,8 @@ public class OrderController : BaseController
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[Permission(EPermission.PublishOrder)]
|
|
[Permission(EPermission.PublishOrder)]
|
|
[HttpPost("publish")]
|
|
[HttpPost("publish")]
|
|
- public async Task PublishOrder([FromBody] PublishOrderDto dto)
|
|
|
|
|
|
+ [LogFilter("发布工单")]
|
|
|
|
+ public async Task PublishOrder([FromBody] PublishOrderDto dto)
|
|
{
|
|
{
|
|
//验证订单
|
|
//验证订单
|
|
var order = await _orderRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
var order = await _orderRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
@@ -415,7 +416,8 @@ public class OrderController : BaseController
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[Permission(EPermission.PublishedModify)]
|
|
[Permission(EPermission.PublishedModify)]
|
|
[HttpPost("published-order-modify")]
|
|
[HttpPost("published-order-modify")]
|
|
- public async Task PublishedModify([FromBody] PublishOrderModifyDto dto)
|
|
|
|
|
|
+ [LogFilter("修改发布内容")]
|
|
|
|
+ public async Task PublishedModify([FromBody] PublishOrderModifyDto dto)
|
|
{
|
|
{
|
|
var publishOrder = await _orderPublishRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
var publishOrder = await _orderPublishRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
|
|
|
|
@@ -563,7 +565,8 @@ public class OrderController : BaseController
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[Permission(EPermission.Visit)]
|
|
[Permission(EPermission.Visit)]
|
|
[HttpPost("visit")]
|
|
[HttpPost("visit")]
|
|
- public async Task Visit([FromBody] VisitDto dto)
|
|
|
|
|
|
+ [LogFilter("工单回访")]
|
|
|
|
+ public async Task Visit([FromBody] VisitDto dto)
|
|
{
|
|
{
|
|
//var visit = await _orderVisitRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
//var visit = await _orderVisitRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
var visit = await _orderVisitRepository.Queryable()
|
|
var visit = await _orderVisitRepository.Queryable()
|
|
@@ -726,7 +729,8 @@ public class OrderController : BaseController
|
|
/// <exception cref="UserFriendlyException"></exception>
|
|
/// <exception cref="UserFriendlyException"></exception>
|
|
[Permission(EPermission.ApplyOrderVisit)]
|
|
[Permission(EPermission.ApplyOrderVisit)]
|
|
[HttpPost("visitapply/add")]
|
|
[HttpPost("visitapply/add")]
|
|
- public async Task ApplyOrderVisit([FromBody] AddVisitApplyDto dto)
|
|
|
|
|
|
+ [LogFilter("新增工单二次回访申请")]
|
|
|
|
+ public async Task ApplyOrderVisit([FromBody] AddVisitApplyDto dto)
|
|
{
|
|
{
|
|
var orderVisitApply = _mapper.Map<OrderVisitApply>(dto);
|
|
var orderVisitApply = _mapper.Map<OrderVisitApply>(dto);
|
|
//验证是否可以申请二次回访
|
|
//验证是否可以申请二次回访
|
|
@@ -763,7 +767,8 @@ public class OrderController : BaseController
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[Permission(EPermission.ExaminOrderVisit)]
|
|
[Permission(EPermission.ExaminOrderVisit)]
|
|
[HttpPost("visitapply/examin")]
|
|
[HttpPost("visitapply/examin")]
|
|
- public async Task ExaminOrderVisit([FromBody] ExaminOrderVisitDto dto)
|
|
|
|
|
|
+ [LogFilter("新增工单二次回访审核")]
|
|
|
|
+ public async Task ExaminOrderVisit([FromBody] ExaminOrderVisitDto dto)
|
|
{
|
|
{
|
|
//获取二次回访申请
|
|
//获取二次回访申请
|
|
var visitApplyModel = await _orderVisitApplyRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
var visitApplyModel = await _orderVisitApplyRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
@@ -932,7 +937,8 @@ public class OrderController : BaseController
|
|
/// 发起重办
|
|
/// 发起重办
|
|
/// </summary>
|
|
/// </summary>
|
|
[HttpPost("redo")]
|
|
[HttpPost("redo")]
|
|
- public async Task<string> AddRedo([FromBody] OrderRedoStartFlowDto dto)
|
|
|
|
|
|
+ [LogFilter("新增工单重办")]
|
|
|
|
+ public async Task<string> AddRedo([FromBody] OrderRedoStartFlowDto dto)
|
|
{
|
|
{
|
|
var redo = _mapper.Map<OrderRedo>(dto.Data);
|
|
var redo = _mapper.Map<OrderRedo>(dto.Data);
|
|
redo.CreatorName = _sessionContext.UserName ?? string.Empty;
|
|
redo.CreatorName = _sessionContext.UserName ?? string.Empty;
|
|
@@ -1013,7 +1019,8 @@ public class OrderController : BaseController
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
//[Permission(EPermission.ApplyDelay)]
|
|
//[Permission(EPermission.ApplyDelay)]
|
|
[HttpPost("delay")]
|
|
[HttpPost("delay")]
|
|
- public async Task ApplyDelay([FromBody] DelayStartFlowDto dto)
|
|
|
|
|
|
+ [LogFilter("新增工单延期申请")]
|
|
|
|
+ public async Task ApplyDelay([FromBody] DelayStartFlowDto dto)
|
|
{
|
|
{
|
|
var delaydto = dto.Data;
|
|
var delaydto = dto.Data;
|
|
|
|
|
|
@@ -1253,7 +1260,8 @@ public class OrderController : BaseController
|
|
/// </summary>
|
|
/// </summary>
|
|
[Permission(EPermission.ApplyScreen)]
|
|
[Permission(EPermission.ApplyScreen)]
|
|
[HttpPost("screen/startflow")]
|
|
[HttpPost("screen/startflow")]
|
|
- public async Task StartFlow([FromBody] ScreenStartFlowDto dto)
|
|
|
|
|
|
+ [LogFilter("开始工单甄别流程")]
|
|
|
|
+ public async Task StartFlow([FromBody] ScreenStartFlowDto dto)
|
|
{
|
|
{
|
|
var screenAny = await _orderScreenRepository.AnyAsync(x =>
|
|
var screenAny = await _orderScreenRepository.AnyAsync(x =>
|
|
x.VisitDetailId == dto.Data.VisitDetailId &&
|
|
x.VisitDetailId == dto.Data.VisitDetailId &&
|
|
@@ -1402,7 +1410,8 @@ public class OrderController : BaseController
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[Permission(EPermission.ApplySupervise)]
|
|
[Permission(EPermission.ApplySupervise)]
|
|
[HttpPost("supervise/apply")]
|
|
[HttpPost("supervise/apply")]
|
|
- public async Task ApplySupervise([FromBody] ApplyOrderSuperviseDto dto)
|
|
|
|
|
|
+ [LogFilter("新增工单督办")]
|
|
|
|
+ public async Task ApplySupervise([FromBody] ApplyOrderSuperviseDto dto)
|
|
{
|
|
{
|
|
if (!dto.SuperviseOrgDtos.Any())
|
|
if (!dto.SuperviseOrgDtos.Any())
|
|
throw UserFriendlyException.SameMessage("请选择被督办部门");
|
|
throw UserFriendlyException.SameMessage("请选择被督办部门");
|
|
@@ -1468,7 +1477,8 @@ public class OrderController : BaseController
|
|
/// <param name="dto"></param>
|
|
/// <param name="dto"></param>
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[HttpPost("supervise/reply")]
|
|
[HttpPost("supervise/reply")]
|
|
- public async Task ReplySupervise([FromBody] ReplyOrderSuperviseDto dto)
|
|
|
|
|
|
+ [LogFilter("回复工单督办")]
|
|
|
|
+ public async Task ReplySupervise([FromBody] ReplyOrderSuperviseDto dto)
|
|
{
|
|
{
|
|
//验证是否存在督办
|
|
//验证是否存在督办
|
|
var supervise = await _orderSuperviseRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
var supervise = await _orderSuperviseRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
@@ -1519,7 +1529,8 @@ public class OrderController : BaseController
|
|
/// <param name="dto"></param>
|
|
/// <param name="dto"></param>
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[HttpPost("supervise/sign")]
|
|
[HttpPost("supervise/sign")]
|
|
- public async Task SignSupervise([FromBody] SignOrderSuperviseDto dto)
|
|
|
|
|
|
+ [LogFilter("签收工单督办")]
|
|
|
|
+ public async Task SignSupervise([FromBody] SignOrderSuperviseDto dto)
|
|
{
|
|
{
|
|
//验证是否存在督办
|
|
//验证是否存在督办
|
|
var supervise = await _orderSuperviseRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
var supervise = await _orderSuperviseRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
@@ -1618,7 +1629,8 @@ public class OrderController : BaseController
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[Permission(EPermission.ApplyUrge)]
|
|
[Permission(EPermission.ApplyUrge)]
|
|
[HttpPost("urge/apply")]
|
|
[HttpPost("urge/apply")]
|
|
- public async Task ApplyUrge([FromBody] ApplyOrderUrgeDto dto)
|
|
|
|
|
|
+ [LogFilter("新增工单催办")]
|
|
|
|
+ public async Task ApplyUrge([FromBody] ApplyOrderUrgeDto dto)
|
|
{
|
|
{
|
|
if (!dto.UrgeOrgDtos.Any())
|
|
if (!dto.UrgeOrgDtos.Any())
|
|
throw UserFriendlyException.SameMessage("请选择被催办部门");
|
|
throw UserFriendlyException.SameMessage("请选择被催办部门");
|
|
@@ -1670,7 +1682,8 @@ public class OrderController : BaseController
|
|
/// <param name="dto"></param>
|
|
/// <param name="dto"></param>
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[HttpPost("urge/reply")]
|
|
[HttpPost("urge/reply")]
|
|
- public async Task ReplyUrge([FromBody] ReplyOrderUrgeDto dto)
|
|
|
|
|
|
+ [LogFilter("回复工单催办")]
|
|
|
|
+ public async Task ReplyUrge([FromBody] ReplyOrderUrgeDto dto)
|
|
{
|
|
{
|
|
//验证是否存在催办
|
|
//验证是否存在催办
|
|
var urge = await _orderUrgeRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
var urge = await _orderUrgeRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
@@ -1696,7 +1709,8 @@ public class OrderController : BaseController
|
|
/// <param name="dto"></param>
|
|
/// <param name="dto"></param>
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[HttpPost("urge/sign")]
|
|
[HttpPost("urge/sign")]
|
|
- public async Task SignUrge([FromBody] SignOrderUrgeDto dto)
|
|
|
|
|
|
+ [LogFilter("签收工单催办")]
|
|
|
|
+ public async Task SignUrge([FromBody] SignOrderUrgeDto dto)
|
|
{
|
|
{
|
|
//验证是否存在催办
|
|
//验证是否存在催办
|
|
var urge = await _orderUrgeRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
var urge = await _orderUrgeRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
@@ -1869,7 +1883,8 @@ public class OrderController : BaseController
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[Permission(EPermission.OrderAdd)]
|
|
[Permission(EPermission.OrderAdd)]
|
|
[HttpPost]
|
|
[HttpPost]
|
|
- public async Task<string> Add([FromBody] AddOrderDto dto)
|
|
|
|
|
|
+ [LogFilter("新增工单")]
|
|
|
|
+ public async Task<string> Add([FromBody] AddOrderDto dto)
|
|
{
|
|
{
|
|
//todo dto validation
|
|
//todo dto validation
|
|
|
|
|
|
@@ -1932,7 +1947,8 @@ public class OrderController : BaseController
|
|
/// <param name="id"></param>
|
|
/// <param name="id"></param>
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[HttpDelete("{id}")]
|
|
[HttpDelete("{id}")]
|
|
- public async Task Remove(string id)
|
|
|
|
|
|
+ [LogFilter("删除工单")]
|
|
|
|
+ public async Task Remove(string id)
|
|
{
|
|
{
|
|
var order = await _orderRepository.GetAsync(id, HttpContext.RequestAborted);
|
|
var order = await _orderRepository.GetAsync(id, HttpContext.RequestAborted);
|
|
if (order == null) return;
|
|
if (order == null) return;
|
|
@@ -1948,7 +1964,8 @@ public class OrderController : BaseController
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[Permission(EPermission.OrderUpdate)]
|
|
[Permission(EPermission.OrderUpdate)]
|
|
[HttpPut]
|
|
[HttpPut]
|
|
- public async Task Update([FromBody] UpdateOrderDto dto)
|
|
|
|
|
|
+ [LogFilter("更新工单")]
|
|
|
|
+ public async Task Update([FromBody] UpdateOrderDto dto)
|
|
{
|
|
{
|
|
var order = await _orderRepository.Queryable()
|
|
var order = await _orderRepository.Queryable()
|
|
.FirstAsync(d => d.Id == dto.Id);
|
|
.FirstAsync(d => d.Id == dto.Id);
|
|
@@ -2245,7 +2262,8 @@ public class OrderController : BaseController
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[Permission(EPermission.ApplySendBack)]
|
|
[Permission(EPermission.ApplySendBack)]
|
|
[HttpPost("send_back/apply")]
|
|
[HttpPost("send_back/apply")]
|
|
- public async Task ApplyUrge([FromBody] OrderSendBackAddDto dto)
|
|
|
|
|
|
+ [LogFilter("新增工单退回申请")]
|
|
|
|
+ public async Task ApplyUrge([FromBody] OrderSendBackAddDto dto)
|
|
{
|
|
{
|
|
//验证工单是否可以申请
|
|
//验证工单是否可以申请
|
|
var order = await _orderRepository.GetAsync(dto.OrderId, HttpContext.RequestAborted);
|
|
var order = await _orderRepository.GetAsync(dto.OrderId, HttpContext.RequestAborted);
|
|
@@ -2276,7 +2294,8 @@ public class OrderController : BaseController
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[Permission(EPermission.AuditSendBack)]
|
|
[Permission(EPermission.AuditSendBack)]
|
|
[HttpPost("send_back/audit")]
|
|
[HttpPost("send_back/audit")]
|
|
- public async Task ReplyUrge([FromBody] AuditOrderSendBackDto dto)
|
|
|
|
|
|
+ [LogFilter("审核工单退回申请")]
|
|
|
|
+ public async Task ReplyUrge([FromBody] AuditOrderSendBackDto dto)
|
|
{
|
|
{
|
|
//验证是否存在退回
|
|
//验证是否存在退回
|
|
var sendBack = await _orderSendBackRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
var sendBack = await _orderSendBackRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
@@ -2334,7 +2353,8 @@ public class OrderController : BaseController
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[Permission(EPermission.ApplySpecial)]
|
|
[Permission(EPermission.ApplySpecial)]
|
|
[HttpPost("special")]
|
|
[HttpPost("special")]
|
|
- public async Task Add([FromBody] OrderSpecialAddDto dto)
|
|
|
|
|
|
+ [LogFilter("新增工单特提")]
|
|
|
|
+ public async Task Add([FromBody] OrderSpecialAddDto dto)
|
|
{
|
|
{
|
|
var specialAny = await _orderSpecialRepository.Queryable().Where(x => x.OrderId == dto.OrderId && x.State == 0)
|
|
var specialAny = await _orderSpecialRepository.Queryable().Where(x => x.OrderId == dto.OrderId && x.State == 0)
|
|
.AnyAsync();
|
|
.AnyAsync();
|
|
@@ -2413,7 +2433,8 @@ public class OrderController : BaseController
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[Permission(EPermission.AuditSpecial)]
|
|
[Permission(EPermission.AuditSpecial)]
|
|
[HttpPut("special")]
|
|
[HttpPut("special")]
|
|
- public async Task Update([FromBody] AuditOrderSpecialDto dto)
|
|
|
|
|
|
+ [LogFilter("审批工单特提")]
|
|
|
|
+ public async Task Update([FromBody] AuditOrderSpecialDto dto)
|
|
{
|
|
{
|
|
var special = await _orderSpecialRepository.GetAsync(dto.Id);
|
|
var special = await _orderSpecialRepository.GetAsync(dto.Id);
|
|
if (special is null) throw UserFriendlyException.SameMessage("无效特提审批信息!");
|
|
if (special is null) throw UserFriendlyException.SameMessage("无效特提审批信息!");
|
|
@@ -2592,7 +2613,8 @@ public class OrderController : BaseController
|
|
/// <param name="dtos"></param>
|
|
/// <param name="dtos"></param>
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[HttpPost("citizen")]
|
|
[HttpPost("citizen")]
|
|
- public async Task Add([FromBody] CitizenAddDto dto)
|
|
|
|
|
|
+ [LogFilter("新增市民信息")]
|
|
|
|
+ public async Task Add([FromBody] CitizenAddDto dto)
|
|
{
|
|
{
|
|
var citizen =
|
|
var citizen =
|
|
await _citizenRepository.CountAsync(x => x.PhoneNumber == dto.PhoneNumber, HttpContext.RequestAborted);
|
|
await _citizenRepository.CountAsync(x => x.PhoneNumber == dto.PhoneNumber, HttpContext.RequestAborted);
|
|
@@ -2608,7 +2630,8 @@ public class OrderController : BaseController
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[Permission(EPermission.DeleteCitizen)]
|
|
[Permission(EPermission.DeleteCitizen)]
|
|
[HttpDelete("citizen")]
|
|
[HttpDelete("citizen")]
|
|
- public async Task Delete([FromBody] CitizenDeleteDto dto)
|
|
|
|
|
|
+ [LogFilter("删除市民信息")]
|
|
|
|
+ public async Task Delete([FromBody] CitizenDeleteDto dto)
|
|
{
|
|
{
|
|
await _citizenRepository.RemoveAsync(x => x.Id == dto.Id);
|
|
await _citizenRepository.RemoveAsync(x => x.Id == dto.Id);
|
|
}
|
|
}
|
|
@@ -2620,7 +2643,8 @@ public class OrderController : BaseController
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[Permission(EPermission.UpdateCitizen)]
|
|
[Permission(EPermission.UpdateCitizen)]
|
|
[HttpPut("citizen")]
|
|
[HttpPut("citizen")]
|
|
- public async Task Update([FromBody] CitizenUpdateDto dto)
|
|
|
|
|
|
+ [LogFilter("更新市民信息")]
|
|
|
|
+ public async Task Update([FromBody] CitizenUpdateDto dto)
|
|
{
|
|
{
|
|
var citizen = await _citizenRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
var citizen = await _citizenRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
if (citizen is null)
|
|
if (citizen is null)
|
|
@@ -2765,7 +2789,8 @@ public class OrderController : BaseController
|
|
/// <param name="dtos"></param>
|
|
/// <param name="dtos"></param>
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[HttpPost("repeatable_event")]
|
|
[HttpPost("repeatable_event")]
|
|
- public async Task Add([FromBody] RepeatableEventAddDto dto)
|
|
|
|
|
|
+ [LogFilter("新增重复性事件")]
|
|
|
|
+ public async Task Add([FromBody] RepeatableEventAddDto dto)
|
|
{
|
|
{
|
|
var repeatable = _mapper.Map<RepeatableEvent>(dto);
|
|
var repeatable = _mapper.Map<RepeatableEvent>(dto);
|
|
var repeatableId = await _repeatableEventRepository.AddAsync(repeatable, HttpContext.RequestAborted);
|
|
var repeatableId = await _repeatableEventRepository.AddAsync(repeatable, HttpContext.RequestAborted);
|
|
@@ -2783,7 +2808,8 @@ public class OrderController : BaseController
|
|
/// <param name="dto"></param>
|
|
/// <param name="dto"></param>
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[HttpDelete("repeatable_event")]
|
|
[HttpDelete("repeatable_event")]
|
|
- public async Task Delete([FromBody] RepeatableEventDeleteDto dto)
|
|
|
|
|
|
+ [LogFilter("删除重复性事件")]
|
|
|
|
+ public async Task Delete([FromBody] RepeatableEventDeleteDto dto)
|
|
{
|
|
{
|
|
await _repeatableEventRepository.RemoveAsync(x => x.Id == dto.Id);
|
|
await _repeatableEventRepository.RemoveAsync(x => x.Id == dto.Id);
|
|
await _repeatableEventDetailRepository.RemoveAsync(x => x.RepeatableId == dto.Id);
|
|
await _repeatableEventDetailRepository.RemoveAsync(x => x.RepeatableId == dto.Id);
|
|
@@ -2795,7 +2821,8 @@ public class OrderController : BaseController
|
|
/// <param name="dto"></param>
|
|
/// <param name="dto"></param>
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[HttpDelete("repeatable_event_detail/{id}")]
|
|
[HttpDelete("repeatable_event_detail/{id}")]
|
|
- public async Task Delete([FromBody] string id)
|
|
|
|
|
|
+ [LogFilter("删除重复性事件")]
|
|
|
|
+ public async Task Delete([FromBody] string id)
|
|
{
|
|
{
|
|
await _repeatableEventDetailRepository.RemoveAsync(x => x.Id == id);
|
|
await _repeatableEventDetailRepository.RemoveAsync(x => x.Id == id);
|
|
}
|
|
}
|
|
@@ -2807,7 +2834,8 @@ public class OrderController : BaseController
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[Permission(EPermission.UpdateRepeatableEvent)]
|
|
[Permission(EPermission.UpdateRepeatableEvent)]
|
|
[HttpPut("repeatable_event")]
|
|
[HttpPut("repeatable_event")]
|
|
- public async Task Update([FromBody] RepeatableEventUpdateDto dto)
|
|
|
|
|
|
+ [LogFilter("更新重复性事件")]
|
|
|
|
+ public async Task Update([FromBody] RepeatableEventUpdateDto dto)
|
|
{
|
|
{
|
|
var repeatable = await _repeatableEventRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
var repeatable = await _repeatableEventRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
if (repeatable is null)
|
|
if (repeatable is null)
|
|
@@ -2874,7 +2902,8 @@ public class OrderController : BaseController
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[Permission(EPermission.AddOrderWord)]
|
|
[Permission(EPermission.AddOrderWord)]
|
|
[HttpPost("order_word")]
|
|
[HttpPost("order_word")]
|
|
- public async Task Add([FromBody] OrderWordAddDto dto)
|
|
|
|
|
|
+ [LogFilter("新增工单词库")]
|
|
|
|
+ public async Task Add([FromBody] OrderWordAddDto dto)
|
|
{
|
|
{
|
|
var word = _mapper.Map<OrderWord>(dto);
|
|
var word = _mapper.Map<OrderWord>(dto);
|
|
await _orderWrodRepository.AddAsync(word, HttpContext.RequestAborted);
|
|
await _orderWrodRepository.AddAsync(word, HttpContext.RequestAborted);
|
|
@@ -2887,7 +2916,8 @@ public class OrderController : BaseController
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[Permission(EPermission.DeleteOrderWord)]
|
|
[Permission(EPermission.DeleteOrderWord)]
|
|
[HttpDelete("order_word")]
|
|
[HttpDelete("order_word")]
|
|
- public async Task Delete([FromBody] OrderWordDeleteDto dto)
|
|
|
|
|
|
+ [LogFilter("删除工单词库")]
|
|
|
|
+ public async Task Delete([FromBody] OrderWordDeleteDto dto)
|
|
{
|
|
{
|
|
await _orderRepository.RemoveOrderWrodBatchAsync(dto.Ids, HttpContext.RequestAborted);
|
|
await _orderRepository.RemoveOrderWrodBatchAsync(dto.Ids, HttpContext.RequestAborted);
|
|
}
|
|
}
|
|
@@ -2899,7 +2929,8 @@ public class OrderController : BaseController
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[Permission(EPermission.UpdateOrderWord)]
|
|
[Permission(EPermission.UpdateOrderWord)]
|
|
[HttpPut("order_word")]
|
|
[HttpPut("order_word")]
|
|
- public async Task Update([FromBody] OrderWordUpdateDto dto)
|
|
|
|
|
|
+ [LogFilter("更新工单词库")]
|
|
|
|
+ public async Task Update([FromBody] OrderWordUpdateDto dto)
|
|
{
|
|
{
|
|
var word = await _orderWrodRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
var word = await _orderWrodRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
if (word is null)
|
|
if (word is null)
|
|
@@ -2964,7 +2995,8 @@ public class OrderController : BaseController
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[Permission(EPermission.AddOrderObserve)]
|
|
[Permission(EPermission.AddOrderObserve)]
|
|
[HttpPost("order_observe")]
|
|
[HttpPost("order_observe")]
|
|
- public async Task Add([FromBody] OrderObserveAddDto dto)
|
|
|
|
|
|
+ [LogFilter("新增工单观察")]
|
|
|
|
+ public async Task Add([FromBody] OrderObserveAddDto dto)
|
|
{
|
|
{
|
|
var ids = dto.OrderIds.Select(x => x.OrderId).ToList();
|
|
var ids = dto.OrderIds.Select(x => x.OrderId).ToList();
|
|
var list = await _orderObserveRepository.Queryable().In(x => x.OrderId, ids).Select(x => x.OrderId)
|
|
var list = await _orderObserveRepository.Queryable().In(x => x.OrderId, ids).Select(x => x.OrderId)
|
|
@@ -2983,7 +3015,8 @@ public class OrderController : BaseController
|
|
/// <param name="dto"></param>
|
|
/// <param name="dto"></param>
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[HttpDelete("order_observe")]
|
|
[HttpDelete("order_observe")]
|
|
- public async Task Delete([FromBody] OrderObserveDeleteDto dto)
|
|
|
|
|
|
+ [LogFilter("删除工单观察")]
|
|
|
|
+ public async Task Delete([FromBody] OrderObserveDeleteDto dto)
|
|
{
|
|
{
|
|
await _orderRepository.RemoveOrderObserveBatchAsync(dto.Ids, HttpContext.RequestAborted);
|
|
await _orderRepository.RemoveOrderObserveBatchAsync(dto.Ids, HttpContext.RequestAborted);
|
|
}
|
|
}
|
|
@@ -2994,7 +3027,8 @@ public class OrderController : BaseController
|
|
/// <param name="dto"></param>
|
|
/// <param name="dto"></param>
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[HttpPut("order_observe")]
|
|
[HttpPut("order_observe")]
|
|
- public async Task Update([FromBody] OrderObserveUpdateDto dto)
|
|
|
|
|
|
+ [LogFilter("更新工单观察")]
|
|
|
|
+ public async Task Update([FromBody] OrderObserveUpdateDto dto)
|
|
{
|
|
{
|
|
var word = await _orderObserveRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
var word = await _orderObserveRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
if (word is null)
|
|
if (word is null)
|
|
@@ -3046,7 +3080,8 @@ public class OrderController : BaseController
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[Permission(EPermission.AddOrderFinality)]
|
|
[Permission(EPermission.AddOrderFinality)]
|
|
[HttpPost("order_finality")]
|
|
[HttpPost("order_finality")]
|
|
- public async Task Add([FromBody] OrderFinalityAddDto dto)
|
|
|
|
|
|
+ [LogFilter("新增工单终结")]
|
|
|
|
+ public async Task Add([FromBody] OrderFinalityAddDto dto)
|
|
{
|
|
{
|
|
var ids = dto.OrderIds.Select(x => x.OrderId).ToList();
|
|
var ids = dto.OrderIds.Select(x => x.OrderId).ToList();
|
|
var list = await _orderFinalityRepository.Queryable().In(x => x.OrderId, ids).Select(x => x.OrderId)
|
|
var list = await _orderFinalityRepository.Queryable().In(x => x.OrderId, ids).Select(x => x.OrderId)
|
|
@@ -3065,7 +3100,8 @@ public class OrderController : BaseController
|
|
/// <param name="dto"></param>
|
|
/// <param name="dto"></param>
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[HttpDelete("order_finality")]
|
|
[HttpDelete("order_finality")]
|
|
- public async Task Delete([FromBody] OrderFinalityDeleteDto dto)
|
|
|
|
|
|
+ [LogFilter("删除工单终结")]
|
|
|
|
+ public async Task Delete([FromBody] OrderFinalityDeleteDto dto)
|
|
{
|
|
{
|
|
await _orderRepository.RemoveOrderFinalityBatchAsync(dto.Ids, HttpContext.RequestAborted);
|
|
await _orderRepository.RemoveOrderFinalityBatchAsync(dto.Ids, HttpContext.RequestAborted);
|
|
}
|
|
}
|
|
@@ -3076,7 +3112,8 @@ public class OrderController : BaseController
|
|
/// <param name="dto"></param>
|
|
/// <param name="dto"></param>
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[HttpPut("order_finality")]
|
|
[HttpPut("order_finality")]
|
|
- public async Task Update([FromBody] OrderFinalityUpdateDto dto)
|
|
|
|
|
|
+ [LogFilter("更新工单终结")]
|
|
|
|
+ public async Task Update([FromBody] OrderFinalityUpdateDto dto)
|
|
{
|
|
{
|
|
var word = await _orderFinalityRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
var word = await _orderFinalityRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
if (word is null)
|
|
if (word is null)
|
|
@@ -3173,7 +3210,8 @@ public class OrderController : BaseController
|
|
/// 工单签收
|
|
/// 工单签收
|
|
/// </summary>
|
|
/// </summary>
|
|
[HttpPost("sign/{orderId}")]
|
|
[HttpPost("sign/{orderId}")]
|
|
- public async Task Sign(string orderId)
|
|
|
|
|
|
+ [LogFilter("工单签收")]
|
|
|
|
+ public async Task Sign(string orderId)
|
|
{
|
|
{
|
|
var order = await _orderRepository.GetAsync(orderId, HttpContext.RequestAborted);
|
|
var order = await _orderRepository.GetAsync(orderId, HttpContext.RequestAborted);
|
|
if (order == null)
|
|
if (order == null)
|
|
@@ -3194,8 +3232,7 @@ public class OrderController : BaseController
|
|
/// <param name="dto"></param>
|
|
/// <param name="dto"></param>
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[HttpGet("enterprise/list")]
|
|
[HttpGet("enterprise/list")]
|
|
- //[ServiceFilter(typeof(LogFilterAttribute))]
|
|
|
|
- //[LogFilterAttribute("查询企业列表")]
|
|
|
|
|
|
+ [LogFilter("查询企业列表")]
|
|
public async Task<EnterpriseListData> GetEnterpriseList([FromQuery] PagedKeywordRequest dto)
|
|
public async Task<EnterpriseListData> GetEnterpriseList([FromQuery] PagedKeywordRequest dto)
|
|
{
|
|
{
|
|
return await _enterpriseService.GetEnterpriseList(dto.Keyword!, dto.PageIndex, dto.PageSize, HttpContext.RequestAborted, _cacheResponse);
|
|
return await _enterpriseService.GetEnterpriseList(dto.Keyword!, dto.PageIndex, dto.PageSize, HttpContext.RequestAborted, _cacheResponse);
|