|
|
@@ -3949,7 +3949,7 @@ public class OrderController : BaseController
|
|
|
var orders = await _orderApplication.QueryOrders(dto)
|
|
|
.ToPageListWithoutTotalAsync(dto, HttpContext.RequestAborted);
|
|
|
var list = _mapper.Map<IReadOnlyList<OrderDto>>(orders);
|
|
|
- if (_appOptions.Value.IsLuZhou && !_sessionContext.OrgIsCenter)
|
|
|
+ if ((_appOptions.Value.IsLuZhou || _appOptions.Value.IsZiGong) && !_sessionContext.OrgIsCenter)
|
|
|
list = list.Select(p => p.DataMask()).ToList();
|
|
|
return list;
|
|
|
}
|
|
|
@@ -4397,12 +4397,16 @@ public class OrderController : BaseController
|
|
|
await _orderSnapshotRepository.Queryable()
|
|
|
.LeftJoin<IndustryCase>((snapshot, industryCase) => snapshot.IndustryCase == industryCase.Id)
|
|
|
.Where((snapshot, industryCase) => snapshot.Id == order.Id)
|
|
|
- .Select((snapshot, industryCase) => new {
|
|
|
- snapshot.IndustryId, snapshot.IndustryName, industryCase.Name,
|
|
|
+ .Select((snapshot, industryCase) => new
|
|
|
+ {
|
|
|
+ snapshot.IndustryId,
|
|
|
+ snapshot.IndustryName,
|
|
|
+ industryCase.Name,
|
|
|
snapshot.IsRectifyDepartment,
|
|
|
snapshot.IsDangerDepartment,
|
|
|
snapshot.IsSafetyDepartment,
|
|
|
- snapshot.SignRemark,snapshot.SignUserId,
|
|
|
+ snapshot.SignRemark,
|
|
|
+ snapshot.SignUserId,
|
|
|
snapshot.SignUserName,
|
|
|
snapshot.SignTime
|
|
|
})
|
|
|
@@ -5044,7 +5048,7 @@ public class OrderController : BaseController
|
|
|
if (isSnapshotEnable)
|
|
|
{
|
|
|
var orderSnapShot = await _orderSnapshotRepository.GetAsync(orderId, HttpContext.RequestAborted);
|
|
|
- if(orderSnapShot != null && string.CompareOrdinal(orderSnapShot.IndustryName, "安全隐患") == 0)
|
|
|
+ if (orderSnapShot != null && string.CompareOrdinal(orderSnapShot.IndustryName, "安全隐患") == 0)
|
|
|
{
|
|
|
isAqyh = true;
|
|
|
dto.Steps.RemoveAll(d => d.BusinessType == EBusinessType.Send);
|
|
|
@@ -5305,7 +5309,7 @@ public class OrderController : BaseController
|
|
|
orderHandleFlowDto.CrossSteps = orderHandleFlowDto.CrossSteps.OrderBy(d => d.Sort).ToList();
|
|
|
var stepCount = orderHandleFlowDto.CrossSteps.Count;
|
|
|
var unhandleSteps = new List<WorkflowStep> { startStep };
|
|
|
- for (int i = 0;i < stepCount;i++)
|
|
|
+ for (int i = 0; i < stepCount; i++)
|
|
|
{
|
|
|
var crossStep = orderHandleFlowDto.CrossSteps[i];
|
|
|
var tempSteps = new List<WorkflowStep>();
|
|
|
@@ -5503,7 +5507,7 @@ public class OrderController : BaseController
|
|
|
var orderSnapShot = await _orderSnapshotRepository.GetAsync(orderId, HttpContext.RequestAborted);
|
|
|
isAqyh = orderSnapShot != null && string.CompareOrdinal(orderSnapShot.IndustryName, "安全隐患") == 0;
|
|
|
}
|
|
|
- if(!isAqyh)
|
|
|
+ if (!isAqyh)
|
|
|
dto.Steps = dto.Steps.Where(d => string.CompareOrdinal(d.Value, "网格员") != 0
|
|
|
&& string.CompareOrdinal(d.Value, "工单标记") != 0).ToList();
|
|
|
|
tangjiang