AcceptType

src/Hotline.Api/Controllers/HotSpotController.cs

@@ -1,6 +1,7 @@
 using Hotline.Caching.Interfaces;
 using Hotline.FlowEngine;
 using Hotline.Repository.SqlSugar.Extensions;
+using Hotline.Settings;
 using Hotline.Settings.Hotspots;
 using Hotline.Settings.TimeLimits;
 using Hotline.Share.Dtos;
@@ -26,14 +27,18 @@ namespace Hotline.Api.Controllers
         private readonly ITimeLimitDomainService _timeLimitDomainService;
         private readonly ITimeLimitRepository _timeLimitRepository;
         private readonly ISysDicDataCacheManager _sysDicDataCacheManager;
+        private readonly ISystemDomainService _systemDomainService;
 
-        public HotspotController(IRepository<Hotspot> hotspotTypeRepository,IMapper mapper, ITimeLimitDomainService timeLimitDomainService, ITimeLimitRepository timeLimitRepository,ISysDicDataCacheManager sysDicDataCacheManager)
+        public HotspotController(IRepository<Hotspot> hotspotTypeRepository,
+            IMapper mapper, ITimeLimitDomainService timeLimitDomainService, ITimeLimitRepository timeLimitRepository,ISysDicDataCacheManager sysDicDataCacheManager,
+            ISystemDomainService systemDomainService)
         {
             _hotspotTypeRepository = hotspotTypeRepository;
             _mapper = mapper;
             _timeLimitDomainService = timeLimitDomainService;
             _timeLimitRepository = timeLimitRepository;
             _sysDicDataCacheManager = sysDicDataCacheManager;
+            _systemDomainService = systemDomainService;
         }
 
         #region 热点
@@ -87,7 +92,8 @@ namespace Hotline.Api.Controllers
                 TimeType = EnumExts.GetDescriptions<ETimeType>(),
                 BaseData = TimeLimitBaseData.GetBaseData(),
 
-                AcceptType = EnumExts.GetDescriptions<EAcceptType>(),
+                //AcceptType = EnumExts.GetDescriptions<EAcceptType>(),
+                AcceptType = await _systemDomainService.GetSysDicDataByCodeAsync(SysDicTypeConsts.AcceptType),
                 //PushType = _sysDicDataCacheManager.GetSysDicDataCache(TimeLimitBaseDataConsts.PushType),
                 SourceChannel = _sysDicDataCacheManager.GetSysDicDataCache(TimeLimitBaseDataConsts.SourceChannel),
                 IdentityType = EnumExts.GetDescriptions<EIdentityType>(),

src/Hotline.Api/Controllers/OrderController.cs

@@ -64,7 +64,7 @@ public class OrderController : BaseController
     private readonly IRepository<OrderScreen> _orderScreenRepository;
 
 
-	public OrderController(
+    public OrderController(
         IOrderDomainService orderDomainService,
         IOrderRepository orderRepository,
         IWorkflowApplication workflowApplication,
@@ -84,12 +84,12 @@ public class OrderController : BaseController
         IRepository<OrderDelay> orderDelayRepository,
         ITimeLimitApplication timeLimitApplication,
         ISystemSettingCacheManager systemSettingCacheManager,
-		 IRepository<OrderRedo> orderRedoRepository,
-		 IRepository<OrderSupervise> orderSuperviseRepository,
-		 IRepository<OrderUrge> orderUrgeRepository,
+         IRepository<OrderRedo> orderRedoRepository,
+         IRepository<OrderSupervise> orderSuperviseRepository,
+         IRepository<OrderUrge> orderUrgeRepository,
         IFileRepository fileRepository,
         IRepository<OrderScreen> orderScreenRepository
-		)
+        )
     {
         _orderDomainService = orderDomainService;
         _orderRepository = orderRepository;
@@ -113,10 +113,10 @@ public class OrderController : BaseController
         _orderRedoRepository = orderRedoRepository;
         _orderSuperviseRepository = orderSuperviseRepository;
         _orderUrgeRepository = orderUrgeRepository;
-		_fileRepository = fileRepository;
-		_orderScreenRepository = orderScreenRepository;
+        _fileRepository = fileRepository;
+        _orderScreenRepository = orderScreenRepository;
 
-	}
+    }
 
     #region 工单发布
 
@@ -532,109 +532,109 @@ public class OrderController : BaseController
             .FirstAsync(x => x.Id == id);
     }
 
