|
@@ -3198,16 +3198,18 @@ public class OrderController : BaseController
|
|
|
dto.StartTimeEnd = dto.StartTimeEnd.Value.AddDays(1).AddSeconds(-1);
|
|
|
|
|
|
var (total, items) = await _orderRepository.Queryable()
|
|
|
- .LeftJoin<WorkflowStep>((d, step) => d.Id == step.ExternalId)
|
|
|
- .Where((d, step) =>
|
|
|
- ((string.IsNullOrEmpty(d.WorkflowId) && (string.IsNullOrEmpty(d.SignerId) || d.SignerId == _sessionContext.RequiredUserId)) ||
|
|
|
- (!string.IsNullOrEmpty(d.WorkflowId) &&
|
|
|
- ((step.FlowAssignType == EFlowAssignType.User && !string.IsNullOrEmpty(step.HandlerId) && step.HandlerId == _sessionContext.RequiredUserId) ||
|
|
|
- (step.FlowAssignType == EFlowAssignType.Org && !string.IsNullOrEmpty(step.HandlerOrgId) && step.HandlerOrgId == _sessionContext.RequiredOrgId) ||
|
|
|
- (step.FlowAssignType == EFlowAssignType.Role && !string.IsNullOrEmpty(step.RoleId) && _sessionContext.Roles.Contains(step.RoleId))) &&
|
|
|
- ( step.Status != EWorkflowStepStatus.Handled )
|
|
|
- )))
|
|
|
- //.Where(d => d.Workflow.Steps.Any(s => s.Status < EWorkflowStepStatus.Handled && s.HandlerOrgId == OrgSeedData.CenterId))
|
|
|
+ //.LeftJoin<WorkflowStep>((d, step) => d.Id == step.ExternalId)
|
|
|
+ //.Where((d, step) =>
|
|
|
+ // ((string.IsNullOrEmpty(d.WorkflowId) && (string.IsNullOrEmpty(d.SignerId) || d.SignerId == _sessionContext.RequiredUserId)) ||
|
|
|
+ // (!string.IsNullOrEmpty(d.WorkflowId) &&
|
|
|
+ // ((step.FlowAssignType == EFlowAssignType.User && !string.IsNullOrEmpty(step.HandlerId) && step.HandlerId == _sessionContext.RequiredUserId) ||
|
|
|
+ // (step.FlowAssignType == EFlowAssignType.Org && !string.IsNullOrEmpty(step.HandlerOrgId) && step.HandlerOrgId == _sessionContext.RequiredOrgId) ||
|
|
|
+ // (step.FlowAssignType == EFlowAssignType.Role && !string.IsNullOrEmpty(step.RoleId) && _sessionContext.Roles.Contains(step.RoleId))) &&
|
|
|
+ // ( step.Status != EWorkflowStepStatus.Handled )
|
|
|
+ // )))
|
|
|
+ //.Where(d => d.Workflow.Steps.Any(s => s.Status < EWorkflowStepStatus.Handled && s.HandlerOrgId == OrgSeedData.CenterId))
|
|
|
+ .LeftJoin<WorkflowStep>((d, step) => d.Id == step.ExternalId)
|
|
|
+ .Where((d,step)=>step.HandlerOrgId == SeedData.OrgSeedData.CenterId)
|
|
|
.Where(d => d.Source < ESource.MLSQ || d.Source > ESource.WZSC)
|
|
|
.Where(d => d.Status != EOrderStatus.BackToProvince && d.Status < EOrderStatus.Filed)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.No), d => d.No!.Contains(dto.No!))
|