|
|
@@ -766,7 +766,7 @@ public class OrderController : BaseController
|
|
|
.WhereIF(dto.VisitStateQuery == EVisitStateQuery.Visited, d => d.VisitState == EVisitState.Visited)
|
|
|
.WhereIF(dto.VisitStateQuery == EVisitStateQuery.SMSUnsatisfied, d => d.VisitState == EVisitState.SMSUnsatisfied)
|
|
|
.WhereIF(dto.VisitStateQuery == EVisitStateQuery.SMSVisiting, d => d.VisitState == EVisitState.SMSVisiting)
|
|
|
- .WhereIF(dto.VisitStateQuery == EVisitStateQuery.NoPutThrough , d=>d.IsPutThrough == false)
|
|
|
+ .WhereIF(dto.VisitStateQuery == EVisitStateQuery.NoPutThrough , d=>d.IsPutThrough == false && d.VisitState != EVisitState.Visited)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Order.Title.StartsWith(dto.Keyword!))
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.No), d => d.No == dto.No)
|
|
|
.WhereIF(dto.VisitType != null, d => d.VisitType == dto.VisitType)
|
|
|
@@ -4714,7 +4714,7 @@ public class OrderController : BaseController
|
|
|
if (specialAny) throw UserFriendlyException.SameMessage("工单已存在待审批特提信息！");
|
|
|
var order = await _orderRepository.Queryable().Includes(d => d.Workflow).FirstAsync(d => d.Id == dto.OrderId);
|
|
|
await _orderApplication.SpecialVerify(dto, order, HttpContext.RequestAborted);
|
|
|
- if (_appOptions.Value.IsZiGong && string.IsNullOrEmpty(dto.Cause))
|
|
|
+ if (string.IsNullOrEmpty(dto.Cause))
|
|
|
{
|
|
|
dto.Cause = dto.Reason;
|
|
|
}
|
tangjiang