-	#endregion
-
-	#region 工单甄别
-
-	/// <summary>
-	/// 工单甄别列表
-	/// </summary>
-	/// <param name="dto"></param>
-	/// <returns></returns>
-	[Permission(EPermission.OrderScreenList)]
-	[HttpGet("screen")]
-	public async Task<PagedDto<OrderScreen>> ScreenList([FromQuery] ScreenListDto dto)
-	{
-		var (total, items) = await _orderScreenRepository.Queryable()
-			.Includes(x => x.Visit,d=>d.Order)
-			.WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Visit.Order.Title.Contains(dto.Keyword!) || d.Visit.Order.No.Contains(dto.Keyword!))
-			.WhereIF(dto.Status == EScreenStatus.Apply || dto.Status == EScreenStatus.Approval || dto.Status == EScreenStatus.End, x => x.Status == dto.Status)
-			.WhereIF(dto.CreationTimeStart.HasValue, d => d.CreationTime >= dto.CreationTimeStart)
-			.WhereIF(dto.CreationTimeEnd.HasValue, d => d.CreationTime <= dto.CreationTimeEnd)
-			.OrderByDescending(x => x.CreationTime)
-			.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
-		return new PagedDto<OrderScreen>(total, items);
-	}
-
-
-	/// <summary>
-	/// 开始工单甄别流程
-	/// </summary>
-	[Permission(EPermission.ApplyScreen)]
-	[HttpPost("screen/startflow")]
-	public async Task StartFlow([FromBody] ScreenStartFlowDto dto)
-	{
-		var model = _mapper.Map<OrderScreen>(dto.Data);
-		model.Status =  EScreenStatus.Apply;
-	    var id = await _orderScreenRepository.AddAsync(model, HttpContext.RequestAborted);
-	    if (dto.Data.Files.Any()) await _fileRepository.AddFileAsync(dto.Data.Files, id, HttpContext.RequestAborted);
-		try
-		{
-			var startDto = _mapper.Map<StartWorkflowDto>(dto.Workflow);
-			startDto.DefinitionModuleCode = WorkflowModuleConsts.OrderHandle;
-			startDto.Title = dto.Data.Content;
-			await _workflowApplication.StartWorkflowAsync(startDto, id, HttpContext.RequestAborted);
-		}
-		catch (Exception e)
-		{
-			await Remove(id);
-			throw new UserFriendlyException($"工单开启甄别流程失败!, {e.Message}", "工单开启甄别流程失败");
-		}
-	}
-
-	/// <summary>
-	/// 查询工单甄别流程开启参数
-	/// </summary>
-	/// <returns></returns>
-	[HttpGet("screen/startflow")]
-	public async Task<DefinedStepDto> GetScreenFlowStartOptionsAsync()
-	{
-		return await _workflowApplication.GetStartOptionsAsync(WorkflowModuleConsts.OrderScreen, HttpContext.RequestAborted);
-	}
-
-	/// <summary>
-	/// 列表页面基础数据
-	/// </summary>
-	/// <returns></returns>
-	[HttpGet("screen/base")]
-	public async Task<object> ScreenBaseData()
-	{
-		var rsp = new
-		{
-			ScreenStatus = EnumExts.GetDescriptions<EScreenStatus>(),
-			ScreenType = await _systemDomainService.GetSysDicDataByCodeAsync(SysDicTypeConsts.ScreenType),
-		};
-		return rsp;
-	}
-
-
-	/// <summary>
-	/// 甄别详情
-	/// </summary>
-	/// <param name="id"></param>
-	/// <returns></returns>
-	[Permission(EPermission.ScreenEntity)]
-	[HttpGet("screen/{id}")]
-	public async Task<OrderScreen> ScreenEntity(string id)
-	{
-		return await _orderScreenRepository.Queryable()
-			.Includes(x => x.Visit, d=>d.Order)
-			.FirstAsync(x => x.Id == id);
-	}
-
-
-
-
-	#endregion
-
-	#region 工单督办
-
-	/// <summary>
-	/// 工单督办列表
-	/// </summary>
-	/// <param name="dto"></param>
-	/// <returns></returns>
-	[Permission(EPermission.SuperviseOrderList)]
+    #endregion
+
+    #region 工单甄别
+
+    /// <summary>
+    /// 工单甄别列表
+    /// </summary>
+    /// <param name="dto"></param>
+    /// <returns></returns>
+    [Permission(EPermission.OrderScreenList)]
+    [HttpGet("screen")]
+    public async Task<PagedDto<OrderScreen>> ScreenList([FromQuery] ScreenListDto dto)
+    {
+        var (total, items) = await _orderScreenRepository.Queryable()
+            .Includes(x => x.Visit, d => d.Order)
+            .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Visit.Order.Title.Contains(dto.Keyword!) || d.Visit.Order.No.Contains(dto.Keyword!))
+            .WhereIF(dto.Status == EScreenStatus.Apply || dto.Status == EScreenStatus.Approval || dto.Status == EScreenStatus.End, x => x.Status == dto.Status)
+            .WhereIF(dto.CreationTimeStart.HasValue, d => d.CreationTime >= dto.CreationTimeStart)
+            .WhereIF(dto.CreationTimeEnd.HasValue, d => d.CreationTime <= dto.CreationTimeEnd)
+            .OrderByDescending(x => x.CreationTime)
+            .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
+        return new PagedDto<OrderScreen>(total, items);
+    }
+
+
+    /// <summary>
+    /// 开始工单甄别流程
+    /// </summary>
+    [Permission(EPermission.ApplyScreen)]
+    [HttpPost("screen/startflow")]
+    public async Task StartFlow([FromBody] ScreenStartFlowDto dto)
+    {
+        var model = _mapper.Map<OrderScreen>(dto.Data);
+        model.Status = EScreenStatus.Apply;
+        var id = await _orderScreenRepository.AddAsync(model, HttpContext.RequestAborted);
+        if (dto.Data.Files.Any()) await _fileRepository.AddFileAsync(dto.Data.Files, id, HttpContext.RequestAborted);
+        try
+        {
+            var startDto = _mapper.Map<StartWorkflowDto>(dto.Workflow);
+            startDto.DefinitionModuleCode = WorkflowModuleConsts.OrderHandle;
+            startDto.Title = dto.Data.Content;
+            await _workflowApplication.StartWorkflowAsync(startDto, id, HttpContext.RequestAborted);
+        }
+        catch (Exception e)
+        {
+            await Remove(id);
+            throw new UserFriendlyException($"工单开启甄别流程失败!, {e.Message}", "工单开启甄别流程失败");
+        }
+    }
+
+    /// <summary>
+    /// 查询工单甄别流程开启参数
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("screen/startflow")]
+    public async Task<DefinedStepDto> GetScreenFlowStartOptionsAsync()
+    {
+        return await _workflowApplication.GetStartOptionsAsync(WorkflowModuleConsts.OrderScreen, HttpContext.RequestAborted);
+    }
+
+    /// <summary>
+    /// 列表页面基础数据
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("screen/base")]
+    public async Task<object> ScreenBaseData()
+    {
+        var rsp = new
+        {
+            ScreenStatus = EnumExts.GetDescriptions<EScreenStatus>(),
+            ScreenType = await _systemDomainService.GetSysDicDataByCodeAsync(SysDicTypeConsts.ScreenType),
+        };
+        return rsp;
+    }
+
+
+    /// <summary>
+    /// 甄别详情
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [Permission(EPermission.ScreenEntity)]
+    [HttpGet("screen/{id}")]
+    public async Task<OrderScreen> ScreenEntity(string id)
+    {
+        return await _orderScreenRepository.Queryable()
+            .Includes(x => x.Visit, d => d.Order)
+            .FirstAsync(x => x.Id == id);
+    }
+
+
+
+
+    #endregion
+
+    #region 工单督办
+
+    /// <summary>
+    /// 工单督办列表
+    /// </summary>
+    /// <param name="dto"></param>
+    /// <returns></returns>
+    [Permission(EPermission.SuperviseOrderList)]
     [HttpGet("supervise")]
     public async Task<PagedDto<SuperviseOrderDto>> SuperviseList([FromQuery] SuperviseListDto dto)
     {
@@ -644,7 +644,7 @@ public class OrderController : BaseController
             .WhereIF(dto.SuperviseState > 0, x => x.State == dto.SuperviseState)
             .WhereIF(dto.CreationTimeStart.HasValue, d => d.CreationTime >= dto.CreationTimeStart)
             .WhereIF(dto.CreationTimeEnd.HasValue, d => d.CreationTime <= dto.CreationTimeEnd)
-			.OrderByDescending(x => x.CreationTime)
+            .OrderByDescending(x => x.CreationTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 
         return new PagedDto<SuperviseOrderDto>(total, _mapper.Map<IReadOnlyList<SuperviseOrderDto>>(items));
@@ -670,7 +670,7 @@ public class OrderController : BaseController
         var id = await _orderSuperviseRepository.AddAsync(model, HttpContext.RequestAborted);
         if (dto.Files.Any()) await _fileRepository.AddFileAsync(dto.Files, id, HttpContext.RequestAborted);
         return id;
-	}
+    }
 
     /// <summary>
     /// 回复督办
