Merge branch 'master' of http://git.12345lm.cn/Fengwo/hotline

src/Hotline.Api/Controllers/BaseController.cs

@@ -7,6 +7,7 @@ namespace Hotline.Api.Controllers;
 [ApiController]
 [Produces("application/json")]
 [Route("api/v1/[controller]")]
+[LogFilter]
 public class BaseController : ControllerBase
 {
     

src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -1269,9 +1269,12 @@ namespace Hotline.Api.Controllers.Bi
         {
             dto.EndDate = dto.EndDate.AddDays(1).AddSeconds(-1);
             var (total, items) = await _orderRepository.Queryable()
-                .Where(p => p.CreationTime >= dto.StartDate && p.CreationTime <= dto.EndDate && (int)p.Status >= 300)
-                .WhereIF(!string.IsNullOrEmpty(dto.OrgLevelOneCode), p => p.OrgLevelOneCode == dto.OrgLevelOneCode)
+                .Where(p => p.CreationTime >= dto.StartDate && p.CreationTime <= dto.EndDate && p.Status >= EOrderStatus.Filed)
+                .WhereIF(!string.IsNullOrEmpty(dto.OrgLevelOneCode) && dto.OrgLevelOneCode == "001", p => p.OrgLevelOneCode == dto.OrgLevelOneCode)
+                .WhereIF(!string.IsNullOrEmpty(dto.OrgLevelOneCode) && dto.OrgLevelOneCode != "001", p => p.ActualHandleOrgCode.StartsWith(dto.OrgLevelOneCode))
                 .WhereIF(!string.IsNullOrEmpty(dto.AcceptTypeCode), p => p.AcceptTypeCode == dto.AcceptTypeCode)
+                .WhereIF(dto.TypeCode == 1, p => p.OrgLevelOneCode == "001")
+                .WhereIF(dto.TypeCode == 2, p => p.OrgLevelOneCode != "001")
                 .OrderByDescending(d => d.CreationTime)
                 .ToPagedListAsync(dto, HttpContext.RequestAborted);
 
@@ -1613,7 +1616,7 @@ namespace Hotline.Api.Controllers.Bi
 		/// <param name="dto"></param>
 		/// <returns></returns>
 		[HttpGet("reTransact_detail")]
-		public async Task<PagedDto<OrderSpecialDto>> OrderReTransactDetail([FromQuery] QueryOrderReTransactDetailRequest dto) 
+		public async Task<PagedDto<OrderSpecialDetailDto>> OrderReTransactDetail([FromQuery] QueryOrderReTransactDetailRequest dto) 
         {
 			if (!dto.StartTime.HasValue || !dto.EndTime.HasValue)
 				throw UserFriendlyException.SameMessage("请选择时间!");
@@ -1627,7 +1630,7 @@ namespace Hotline.Api.Controllers.Bi
 				.Where(x => x.OrderSpecial.CreationTime >= dto.StartTime)
 				.Where(x => x.OrderSpecial.CreationTime <= dto.EndTime)
 				.ToPagedListAsync(dto, HttpContext.RequestAborted);
-			return new PagedDto<OrderSpecialDto>(total, _mapper.Map<IReadOnlyList<OrderSpecialDto>>(items));
+			return new PagedDto<OrderSpecialDetailDto>(total, _mapper.Map<IReadOnlyList<OrderSpecialDetailDto>>(items));
 		}
 
         /// <summary>

src/Hotline.Api/Controllers/OrderController.cs

@@ -1684,6 +1684,8 @@ public class OrderController : BaseController
             CounterSignType = EnumExts.GetDescriptions<ECounterSignType>(),
             AcceptType = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.AcceptType),
             SalesChannel = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.SalesChannel),
+            VisitSatisfaction = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.VisitSatisfaction),
+            DissatisfiedReason = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.DissatisfiedReason),
 		};
         return rsp;
     }

src/Hotline.Share/Dtos/Order/OrderSpecialDto.cs

@@ -427,5 +427,7 @@ namespace Hotline.Share.Dtos.Order
 		public string ErrorId { get; set; }
 
 		public string ErrorName { get; set; }
+
+		public OrderSpecialDto OrderSpecial { get; set; }
 	}
 }

src/Hotline.Share/Requests/DepartmentKeyWordRequest.cs

@@ -21,5 +21,10 @@
         /// 受理类型编码
         /// </summary>
         public string? AcceptTypeCode { get; set; }
+
+        /// <summary>
+        /// 0:全部，1：中心，2：部门
+        /// </summary>
+        public int TypeCode { get; set; }
     }
 }