|
@@ -369,9 +369,9 @@ namespace Hotline.Share.Dtos.Order
|
|
/// <summary>
|
|
/// <summary>
|
|
/// 是否延期
|
|
/// 是否延期
|
|
/// </summary>
|
|
/// </summary>
|
|
- public string? DelayText => DelayingCount > 0 ? "是" : "否";
|
|
|
|
|
|
+ public string? DelayText => DelayingCount > 0 ? "是" : "否";
|
|
|
|
|
|
- private string CalculateExpiredText()
|
|
|
|
|
|
+ private string CalculateExpiredText()
|
|
{
|
|
{
|
|
//todo 完整处理方案:1.创建待过期表,Id,过期时间,即将过期时间等字段。2.延迟消息通知处理过期,删除子表数据,处理order过期状态字段。3.此处即可采用expiredStatus进行判断
|
|
//todo 完整处理方案:1.创建待过期表,Id,过期时间,即将过期时间等字段。2.延迟消息通知处理过期,删除子表数据,处理order过期状态字段。3.此处即可采用expiredStatus进行判断
|
|
//todo 目前暂时采用过期时间计算
|
|
//todo 目前暂时采用过期时间计算
|
|
@@ -458,41 +458,42 @@ namespace Hotline.Share.Dtos.Order
|
|
public bool IsResolved { get; set; }
|
|
public bool IsResolved { get; set; }
|
|
public string IsResolvedText => IsResolved ? "已解决" : "未解决";
|
|
public string IsResolvedText => IsResolved ? "已解决" : "未解决";
|
|
|
|
|
|
- #region 副本工单
|
|
|
|
|
|
+ #region 副本工单
|
|
|
|
|
|
- /// <summary>
|
|
|
|
- /// 修改人
|
|
|
|
- /// </summary>
|
|
|
|
- public string AuditUserName { get; set; }
|
|
|
|
- public string AuditUserId { get; set; }
|
|
|
|
|
|
+ /// <summary>
|
|
|
|
+ /// 修改人
|
|
|
|
+ /// </summary>
|
|
|
|
+ public string AuditUserName { get; set; }
|
|
|
|
+ public string AuditUserId { get; set; }
|
|
|
|
|
|
- /// <summary>
|
|
|
|
- /// 修改时间
|
|
|
|
- /// </summary>
|
|
|
|
- public DateTime AuditTime { get; set; }
|
|
|
|
|
|
+ /// <summary>
|
|
|
|
+ /// 修改时间
|
|
|
|
+ /// </summary>
|
|
|
|
+ public DateTime AuditTime { get; set; }
|
|
#endregion
|
|
#endregion
|
|
|
|
|
|
public string OverDays => GetOverDays();
|
|
public string OverDays => GetOverDays();
|
|
|
|
|
|
|
|
|
|
- public string GetOverDays() {
|
|
|
|
|
|
+ public string GetOverDays()
|
|
|
|
+ {
|
|
var overDays = "0天";
|
|
var overDays = "0天";
|
|
if (ExpiredTime.HasValue)
|
|
if (ExpiredTime.HasValue)
|
|
{
|
|
{
|
|
if (FiledTime.HasValue && ExpiredTime < FiledTime)
|
|
if (FiledTime.HasValue && ExpiredTime < FiledTime)
|
|
{
|
|
{
|
|
overDays = (FiledTime - ExpiredTime).Value.Days + "天";
|
|
overDays = (FiledTime - ExpiredTime).Value.Days + "天";
|
|
- }
|
|
|
|
- else if(ExpiredTime < DateTime.Now)
|
|
|
|
|
|
+ }
|
|
|
|
+ else if (ExpiredTime < DateTime.Now)
|
|
{
|
|
{
|
|
- overDays = (DateTime.Now - ExpiredTime).Value.Days + "天";
|
|
|
|
- }
|
|
|
|
|
|
+ overDays = (DateTime.Now - ExpiredTime).Value.Days + "天";
|
|
|
|
+ }
|
|
}
|
|
}
|
|
return overDays;
|
|
return overDays;
|
|
}
|
|
}
|
|
- }
|
|
|
|
|
|
+ }
|
|
|
|
|
|
- public class UpdateOrderDto : AddOrderDto
|
|
|
|
|
|
+ public class UpdateOrderDto : AddOrderDto
|
|
{
|
|
{
|
|
public string Id { get; set; }
|
|
public string Id { get; set; }
|
|
}
|
|
}
|
|
@@ -770,6 +771,16 @@ namespace Hotline.Share.Dtos.Order
|
|
/// 是否行政执法类
|
|
/// 是否行政执法类
|
|
/// </summary>
|
|
/// </summary>
|
|
public bool? IsEnforcementOrder { get; set; }
|
|
public bool? IsEnforcementOrder { get; set; }
|
|
|
|
+
|
|
|
|
+ /// <summary>
|
|
|
|
+ /// 形式主义工单
|
|
|
|
+ /// </summary>
|
|
|
|
+ public bool IsFormalistWorkOrder { get; set; }
|
|
|
|
+
|
|
|
|
+ /// <summary>
|
|
|
|
+ /// 敏感类工单
|
|
|
|
+ /// </summary>
|
|
|
|
+ public bool IsSensitiveWorkOrders { get; set; }
|
|
}
|
|
}
|
|
|
|
|
|
public record CanLinkCallRecordOrderDto : PagedKeywordRequest
|
|
public record CanLinkCallRecordOrderDto : PagedKeywordRequest
|
|
@@ -795,11 +806,12 @@ namespace Hotline.Share.Dtos.Order
|
|
|
|
|
|
public record OrderCopyListDto : PagedKeywordRequest
|
|
public record OrderCopyListDto : PagedKeywordRequest
|
|
{
|
|
{
|
|
- public string OrderId { get; set; }
|
|
|
|
- }
|
|
|
|
|
|
+ public string OrderId { get; set; }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public class UnsignedOrderDto
|
|
|
|
+ {
|
|
|
|
|
|
- public class UnsignedOrderDto {
|
|
|
|
-
|
|
|
|
public OrderDto Order { get; set; }
|
|
public OrderDto Order { get; set; }
|
|
|
|
|
|
public WorkflowStepDto WorkflowStep { get; set; }
|
|
public WorkflowStepDto WorkflowStep { get; set; }
|