Explorar el Código

Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

田爽 hace 2 meses
padre
commit
d9ca77b2cb

+ 2 - 0
src/Hotline.Repository.SqlSugar/Orders/OrderRepository.cs

@@ -1904,6 +1904,8 @@ namespace Hotline.Repository.SqlSugar.Orders
                 .WhereIF(dto.OrgCode == "001", x => x.VisitOrgCode == dto.OrgCode)
                 .WhereIF(dto.TypeCode != null && dto.TypeCode == 1, x => x.OrderVisit.Order.IdentityType == EIdentityType.Citizen)
                 .WhereIF(dto.TypeCode != null && dto.TypeCode == 2, x => x.OrderVisit.Order.IdentityType == EIdentityType.Enterprise)
+                .WhereIF(!string.IsNullOrEmpty(dto.No), x => x.OrderVisit.Order.No == dto.No)
+                .WhereIF(!string.IsNullOrEmpty(dto.Title), x => x.OrderVisit.Order.Title.Contains(dto.Title))
                 //.WhereIF(dto.OrgCode != "001", x => x.VisitOrgCode == dto.OrgCode).
                 //.WhereIF(dto.IsOnlyMy == true, x => x.VisitOrgCode == dto.OrgCode)
                 //.WhereIF(IsCenter == true && dto.IsOnlyMy == true, x => x.VisitOrgCode == dto.OrgCode)

+ 15 - 5
src/Hotline.Share/Dtos/Bi/BiOrderDto.cs

@@ -77,11 +77,21 @@ namespace Hotline.Share.Dtos.Bi
         /// </summary>
         public string? ActualHandleOrgName { get; set; }
 
-		/// <summary>
-		/// 是否甄别
-		/// </summary>
-		public bool? IsScreen { get; set; }
-	}
+        /// <summary>
+        /// 是否甄别
+        /// </summary>
+        public bool? IsScreen { get; set; }
+
+        /// <summary>
+        /// 工单编号
+        /// </summary>
+        public string? No { get; set; }
+
+        /// <summary>
+        /// 标题
+        /// </summary>
+        public string? Title { get; set; }
+    }
 
     public record HighFrequencyCallStatisticsRequest : PagedRequest
     {