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

src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -297,7 +297,7 @@ namespace Hotline.Api.Controllers
 		[HttpGet("search_num/list")]
 		public async Task<PagedDto<KnowledgeDto>> SearchNumList([FromQuery] KnowledgeCollectListDto dto)
 		{
-			var (total, items) = await _knowledgeRepository.Queryable()
+			var (total, items) = await _knowledgeRepository.Queryable(false,false,false)
 				.Where(x => x.Status == EKnowledgeStatus.OnShelf)
 				.Where(x => (x.ExpiredTime != null &&  x.ExpiredTime >= DateTime.Now) || x.ExpiredTime == null)
 				.OrderByDescending(x => x.SearchNum)
@@ -521,7 +521,7 @@ namespace Hotline.Api.Controllers
 				hotspotHotSpotFullName = hotspot?.HotSpotFullName;
 			}
 			var sugar = _knowledgeRepository
-				.Queryable()
+				.Queryable(false,false,false)
 				.Includes(x => x.User)
 				.Includes(x => x.SystemOrganize)
 				.Includes(x => x.KnowledgeType)

src/Hotline.Share/Dtos/DataSharing/PusherHotlineDto/AddOrderTracesDto.cs

@@ -0,0 +1,20 @@
+using Hotline.Share.Dtos.FlowEngine.Workflow;
+
+namespace Hotline.Share.Dtos.DataSharing.PusherHotlineDto
+{
+    /// <summary>
+    /// 新增工单办理流程记录
+    /// </summary>
+    public class AddOrderTracesDto
+    {
+        /// <summary>
+        /// 工单ID
+        /// </summary>
+        public string OrderId { get; set; }
+
+        /// <summary>
+        /// 流程数据
+        /// </summary>
+        public ICollection<WorkflowTraceDto> Traces { get; set; }
+    }
+}

src/Hotline.Share/Dtos/DataSharing/PusherHotlineDto/CancelOrderDto.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Hotline.Share.Dtos.DataSharing.PusherHotlineDto
+{
+    /// <summary>
+    /// 撤销工单
+    /// </summary>
+    public class CancelOrderDto
+    {
+        /// <summary>
+        /// 工单Id
+        /// </summary>
+        public string OrderId { get; set; }
+
+        /// <summary>
+        /// 意见
+        /// </summary>
+        public string Opinion { get; set; }
+    }
+}

src/Hotline.Share/Dtos/DataSharing/PusherHotlineDto/OrderResultDto.cs

@@ -0,0 +1,18 @@
+using Hotline.Share.Dtos.File;
+
+namespace Hotline.Share.Dtos.DataSharing.PusherHotlineDto
+{
+    /// <summary>
+    /// 办理或退回
+    /// </summary>
+    public class OrderResultDto
+    {
+        public string OrderId { get; set; }
+
+        public string Opinion { get; set; }
+
+        public string FinishType { get; set; }
+
+        public List<FileDto> Files { get; set; }
+    }
+}

src/Hotline.Share/Dtos/DataSharing/PusherHotlineDto/ProvinceSendDelayResultDto.cs

@@ -0,0 +1,26 @@
+using Hotline.Share.Dtos.File;
+namespace Hotline.Share.Dtos.DataSharing.PusherHotlineDto
+{
+    /// <summary>
+    /// 省延期结果通知
+    /// </summary>
+    public class ProvinceSendDelayResultDto
+    {
+        /// <summary>
+        /// 省工单编号
+        /// </summary>
+        public string No { get; set; }
+
+        /// <summary>
+        /// 是否通过审批
+        /// </summary>
+        public bool IsPass { get; set; }
+
+        /// <summary>
+        /// 办理意见
+        /// </summary>
+        public string Opinion { get; set; }
+
+        public List<FileDto> Files { get; set; }
+    }
+}

src/Hotline.Share/Dtos/DataSharing/PusherHotlineDto/ProvinceSendOrderSuperviseDto.cs

@@ -0,0 +1,15 @@
+using Hotline.Share.Dtos.File;
+using Hotline.Share.Dtos.Order;
+
+namespace Hotline.Share.Dtos.DataSharing.PusherHotlineDto
+{
+    /// <summary>
+    /// 督办工单派发
+    /// </summary>
+    public class ProvinceSendOrderSuperviseDto
+    {
+        public ProvinceOrderSuperviseDto? ProvinceOrderSuperviseDto { get; set; }
+
+        public List<FileDto>? Files { get; set; }
+    }
+}

src/Hotline.Share/Dtos/DataSharing/PusherHotlineDto/ProvinceSendScreenResultDto.cs

@@ -0,0 +1,15 @@
+using Hotline.Share.Dtos.File;
+using Hotline.Share.Dtos.Order;
+
+namespace Hotline.Share.Dtos.DataSharing.PusherHotlineDto
+{
+    /// <summary>
+    /// 省工单甄别结果
+    /// </summary>
+    public class ProvinceSendScreenResultDto
+    {
+        public ProvinceScreenResult ProvinceScreenResult { get; set; }
+
+        public List<FileDto> Files { get; set; }
+    }
+}

src/Hotline.Share/Dtos/DataSharing/PusherHotlineDto/ReceiveOrderDto.cs

@@ -0,0 +1,18 @@
+using Hotline.Share.Dtos.File;
+using Hotline.Share.Dtos.Order;
+
+namespace Hotline.Share.Dtos.DataSharing.PusherHotlineDto
+{
+    /// <summary>
+    /// 工单受理
+    /// </summary>
+    public class ReceiveOrderDto
+    {
+        public AddOrderDto AddOrderDto { get; set; }
+
+        /// <summary>
+        /// 附件列表
+        /// </summary>
+        public List<FileDto>? Files { get; set; }
+    }
+}

src/Hotline.Share/Hotline.Share.csproj

@@ -7,7 +7,7 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);1591;8618;</NoWarn>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.0.40</Version>
+    <Version>1.0.44</Version>
   </PropertyGroup>
 
   <ItemGroup>