合并冲突

src/Hotline.Api/Controllers/OrderController.cs

@@ -370,6 +370,9 @@ public class OrderController : BaseController
                     if (order is { ProcessType: EProcessType.Zhiban, CounterSignType: null })
                     {
                         orderVisit.VisitState = EVisitState.Visited;
+                        orderVisit.VisitTime = DateTime.Now;
+                        orderVisit.VisitType = EVisitType.OtherVisit;
+                        orderVisit.NowEvaluate = new Kv() { Key = "4", Value = "满意" };
                     }
 
                     if (order.CounterSignType != ECounterSignType.Center)
@@ -396,7 +399,7 @@ public class OrderController : BaseController
                     {
                         var satisfy = new Kv() { Key = "4", Value = "满意" };
                         orgDetail.OrgProcessingResults = satisfy;
-                        orgDetail.OrgHandledAttitude = satisfy;
+                        //orgDetail.OrgHandledAttitude = satisfy;
                     }
 
                     visitedDetail.Add(orgDetail);
@@ -511,6 +514,9 @@ public class OrderController : BaseController
         if (order is { ProcessType: EProcessType.Zhiban, CounterSignType: null })
         {
             orderVisit.VisitState = EVisitState.Visited;
+            orderVisit.VisitTime = DateTime.Now;
+            orderVisit.VisitType = EVisitType.OtherVisit;
+            orderVisit.NowEvaluate = new Kv() { Key = "4", Value = "满意" };
         }
 
         if (order.CounterSignType != ECounterSignType.Center)
@@ -537,7 +543,7 @@ public class OrderController : BaseController
             {
                 var satisfy = new Kv() { Key = "4", Value = "满意" };
                 orgDetail.OrgProcessingResults = satisfy;
-                orgDetail.OrgHandledAttitude = satisfy;
+                //orgDetail.OrgHandledAttitude = satisfy;
             }
 
             visitedDetail.Add(orgDetail);
@@ -3656,7 +3662,7 @@ public class OrderController : BaseController
                 d => d.CreationTime >= dto.StCreationTime && d.CreationTime <= dto.EndCreationTime)
             .WhereIF(dto is { StartTimeSt: not null, StartTimeEnd: not null }, d => d.StartTime >= dto.StartTimeSt && d.StartTime <= dto.StartTimeEnd)
             .WhereIF(!string.IsNullOrEmpty(dto.StepName), d => d.ActualHandleStepName == dto.StepName)
-            .WhereIF(!string.IsNullOrEmpty(dto.ActualHandleOrgName), d => d.ActualHandleOrgName == dto.ActualHandleOrgName!)
+            .WhereIF(!string.IsNullOrEmpty(dto.CurrentHandleOrgName), d => d.CurrentHandleOrgName == dto.CurrentHandleOrgName!)
             .WhereIF(dto.Status.HasValue, d => d.Status == dto.Status)
             .WhereIF(!string.IsNullOrEmpty(dto.AcceptorName), d => d.AcceptorName!.Contains(dto.AcceptorName!))
             .WhereIF(dto.ExpiredStatus is EExpiredStatus.Normal, d => DateTime.Now < d.NearlyExpiredTime)

src/Hotline.Api/config/appsettings.Development.json

