|
|
@@ -5888,11 +5888,11 @@ public class OrderController : BaseController
|
|
|
var user = await _userRepository.Queryable().Where(u => u.OrgId == model.OrgId).FirstAsync(HttpContext.RequestAborted);
|
|
|
if (user is null)
|
|
|
throw UserFriendlyException.SameMessage("用户信息不存在 请检查部门下用户信息是否正确！");
|
|
|
- //工单信息
|
|
|
+ //工单信息 中心会签件不处理
|
|
|
var orders = await _orderRepository.Queryable(isAdmin: true)
|
|
|
.Includes(o=>o.Workflow)
|
|
|
.Includes(o=>o.OrderVisits)
|
|
|
- .Where(o=>o.OrderVisits.Any(ov=> ov.VisitState != EVisitState.None &&
|
|
|
+ .Where(o=>o.OrderVisits.Any(ov=> ov.VisitState == EVisitState.Visited &&
|
|
|
ov.VisitTime >= model.StartTime && ov.VisitTime <= model.EndTime &&
|
|
|
ov.OrderVisitDetails.Any(ord=> ord.VisitOrgCode.StartsWith(model.OrgId) &&
|
|
|
(SqlFunc.JsonField(ord.OrgProcessingResults, "Key") == "2" ||
|
xf