|
@@ -1884,19 +1884,19 @@ public class OrderController : BaseController
|
|
[HttpGet("screen")]
|
|
[HttpGet("screen")]
|
|
public async Task<PagedDto<OrderScreenListDto>> ScreenList([FromQuery] ScreenListDto dto)
|
|
public async Task<PagedDto<OrderScreenListDto>> ScreenList([FromQuery] ScreenListDto dto)
|
|
{
|
|
{
|
|
- var handler = dto.Status is EScreenStatus.Apply;
|
|
|
|
- ISugarQueryable<OrderScreen> query;
|
|
|
|
- if (dto.source == 1)
|
|
|
|
- {
|
|
|
|
- query = _orderScreenRepository.Queryable(hasHandled: !handler);
|
|
|
|
- }
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
- query = _orderScreenRepository.Queryable()
|
|
|
|
- .Where(x => x.CreatorOrgId.StartsWith(_sessionContext.RequiredOrgId));
|
|
|
|
- }
|
|
|
|
- query = query.Includes(d => d.Order)
|
|
|
|
- .Includes(d => d.Order)
|
|
|
|
|
|
+ var handler = dto.Status is EScreenStatus.Apply;
|
|
|
|
+ ISugarQueryable<OrderScreen> query;
|
|
|
|
+ if (dto.source == 1)
|
|
|
|
+ {
|
|
|
|
+ query = _orderScreenRepository.Queryable(hasHandled: !handler);
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ query = _orderScreenRepository.Queryable()
|
|
|
|
+ .Where(x => x.CreatorOrgId.StartsWith(_sessionContext.RequiredOrgId));
|
|
|
|
+ }
|
|
|
|
+ query = query.Includes(d => d.Order)
|
|
|
|
+ .Includes(d => d.Order)
|
|
.Includes(d => d.VisitDetail)
|
|
.Includes(d => d.VisitDetail)
|
|
.Includes(d => d.Visit, v => v.Order)
|
|
.Includes(d => d.Visit, v => v.Order)
|
|
.Includes(d => d.Workflow)
|
|
.Includes(d => d.Workflow)
|
|
@@ -2039,7 +2039,7 @@ public class OrderController : BaseController
|
|
screen.TypeDicId = dto.Data.TypeDicId;
|
|
screen.TypeDicId = dto.Data.TypeDicId;
|
|
screen.TypeDicName = dto.Data.TypeDicName;
|
|
screen.TypeDicName = dto.Data.TypeDicName;
|
|
screen.SendBackApply = false;
|
|
screen.SendBackApply = false;
|
|
- screen.SendBackApplyNum++;
|
|
|
|
|
|
+ screen.SendBackApplyNum++;
|
|
await _orderScreenRepository.UpdateAsync(screen, HttpContext.RequestAborted);
|
|
await _orderScreenRepository.UpdateAsync(screen, HttpContext.RequestAborted);
|
|
try
|
|
try
|
|
{
|
|
{
|
|
@@ -3272,7 +3272,7 @@ public class OrderController : BaseController
|
|
canUpdateOrderSender);
|
|
canUpdateOrderSender);
|
|
//发送短信即将超期
|
|
//发送短信即将超期
|
|
_capPublisher.PublishDelay(expiredTimeConfig.NearlyExpiredTime - DateTime.Now, EventNames.HotlineOrderNearlyExpiredTimeSms, new PublishNearlyExpiredTimeSmsDto() { OrderId = order.Id });
|
|
_capPublisher.PublishDelay(expiredTimeConfig.NearlyExpiredTime - DateTime.Now, EventNames.HotlineOrderNearlyExpiredTimeSms, new PublishNearlyExpiredTimeSmsDto() { OrderId = order.Id });
|
|
-
|
|
|
|
|
|
+
|
|
}
|
|
}
|
|
else if (dto.FlowDirection is EFlowDirection.CenterToCenter)
|
|
else if (dto.FlowDirection is EFlowDirection.CenterToCenter)
|
|
{
|
|
{
|
|
@@ -6280,6 +6280,7 @@ public class OrderController : BaseController
|
|
/// <param name="dto"></param>
|
|
/// <param name="dto"></param>
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
[HttpPost("update-order-sourcechannel")]
|
|
[HttpPost("update-order-sourcechannel")]
|
|
|
|
+ [AllowAnonymous]
|
|
public async Task UpdateOrderSourceChannel([FromBody] UpdateOrderSourceChannelDto dto)
|
|
public async Task UpdateOrderSourceChannel([FromBody] UpdateOrderSourceChannelDto dto)
|
|
{
|
|
{
|
|
if (dto == null || dto.Ids == null || dto.Ids.Count == 0)
|
|
if (dto == null || dto.Ids == null || dto.Ids.Count == 0)
|