@@ -1,7 +1,7 @@
 {
   "AllowedHosts": "*",
   "CallCenterConfiguration": {
-    "CallCenterType": "XingTang", //XunShi、WeiErXin、TianRun、XingTang
+    "CallCenterType": "TianRun", //XunShi、WeiErXin、TianRun、XingTang
     "NewRock": {
       "Address": "http://192.168.100.100/xml",
       "Authorize": true,

src/Hotline.Application/Orders/OrderApplication.cs

@@ -1284,7 +1284,9 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             .InnerJoin<Hotspot>((x, h) => h.Id == x.OrderVisit.Order.HotspotId.Substring(SqlFunc.MappingColumn<int>("0"), SqlFunc.MappingColumn<int>("2")) && h.ParentId == null)
             .Where(x => x.OrderVisit.VisitTime >= dto.StartTime.Value && x.OrderVisit.VisitTime <= dto.EndTime.Value && x.VisitTarget == EVisitTarget.Org && x.OrderVisit.VisitState == EVisitState.Visited && !string.IsNullOrEmpty(x.VisitOrgCode))
             .WhereIF(string.IsNullOrEmpty(dto.HotspotName) == false, (x, h) => h.HotSpotName == dto.HotspotName)
-            .WhereIF(IsCenter == false, x => x.VisitOrgCode.StartsWith(_sessionContext.OrgId));
+            .WhereIF(IsCenter == false, x => x.VisitOrgCode.StartsWith(_sessionContext.OrgId))
+            .WhereIF(dto.TypeId == 1 ,x=>x.OrgProcessingResults != null)
+			.WhereIF(dto.TypeId == 2, x => x.OrgHandledAttitude != null);
 
         var data = new List<VisitAndHotspotSatisfactionStatisticsDto>();
 

src/Hotline.Application/Orders/OrderSendBackAuditApplication.cs

@@ -36,7 +36,7 @@ namespace Hotline.Application.Orders
 				.WhereIF(dto.AuditState == 1, d => d.State == ESendBackAuditState.Apply)
 				.WhereIF(dto is { AuditState: 2, State: null }, d => d.State > ESendBackAuditState.Apply)
 				.WhereIF(dto.AuditState is 2 or 3 && dto.State.HasValue, d => d.State == dto.State)
-				.WhereIF(dto.AuditState == 3 && _sessionContext.RequiredOrgId != OrgSeedData.CenterId, x => x.SendBackOrgId.StartsWith(_sessionContext.OrgId))
+				.WhereIF(dto.AuditState == 3 && _sessionContext.RequiredOrgId != OrgSeedData.CenterId, x => x.ApplyOrgId.StartsWith(_sessionContext.OrgId))
 				.WhereIF(_sessionContext.Roles.Contains("role_sysadmin") == false && dto.AuditState != 3, x => x.SendBackOrgId == _sessionContext.OrgId) // 123 系统管理员;
 				.OrderByDescending(x => x.CreationTime);
 		}

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

@@ -809,7 +809,7 @@ namespace Hotline.Repository.SqlSugar.Orders
                .Where(x => x.AcceptTypeCode == dto.AcceptTypeCode && x.CreationTime.ToString("yyyy-MM-dd") == Date)
                .WhereIF(!string.IsNullOrEmpty(dto.No), x => x.No == dto.No)
                .WhereIF(!string.IsNullOrEmpty(dto.Title), x => x.Title.Contains(dto.Title))
-               .WhereIF(!string.IsNullOrEmpty(dto.ActualHandleOrgName), x => x.ActualHandleOrgName.Contains(dto.ActualHandleOrgName))
+               .WhereIF(!string.IsNullOrEmpty(dto.CurrentHandleOrgName), x => x.ActualHandleOrgName.Contains(dto.CurrentHandleOrgName))
                .Select(x => new HotspotAndAreaStatisticsDetailDto
                {
                    Id = x.Id,

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

@@ -81,7 +81,7 @@ namespace Hotline.Share.Dtos.Order
         /// <summary>
         /// 接办部门
         /// </summary>
-        public string? ActualHandleOrgName { get; set; }
+        public string? CurrentHandleOrgName { get; set; }
 
         /// <summary>
         /// 状态

src/Hotline.Share/Requests/PagedKeywordRequest.cs

@@ -453,7 +453,7 @@ public record AcceptTypeStatisticsByDateDetailReq:PagedRequest
     /// <summary>
     /// 接办部门名称
     /// </summary>
-    public string? ActualHandleOrgName { get; set; }
+    public string? CurrentHandleOrgName { get; set; }
 
     /// <summary>
     /// 受理类型Code

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -609,6 +609,7 @@ namespace Hotline.FlowEngine.Workflows
             //    applicantIsCenter, cancellationToken);
             var trace = workflow.Traces.First(t => t.StepId == currentStep.Id);
             _mapper.Map(dto, trace);
+            trace.FileJson = currentStep.FileJson;
 
             //HandleTrace(trace, dto.Opinion, current);
 

src/Hotline/Permissions/EPermission.cs

@@ -2287,6 +2287,16 @@ namespace Hotline.Permissions
         /// </summary>
         [Display(GroupName ="数据统计",Name ="热点区域统计",Description ="热点区域统计")]
         HotspotAndAreaStatistics = 110222,
+        /// <summary>
+        /// 热点满意度统计
+        /// </summary>
+        [Display(GroupName ="数据统计",Name ="热点满意度统计",Description ="热点满意度统计")]
+        HotspotSatisfiedStatistics = 110223,
+        /// <summary>
+        /// 热点受理类型统计
+        /// </summary>
+        [Display(GroupName = "数据统计", Name = "热点受理类型统计", Description = "热点受理类型统计")]
+        HotspotAcceptTypeStatistics = 110234,
         #endregion
 
         #region 知识库统计（11,03,00）
@@ -2543,12 +2553,19 @@ namespace Hotline.Permissions
         /// </summary>
         [Display(GroupName = "省平台对接", Name = "省平台对接", Description = "省平台对接")]
         ProvinceAbutment = 140000,
+        #region 省综合查询
         /// <summary>
         /// 省综合查询
         /// </summary>
         [Display(GroupName ="省平台对接",Name ="省综合查询",Description ="省综合查询")]
         ProvinceOrderList = 140100,
         /// <summary>
+        /// 省工单退回
+        /// </summary>
+        [Display(GroupName = "省平台对接", Name = "省工单退回", Description = "省工单退回")]
+        ProvinceSendBack = 140101,
+        #endregion
+        /// <summary>
         /// 省延期查询
         /// </summary>
         [Display(GroupName ="省平台对接",Name ="省延期查询",Description ="省延期查询")]