@@ -692,7 +692,7 @@ public class OrderController : BaseController
         supervise.ReplyTime = DateTime.Now;
         supervise.State = 1;
         if (dto.Files.Any()) await _fileRepository.AddFileAsync(dto.Files, supervise.Id, HttpContext.RequestAborted);
-		await _orderSuperviseRepository.UpdateAsync(supervise, HttpContext.RequestAborted);
+        await _orderSuperviseRepository.UpdateAsync(supervise, HttpContext.RequestAborted);
     }
 
     /// <summary>
@@ -746,7 +746,7 @@ public class OrderController : BaseController
             .WhereIF(dto.SuperviseState > 0, x => x.State == dto.SuperviseState)
             .WhereIF(dto.CreationTimeStart.HasValue, d => d.CreationTime >= dto.CreationTimeStart)
             .WhereIF(dto.CreationTimeEnd.HasValue, d => d.CreationTime <= dto.CreationTimeEnd)
-			.OrderByDescending(x => x.CreationTime)
+            .OrderByDescending(x => x.CreationTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 
         return new PagedDto<UrgeOrderDto>(total, _mapper.Map<IReadOnlyList<UrgeOrderDto>>(items));
@@ -769,10 +769,10 @@ public class OrderController : BaseController
         var model = _mapper.Map<OrderUrge>(dto);
         model.CreatorOrgName = _sessionContext.OrgName;
         model.State = 0;
-		var id = await _orderUrgeRepository.AddAsync(model, HttpContext.RequestAborted);
-		if (dto.Files.Any()) await _fileRepository.AddFileAsync(dto.Files, id, HttpContext.RequestAborted);
-		return id;
-	}
+        var id = await _orderUrgeRepository.AddAsync(model, HttpContext.RequestAborted);
+        if (dto.Files.Any()) await _fileRepository.AddFileAsync(dto.Files, id, HttpContext.RequestAborted);
+        return id;
+    }
 
     /// <summary>
     /// 回复催办
@@ -794,7 +794,7 @@ public class OrderController : BaseController
         urge.ReplyTime = DateTime.Now;
         urge.State = 1;
         if (dto.Files.Any()) await _fileRepository.AddFileAsync(dto.Files, urge.Id, HttpContext.RequestAborted);
-		await _orderUrgeRepository.UpdateAsync(urge, HttpContext.RequestAborted);
+        await _orderUrgeRepository.UpdateAsync(urge, HttpContext.RequestAborted);
     }
 
     /// <summary>
@@ -950,7 +950,7 @@ public class OrderController : BaseController
         var order = _mapper.Map<Order>(dto);
         var orderNo = await _orderDomainService.AddAsync(order, HttpContext.RequestAborted);
         if (dto.Files.Any()) await _fileRepository.AddFileAsync(dto.Files, orderNo, HttpContext.RequestAborted);
-		return orderNo;
+        return orderNo;
     }
 
     /// <summary>
@@ -1068,7 +1068,7 @@ public class OrderController : BaseController
     {
         var rsp = new
         {
-            AcceptTypeOptions = EnumExts.GetDescriptions<EAcceptType>(),
+            AcceptTypeOptions = await _systemDomainService.GetSysDicDataByCodeAsync(SysDicTypeConsts.AcceptType),//EnumExts.GetDescriptions<EAcceptType>(),
             ChannelOptions = _sysDicDataCacheManager.GetSysDicDataCache(TimeLimitBaseDataConsts.SourceChannel),
             OrgsOptions = await _organizeRepository.GetOrgJson(),
             EmergencyLevelOptions = EnumExts.GetDescriptions<EEmergencyLevel>(),
@@ -1088,7 +1088,7 @@ public class OrderController : BaseController
         var rsp = new
         {
             ChannelOptions = _sysDicDataCacheManager.GetSysDicDataCache(TimeLimitBaseDataConsts.SourceChannel),
-            AcceptTypeOptions = EnumExts.GetDescriptions<EAcceptType>(),
+            AcceptTypeOptions = await _systemDomainService.GetSysDicDataByCodeAsync(SysDicTypeConsts.AcceptType),
             EmergencyLevelOptions = EnumExts.GetDescriptions<EEmergencyLevel>(),
             PushTypeOptions = await _systemDomainService.GetSysDicDataByCodeAsync(SysDicTypeConsts.PushType),
             GenderOptions = EnumExts.GetDescriptions<EGender>(),

src/Hotline.Repository.SqlSugar/Orders/OrderRepository.cs

@@ -7,6 +7,7 @@ using Hotline.Identity.Roles;
 using Hotline.Orders;
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Repository.SqlSugar.Extensions;
+using Hotline.Share.Consts;
 using Hotline.Share.Enums.Order;
 using SqlSugar;
 using XF.Domain.Dependency;
@@ -30,12 +31,12 @@ namespace Hotline.Repository.SqlSugar.Orders
                 //弥补AddNav方法没有自动指派到创建人
                 order.AssignToCreator(_dataPermissionFilterBuilder.DataPermissionManager);
 
-                if (order.AcceptType == EAcceptType.Complain)
+                if (order.AcceptTypeCode == AcceptTypeConst.TouSu)
                 {
                     order.OrderComplain.InitDatePermission(_dataPermissionFilterBuilder.DataPermissionManager);
                     await AddNav(order).Include(d => d.OrderComplain).ExecuteCommandAsync();
                 }
-                else if (order.AcceptType == EAcceptType.Report)
+                else if (order.AcceptTypeCode == AcceptTypeConst.JuBao)
                 {
                     order.OrderReport.InitDatePermission(_dataPermissionFilterBuilder.DataPermissionManager);
                     await AddNav(order).Include(d => d.OrderReport).ExecuteCommandAsync();
@@ -57,11 +58,11 @@ namespace Hotline.Repository.SqlSugar.Orders
             await UpdateAsync(order, cancellationToken);
             if (order.OrderType == EOrderType.MarketSupervisionBy12315)
             {
-                if (order.AcceptType == EAcceptType.Complain)
+                if (order.AcceptTypeCode == AcceptTypeConst.TouSu)
                 {
                     await Db.Insertable<OrderComplain>(order.OrderComplain).ExecuteCommandAsync();
                 }
-                else if (order.AcceptType == EAcceptType.Report)
+                else if (order.AcceptTypeCode == AcceptTypeConst.JuBao)
                 {
                     await Db.Insertable<OrderReport>(order.OrderReport).ExecuteCommandAsync();
                 }

src/Hotline.Share/Consts/AcceptTypeConst.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Hotline.Share.Consts
+{
+    public class AcceptTypeConst
+    {
+        public const string ZiXun = "10";
+        public const string JianYi = "15";
+        public const string QiuZhu = "20";
+        public const string BiaoYang = "25";
+        public const string JuBao = "30";
+        public const string TouSu = "35";
+        public const string QiTa = "40";
+    }
+}

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

@@ -306,7 +306,7 @@ namespace Hotline.Share.Dtos.Order
         /// <summary>
         /// 受理类型
         /// </summary>
-        public string AcceptTypeText => AcceptType.GetDescription();
+        //public string AcceptTypeText => AcceptType.GetDescription();
 
         /// <summary>
         /// 紧急程度
@@ -446,7 +446,9 @@ namespace Hotline.Share.Dtos.Order
         /// <summary>
         /// 受理类型
         /// </summary>
-        public EAcceptType AcceptType { get; set; }
+        //public EAcceptType AcceptType { get; set; }
+        public string AcceptType { get; set; }
+        public string AcceptTypeCode { get; set; }
 
         /// <summary>
         /// 紧急程度

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

@@ -21,7 +21,7 @@ namespace Hotline.Share.Dtos.Order
         /// <summary>
         /// 受理类型
         /// </summary>
-        public List<EAcceptType> AcceptTypes { get; set; } = new();
+        public List<string> AcceptTypes { get; set; } = new();
 
         /// <summary>
         /// 来源渠道
@@ -106,7 +106,7 @@ namespace Hotline.Share.Dtos.Order
         /// <summary>
         /// 受理类型
         /// </summary>
-        public List<EAcceptType>? AcceptTypes { get; set; } = new();
+        public List<string>? AcceptTypes { get; set; } = new();
 
         /// <summary>
         /// 热点分类

src/Hotline.Share/Enums/Order/EAcceptType.cs

@@ -1,51 +1,51 @@
-using System.ComponentModel;
-
-namespace Hotline.Share.Enums.Order;
-
-/// <summary>
-/// 受理类型
-/// </summary>
-public enum EAcceptType
-{
-    /// <summary>
-    /// 咨询
-    /// </summary>
-    [Description("咨询")]
-    Consult = 10,
-
-    /// <summary>
-    /// 建议
-    /// </summary>
-    [Description("建议")]
-    Suggest = 15,
-
-    /// <summary>
-    /// 求助
-    /// </summary>
-    [Description("求助")]
-    SeekHelp = 20,
-
-    /// <summary>
-    /// 表扬
-    /// </summary>
-    [Description("表扬")]
-    Praise = 25,
-
-    /// <summary>
-    /// 举报
-    /// </summary>
-    [Description("举报")]
-    Report = 30,
-
-    /// <summary>
-    /// 投诉
-    /// </summary>
-    [Description("投诉")]
-    Complain = 35,
-
-    /// <summary>
-    /// 其他
-    /// </summary>
-    [Description("其他")]
-    Other = 40,
-}
+//using System.ComponentModel;
+
+//namespace Hotline.Share.Enums.Order;
+
+///// <summary>
+///// 受理类型
+///// </summary>
+//public enum EAcceptType
+//{
+//    /// <summary>
+//    /// 咨询
+//    /// </summary>
+//    [Description("咨询")]
+//    Consult = 10,
+
+//    /// <summary>
+//    /// 建议
+//    /// </summary>
+//    [Description("建议")]
+//    Suggest = 15,
+
+//    /// <summary>
+//    /// 求助
+//    /// </summary>
+//    [Description("求助")]
+//    SeekHelp = 20,
+
+//    /// <summary>
+//    /// 表扬
+//    /// </summary>
+//    [Description("表扬")]
+//    Praise = 25,
+
+//    /// <summary>
+//    /// 举报
+//    /// </summary>
+//    [Description("举报")]
+//    Report = 30,
+
+//    /// <summary>
+//    /// 投诉
+//    /// </summary>
+//    [Description("投诉")]
+//    Complain = 35,
+
+//    /// <summary>
+//    /// 其他
+//    /// </summary>
+//    [Description("其他")]
+//    Other = 40,
+//}

src/Hotline/Orders/Order.cs

@@ -134,7 +134,9 @@ namespace Hotline.Orders
         /// <summary>
         /// 受理类型
         /// </summary>
-        public EAcceptType AcceptType { get; set; }
+        //public EAcceptType AcceptType { get; set; }
+        public string AcceptType { get; set; }
+        public string AcceptTypeCode { get; set; }
 
         /// <summary>
         /// 紧急程度

src/Hotline/Orders/OrderDomainService.cs

@@ -7,6 +7,7 @@ using Hotline.Share.Mq;
 using MapsterMapper;
 using Microsoft.Extensions.Logging;
 using System.Threading;
+using Hotline.Share.Consts;
 using SqlSugar;
 using XF.Domain.Authentications;
 using XF.Domain.Cache;
@@ -69,9 +70,9 @@ public class OrderDomainService : IOrderDomainService, IScopeDependency
 
     public async Task<string> AddAsync(Order order, CancellationToken cancellationToken)
     {
-        if (order.OrderType == EOrderType.MarketSupervisionBy12315 && order.AcceptType == EAcceptType.Complain && order.OrderComplain == null)
+        if (order.OrderType == EOrderType.MarketSupervisionBy12315 && order.AcceptTypeCode == AcceptTypeConst.TouSu && order.OrderComplain == null)
             throw UserFriendlyException.SameMessage("非法投诉参数");
-        if (order.OrderType == EOrderType.MarketSupervisionBy12315 && order.AcceptType == EAcceptType.Report && order.OrderReport == null)
+        if (order.OrderType == EOrderType.MarketSupervisionBy12315 && order.AcceptTypeCode == AcceptTypeConst.JuBao && order.OrderReport == null)
             throw UserFriendlyException.SameMessage("非法举报参数");
 
         order.Init(_sessionContext.RequiredUserId, _sessionContext.UserName, _sessionContext.StaffNo);

src/Hotline/Settings/SysDicTypeConsts.cs

@@ -144,4 +144,9 @@ public class SysDicTypeConsts
 	/// 甄别申请类型
 	/// </summary>
 	public const string ScreenType = "ScreenType";
+
+    /// <summary>
+    /// 工单受理类型
+    /// </summary>
+	public const string AcceptType = "AcceptType";
 }