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

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

@@ -2186,7 +2186,7 @@ namespace Hotline.Api.Controllers.Bi
                 })
                 .FirstAsync();
 
-			if (listInfo != null && listInfo.Rows.Count > 0 && orderAgingData != null)
+            if (listInfo != null && listInfo.Rows.Count > 0 && orderAgingData != null)
             {
                 orderAgingData.OrderCount = orderAgingData.OrderCount + Convert.ToInt32(listInfo.Rows[0]["AllCount"]);
                 orderAgingData.CompletedAging = orderAgingData.CompletedAging + Convert.ToInt32(listInfo.Rows[0]["OrderWorkTime"]);
@@ -2636,7 +2636,7 @@ namespace Hotline.Api.Controllers.Bi
                 })
                 .FirstAsync();
 
-			enterpriseOrderDto.InProgressCount = enterpriseOrderData.InProgressCount;
+            enterpriseOrderDto.InProgressCount = enterpriseOrderData.InProgressCount;
             enterpriseOrderDto.CompletedCount = enterpriseOrderData.CompletedCount;
             enterpriseOrderDto.CenterCount = enterpriseOrderData.CenterCount;
             enterpriseOrderDto.CityCount = enterpriseOrderData.CityCount;
@@ -2648,20 +2648,20 @@ namespace Hotline.Api.Controllers.Bi
                 .Where((it, so) => it.VisitTarget == EVisitTarget.Org && it.OrderVisit.VisitTime >= StartTime && it.OrderVisit.VisitTime <= EndTime && it.OrderVisit.VisitState == EVisitState.Visited && it.OrderVisit.Order.IdentityType == EIdentityType.Enterprise)
                 .GroupBy((it, so) => it.Id)
                 .Select((it, so) => new EnterpriseOrderDto
-                 {
-                     VisitdCount = SqlFunc.AggregateCount(1),
-					 Dissatisfied = SqlFunc.AggregateSum(SqlFunc.IIF(SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "1") || SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "2"), 1, 0)),
-                     Satisfied = SqlFunc.AggregateSum(SqlFunc.IIF(!SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "1") && !SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "2"), 1, 0)),
-                     CityDissatisfied = SqlFunc.AggregateSum(SqlFunc.IIF((SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "1") || SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "2")) && so.OrgType == EOrgType.City, 1, 0)),
-                     CitySatisfied = SqlFunc.AggregateSum(SqlFunc.IIF(!SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "1") && !SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "2") && so.OrgType == EOrgType.City, 1, 0)),
-                     CountyDissatisfied = SqlFunc.AggregateSum(SqlFunc.IIF((SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "1") || SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "2")) && so.OrgType == EOrgType.County, 1, 0)),
-                     CountySatisfied = SqlFunc.AggregateSum(SqlFunc.IIF(!SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "1") && !SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "2") && so.OrgType == EOrgType.County, 1, 0)),
-                 })
+                {
+                    VisitdCount = SqlFunc.AggregateCount(1),
+                    Dissatisfied = SqlFunc.AggregateSum(SqlFunc.IIF(SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "1") || SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "2"), 1, 0)),
+                    Satisfied = SqlFunc.AggregateSum(SqlFunc.IIF(!SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "1") && !SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "2"), 1, 0)),
+                    CityDissatisfied = SqlFunc.AggregateSum(SqlFunc.IIF((SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "1") || SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "2")) && so.OrgType == EOrgType.City, 1, 0)),
+                    CitySatisfied = SqlFunc.AggregateSum(SqlFunc.IIF(!SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "1") && !SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "2") && so.OrgType == EOrgType.City, 1, 0)),
+                    CountyDissatisfied = SqlFunc.AggregateSum(SqlFunc.IIF((SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "1") || SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "2")) && so.OrgType == EOrgType.County, 1, 0)),
+                    CountySatisfied = SqlFunc.AggregateSum(SqlFunc.IIF(!SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "1") && !SqlFunc.JsonListObjectAny(it.OrgProcessingResults, "key", "2") && so.OrgType == EOrgType.County, 1, 0)),
+                })
                 .ToListAsync();
 
-			if (enterpriseOrderDto2.Any())
+            if (enterpriseOrderDto2.Any())
             {
-                centerReportStatisticsDto.EnterpriseOrderDto.VisitdCount = enterpriseOrderDto2.Sum(x=>x.VisitdCount);
+                centerReportStatisticsDto.EnterpriseOrderDto.VisitdCount = enterpriseOrderDto2.Sum(x => x.VisitdCount);
                 centerReportStatisticsDto.EnterpriseOrderDto.Dissatisfied = enterpriseOrderDto2.Sum(x => x.Dissatisfied);
                 centerReportStatisticsDto.EnterpriseOrderDto.CityDissatisfied = enterpriseOrderDto2.Sum(x => x.CityDissatisfied);
                 centerReportStatisticsDto.EnterpriseOrderDto.CountyDissatisfied = enterpriseOrderDto2.Sum(x => x.CountyDissatisfied);
@@ -3180,6 +3180,129 @@ namespace Hotline.Api.Controllers.Bi
             return ExcelStreamResult(stream, "部门受理类型统计周期数据");
         }
 
+
+        /// <summary>
+        /// 部门受理类型统计（宜宾原始功能）
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpGet("department_acceptance_type_statistics_v1")]
+        public async Task<object> DepartmentAcceptanceTypeStatisticsV1([FromQuery] DepartmentKeyWordRequest dto)
+        {
+            var items = await _orderReportApplication.DepartmentAcceptanceTypeStatisticsV1(dto).ToListAsync();
+
+            var countySumModel = new DepartmentAcceptanceTypeStatisticsV1Dto()
+            {
+                OrgName = "区县合计",
+                OrgCode = "",
+                OrgTypeText = "",
+                ZxAllCount = items.Where(x => x.OrgType == EOrgType.County).Sum(p => p.ZxAllCount),
+                ZxAcceptanceTypeCode = "10",
+
+                JyAllCount = items.Where(x => x.OrgType == EOrgType.County).Sum(p => p.JyAllCount),
+                JyAcceptanceTypeCode = "15",
+
+                QzAllCount = items.Where(x => x.OrgType == EOrgType.County).Sum(p => p.QzAllCount),
+                QzAcceptanceTypeCode = "20",
+
+                ByAllCount = items.Where(x => x.OrgType == EOrgType.County).Sum(p => p.ByAllCount),
+                ByAcceptanceTypeCode = "25",
+
+                JbAllCount = items.Where(x => x.OrgType == EOrgType.County).Sum(p => p.JbAllCount),
+                JbAcceptanceTypeCode = "30",
+
+                TsAllCount = items.Where(x => x.OrgType == EOrgType.County).Sum(p => p.TsAllCount),
+                TsAcceptanceTypeCode = "35",
+
+                QtAllCount = items.Where(x => x.OrgType == EOrgType.County).Sum(p => p.QtAllCount),
+                QtAcceptanceTypeCode = "40",
+
+                YjAllCount = items.Where(x => x.OrgType == EOrgType.County).Sum(p => p.YjAllCount),
+                YjAcceptanceTypeCode = "1",
+
+                HmAllCount = items.Where(x => x.OrgType == EOrgType.County).Sum(p => p.HmAllCount),
+                HmAcceptanceTypeCode = "2",
+
+                DqAllCount = items.Where(x => x.OrgType == EOrgType.County).Sum(p => p.DqAllCount),
+                DqAcceptanceTypeCode = "3"
+            };
+
+            var citySumModel = new DepartmentAcceptanceTypeStatisticsV1Dto()
+            {
+                OrgName = "市直合计",
+                OrgCode = "",
+                OrgTypeText = "",
+                ZxAllCount = items.Where(x => x.OrgType == EOrgType.City && x.OrgCode != "001").Sum(p => p.ZxAllCount),
+                ZxAcceptanceTypeCode = "10",
+
+                JyAllCount = items.Where(x => x.OrgType == EOrgType.City && x.OrgCode != "001").Sum(p => p.JyAllCount),
+                JyAcceptanceTypeCode = "15",
+
+                QzAllCount = items.Where(x => x.OrgType == EOrgType.City && x.OrgCode != "001").Sum(p => p.QzAllCount),
+                QzAcceptanceTypeCode = "20",
+
+                ByAllCount = items.Where(x => x.OrgType == EOrgType.City && x.OrgCode != "001").Sum(p => p.ByAllCount),
+                ByAcceptanceTypeCode = "25",
+
+                JbAllCount = items.Where(x => x.OrgType == EOrgType.City && x.OrgCode != "001").Sum(p => p.JbAllCount),
+                JbAcceptanceTypeCode = "30",
+
+                TsAllCount = items.Where(x => x.OrgType == EOrgType.City && x.OrgCode != "001").Sum(p => p.TsAllCount),
+                TsAcceptanceTypeCode = "35",
+
+                QtAllCount = items.Where(x => x.OrgType == EOrgType.City && x.OrgCode != "001").Sum(p => p.QtAllCount),
+                QtAcceptanceTypeCode = "40",
+
+                YjAllCount = items.Where(x => x.OrgType == EOrgType.City && x.OrgCode != "001").Sum(p => p.YjAllCount),
+                YjAcceptanceTypeCode = "1",
+
+                HmAllCount = items.Where(x => x.OrgType == EOrgType.City && x.OrgCode != "001").Sum(p => p.HmAllCount),
+                HmAcceptanceTypeCode = "2",
+
+                DqAllCount = items.Where(x => x.OrgType == EOrgType.City && x.OrgCode != "001").Sum(p => p.DqAllCount),
+                DqAcceptanceTypeCode = "3"
+            };
+
+            var sumModel = new DepartmentAcceptanceTypeStatisticsV1Dto()
+            {
+                OrgName = "总计",
+                OrgCode = "",
+                OrgTypeText = "",
+                ZxAllCount = items.Sum(p => p.ZxAllCount),
+                ZxAcceptanceTypeCode = "10",
+
+                JyAllCount = items.Sum(p => p.JyAllCount),
+                JyAcceptanceTypeCode = "15",
+
+                QzAllCount = items.Sum(p => p.QzAllCount),
+                QzAcceptanceTypeCode = "20",
+
+                ByAllCount = items.Sum(p => p.ByAllCount),
+                ByAcceptanceTypeCode = "25",
+
+                JbAllCount = items.Sum(p => p.JbAllCount),
+                JbAcceptanceTypeCode = "30",
+
+                TsAllCount = items.Sum(p => p.TsAllCount),
+                TsAcceptanceTypeCode = "35",
+
+                QtAllCount = items.Sum(p => p.QtAllCount),
+                QtAcceptanceTypeCode = "40",
+
+                YjAllCount = items.Sum(p => p.YjAllCount),
+                YjAcceptanceTypeCode = "1",
+
+                HmAllCount = items.Sum(p => p.HmAllCount),
+                HmAcceptanceTypeCode = "2",
+
+                DqAllCount = items.Sum(p => p.DqAllCount),
+                DqAcceptanceTypeCode = "3"
+            };
+
+            return new { DataList = items, CountySumModel = countySumModel, CitySumModel = citySumModel, SumModel = sumModel };
+        }
+
+
         /// <summary>
         /// 部门办件统计表
         /// </summary>
@@ -5861,123 +5984,123 @@ namespace Hotline.Api.Controllers.Bi
                    .ToListAsync(HttpContext.RequestAborted);
         }
 
-		/// <summary>
-		/// 超期退回统计
-		/// </summary>
-		/// <param name="dto"></param>
-		/// <returns></returns>
-		[HttpGet("extended_sendback_statistics")]
-		public async Task<List<ExtendedSendBackVo>> ExtendedSendBackStatistics([FromQuery] PagedKeywordRequest dto)
-		{
-			var quer = _orderApplication.ExtendedSendBackStatistics(dto);
+        /// <summary>
+        /// 超期退回统计
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpGet("extended_sendback_statistics")]
+        public async Task<List<ExtendedSendBackVo>> ExtendedSendBackStatistics([FromQuery] PagedKeywordRequest dto)
+        {
+            var quer = _orderApplication.ExtendedSendBackStatistics(dto);
             var list = await quer.ToListAsync(HttpContext.RequestAborted);
-			list.Add(new ExtendedSendBackVo()
-			{
-                OrgName ="合计",
-				TotalNum = list.Sum(m => m.TotalNum),
-				PassNum = list.Sum(p => p.PassNum),
-				NoPassNum = list.Sum(m => m.NoPassNum),
-				AuditNum = list.Sum(m => m.AuditNum)
-			});
-
-			return list;
-		}
-
-		/// <summary>
-		/// 超期退回统计导出
-		/// </summary>
-		/// <returns></returns>
-		[HttpPost("extended_sendback_statistics/_export")]
-		public async Task<FileStreamResult> ExtendedSendBackStatisticsExport([FromBody] ExportExcelDto<PagedKeywordRequest> dto)
-		{
-			var query = _orderApplication.ExtendedSendBackStatistics(dto.QueryDto);
-			List<ExtendedSendBackVo> data;
-
-			data = await query.ToListAsync(HttpContext.RequestAborted);
-
-			data.Add(new ExtendedSendBackVo()
-			{
-				OrgName = "合计",
-				TotalNum = data.Sum(m => m.TotalNum),
-				PassNum = data.Sum(p => p.PassNum),
-				NoPassNum = data.Sum(m => m.NoPassNum),
-				AuditNum = data.Sum(m => m.AuditNum)
-			});
-
-			dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
-
-			var dtos = data
-				.Select(stu => _mapper.Map(stu, typeof(ExtendedSendBackVo), dynamicClass))
-				.Cast<object>()
-				.ToList();
-
-			var stream = ExcelHelper.CreateStream(dtos);
-
-			return ExcelStreamResult(stream, "超期退回统计");
-		}
-
-		/// <summary>
-		/// 超期退回统计明细
-		/// </summary>
-		/// <param name="dto"></param>
-		/// <returns></returns>
-		[HttpGet("extended_sendback_detail")]
-		public async Task<PagedDto<SendBackDto>> ExtendedSendBackDetail([FromQuery] ExtendedSendBackRequest dto)
-		{
-			var quer = _orderApplication.ExtendedSendBackDetail(dto);
-			var (total, items) = await quer.ToPagedListAsync(dto.PageIndex, dto.PageSize);
-
-			return new PagedDto<SendBackDto>(total, _mapper.Map<IReadOnlyList<SendBackDto>>(items));
-		}
-
-		/// <summary>
-		/// 超期退回统计明细导出
-		/// </summary>
-		/// <returns></returns>
-		[HttpPost("extended_sendback_detail/_export")]
-		public async Task<FileStreamResult> ExtendedSendBackDetailExport([FromBody] ExportExcelDto<ExtendedSendBackRequest> dto)
-		{
-			var query = _orderApplication.ExtendedSendBackDetail(dto.QueryDto);
-			List<OrderSendBackAudit> data;
-			if (dto.IsExportAll)
-			{
-				data = await query.ToListAsync(HttpContext.RequestAborted);
-			}
-			else
-			{
-				var (_, items) = await query.ToPagedListAsync(dto.QueryDto, HttpContext.RequestAborted);
-				data = items;
-			}
-
-			var dataDtos = _mapper.Map<ICollection<SendBackDto>>(data);
-
-			dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
-
-			var dtos = dataDtos
-				.Select(stu => _mapper.Map(stu, typeof(SendBackDto), dynamicClass))
-				.Cast<object>()
-				.ToList();
-
-			var stream = ExcelHelper.CreateStream(dtos);
-
-			return ExcelStreamResult(stream, "超期退回统计明细");
-		}
-
-		/// <summary>
-		/// 列表页面基础数据
-		/// </summary>
-		/// <returns></returns>
-		[HttpGet("extended_sendback_detail/base-data")]
-		public async Task<object> ExtendedSendBackDetailBaseData()
-		{
-			var rsp = new
-			{
-				AcceptTypeOptions = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.AcceptType),
-				ChannelOptions = _sysDicDataCacheManager.GetSysDicDataCache(TimeLimitBaseDataConsts.SourceChannel),
-				SendBackAuditState = EnumExts.GetDescriptions<ESendBackAuditState>()
-			};
-			return rsp;
-		}
+            list.Add(new ExtendedSendBackVo()
+            {
+                OrgName = "合计",
+                TotalNum = list.Sum(m => m.TotalNum),
+                PassNum = list.Sum(p => p.PassNum),
+                NoPassNum = list.Sum(m => m.NoPassNum),
+                AuditNum = list.Sum(m => m.AuditNum)
+            });
+
+            return list;
+        }
+
+        /// <summary>
+        /// 超期退回统计导出
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("extended_sendback_statistics/_export")]
+        public async Task<FileStreamResult> ExtendedSendBackStatisticsExport([FromBody] ExportExcelDto<PagedKeywordRequest> dto)
+        {
+            var query = _orderApplication.ExtendedSendBackStatistics(dto.QueryDto);
+            List<ExtendedSendBackVo> data;
+
+            data = await query.ToListAsync(HttpContext.RequestAborted);
+
+            data.Add(new ExtendedSendBackVo()
+            {
+                OrgName = "合计",
+                TotalNum = data.Sum(m => m.TotalNum),
+                PassNum = data.Sum(p => p.PassNum),
+                NoPassNum = data.Sum(m => m.NoPassNum),
+                AuditNum = data.Sum(m => m.AuditNum)
+            });
+
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+
+            var dtos = data
+                .Select(stu => _mapper.Map(stu, typeof(ExtendedSendBackVo), dynamicClass))
+                .Cast<object>()
+                .ToList();
+
+            var stream = ExcelHelper.CreateStream(dtos);
+
+            return ExcelStreamResult(stream, "超期退回统计");
+        }
+
+        /// <summary>
+        /// 超期退回统计明细
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpGet("extended_sendback_detail")]
+        public async Task<PagedDto<SendBackDto>> ExtendedSendBackDetail([FromQuery] ExtendedSendBackRequest dto)
+        {
+            var quer = _orderApplication.ExtendedSendBackDetail(dto);
+            var (total, items) = await quer.ToPagedListAsync(dto.PageIndex, dto.PageSize);
+
+            return new PagedDto<SendBackDto>(total, _mapper.Map<IReadOnlyList<SendBackDto>>(items));
+        }
+
+        /// <summary>
+        /// 超期退回统计明细导出
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("extended_sendback_detail/_export")]
+        public async Task<FileStreamResult> ExtendedSendBackDetailExport([FromBody] ExportExcelDto<ExtendedSendBackRequest> dto)
+        {
+            var query = _orderApplication.ExtendedSendBackDetail(dto.QueryDto);
+            List<OrderSendBackAudit> data;
+            if (dto.IsExportAll)
+            {
+                data = await query.ToListAsync(HttpContext.RequestAborted);
+            }
+            else
+            {
+                var (_, items) = await query.ToPagedListAsync(dto.QueryDto, HttpContext.RequestAborted);
+                data = items;
+            }
+
+            var dataDtos = _mapper.Map<ICollection<SendBackDto>>(data);
+
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+
+            var dtos = dataDtos
+                .Select(stu => _mapper.Map(stu, typeof(SendBackDto), dynamicClass))
+                .Cast<object>()
+                .ToList();
+
+            var stream = ExcelHelper.CreateStream(dtos);
+
+            return ExcelStreamResult(stream, "超期退回统计明细");
+        }
+
+        /// <summary>
+        /// 列表页面基础数据
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("extended_sendback_detail/base-data")]
+        public async Task<object> ExtendedSendBackDetailBaseData()
+        {
+            var rsp = new
+            {
+                AcceptTypeOptions = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.AcceptType),
+                ChannelOptions = _sysDicDataCacheManager.GetSysDicDataCache(TimeLimitBaseDataConsts.SourceChannel),
+                SendBackAuditState = EnumExts.GetDescriptions<ESendBackAuditState>()
+            };
+            return rsp;
+        }
 
         /// <summary>
         /// 网上群众路线通报
@@ -5989,9 +6112,9 @@ namespace Hotline.Api.Controllers.Bi
         {
             var nowList = await _orderRepository.Queryable()
                 .Where(x => x.CreationTime >= dto.StartTime && x.CreationTime <= dto.EndTime).ToListAsync();
-                
 
-            var oldList =await _orderRepository.Queryable()
+
+            var oldList = await _orderRepository.Queryable()
                 .Where(x => x.CreationTime >= dto.ChainStartTime && x.CreationTime <= dto.ChainEndTime).ToListAsync();
 
 
@@ -5999,7 +6122,7 @@ namespace Hotline.Api.Controllers.Bi
             //市12345政务服务便民热线
             var Other = new OnlineMassLineReportRes();
             Other.SourceChannel = "市12345政务服务便民热线";
-            Other.SumCount = nowList.Where(x => x.IsProvince==false && x.SourceChannelCode != "SZYSM").Count(); //市12345政务服务便民热线
+            Other.SumCount = nowList.Where(x => x.IsProvince == false && x.SourceChannelCode != "SZYSM").Count(); //市12345政务服务便民热线
             Other.PreviousCount = oldList.Where(x => x.IsProvince == false && x.SourceChannelCode != "SZYSM").Count(); //市12345政务服务便民热线
             returnList.Add(Other);
             //中国政府网“我向总理说句话”
@@ -6017,16 +6140,16 @@ namespace Hotline.Api.Controllers.Bi
             //省12345政务服务便民热线
             var Province12345 = new OnlineMassLineReportRes();
             Province12345.SourceChannel = "省12345政务服务便民热线";
-            Province12345.SumCount = nowList.Where(x => x.IsProvince == true && x.ReceiveProvinceNo.StartsWith("GJZWFWPT")==false && x.ReceiveProvinceNo.StartsWith("ZGZFW")==false).Count(); //国家政务服务平台“投诉与建议”
-            Province12345.PreviousCount = oldList.Where(x => x.IsProvince == true && x.ReceiveProvinceNo.StartsWith("GJZWFWPT")==false && x.ReceiveProvinceNo.StartsWith("ZGZFW")==false).Count(); //国家政务服务平台“投诉与建议”
+            Province12345.SumCount = nowList.Where(x => x.IsProvince == true && x.ReceiveProvinceNo.StartsWith("GJZWFWPT") == false && x.ReceiveProvinceNo.StartsWith("ZGZFW") == false).Count(); //国家政务服务平台“投诉与建议”
+            Province12345.PreviousCount = oldList.Where(x => x.IsProvince == true && x.ReceiveProvinceNo.StartsWith("GJZWFWPT") == false && x.ReceiveProvinceNo.StartsWith("ZGZFW") == false).Count(); //国家政务服务平台“投诉与建议”
             returnList.Add(Province12345);
             //市政府网站“市长与网民”
             var SZYSM = new OnlineMassLineReportRes();
             SZYSM.SourceChannel = "市政府网站“市长与网民”";
-            SZYSM.SumCount = nowList.Where(x => x.SourceChannelCode=="SZYSM").Count(); //国家政务服务平台“投诉与建议”
+            SZYSM.SumCount = nowList.Where(x => x.SourceChannelCode == "SZYSM").Count(); //国家政务服务平台“投诉与建议”
             SZYSM.PreviousCount = oldList.Where(x => x.SourceChannelCode == "SZYSM").Count(); //国家政务服务平台“投诉与建议”
             returnList.Add(SZYSM);
             return returnList;
         }
-	}
+    }
 }

src/Hotline.Api/Controllers/FwThirdController.cs

@@ -363,31 +363,31 @@ namespace Hotline.Api.Controllers
                    RSFlagName = p.Status >= EOrderStatus.Filed ? "办理完成" : "办理中"
                });
 
-            var queryold = _oldPublicDataRepository.Queryable()
-                      .WhereIF(!string.IsNullOrEmpty(dto.FlowCode), p => p.OrderNo == dto.FlowCode)
-                      .WhereIF(!string.IsNullOrEmpty(dto.FlowName), p => p.Title.Contains(dto.FlowName))
-                      .WhereIF(!string.IsNullOrEmpty(dto.FlowSType), p => p.AcceptTypeCode == dto.FlowSType)
-                      .WhereIF(!string.IsNullOrEmpty(dto.FlowRType), p => p.HotspotId == dto.FlowRType)
-                      .WhereIF(!string.IsNullOrEmpty(dto.FlowSDate), p => p.AcceptTime >= DateTime.Parse(DateTime.Parse(dto.FlowSDate).ToString("yyyy-MM-dd 00:00:00")))//dto.FlowSDate
-                      .WhereIF(!string.IsNullOrEmpty(dto.FlowEDate), p => p.AcceptTime <= DateTime.Parse(DateTime.Parse(dto.FlowEDate).ToString("yyyy-MM-dd 00:00:00")))// dto.FlowEDate
-                      .WhereIF(!string.IsNullOrEmpty(dto.FlowFrom), p => p.FromName.Contains(dto.FlowFrom))
-                      .WhereIF(dto.IdentityType.HasValue, p => p.IdentityType == dto.IdentityType)
-                      .OrderByDescending(p => p.PubDate)
-                        .Select(p => new OrderListDto
-                        {
-                            FlowID = p.OrderId,
-                            FlowCode = p.OrderNo,
-                            FlowPwd = p.OrderPwd,
-                            FlowTitle = p.Title,
-                            FlowFromName = p.SourceChannelCode,
-                            FlowPurTypeName = p.AcceptTypeCode,
-                            ConTypeName = p.HotspotName,
-                            FlowAddDate = p.CreationTime,
-                            PubDate = p.CreationTime,
-                            RSFlagName = p.State == "1" ? "办理完成" : "办理中"
-                        });
-
-            var (total, items) = await _orderRepository.UnionAll(queryNew, queryold)
+            //var queryold = _oldPublicDataRepository.Queryable()
+            //          .WhereIF(!string.IsNullOrEmpty(dto.FlowCode), p => p.OrderNo == dto.FlowCode)
+            //          .WhereIF(!string.IsNullOrEmpty(dto.FlowName), p => p.Title.Contains(dto.FlowName))
+            //          .WhereIF(!string.IsNullOrEmpty(dto.FlowSType), p => p.AcceptTypeCode == dto.FlowSType)
+            //          .WhereIF(!string.IsNullOrEmpty(dto.FlowRType), p => p.HotspotId == dto.FlowRType)
+            //          .WhereIF(!string.IsNullOrEmpty(dto.FlowSDate), p => p.AcceptTime >= DateTime.Parse(DateTime.Parse(dto.FlowSDate).ToString("yyyy-MM-dd 00:00:00")))//dto.FlowSDate
+            //          .WhereIF(!string.IsNullOrEmpty(dto.FlowEDate), p => p.AcceptTime <= DateTime.Parse(DateTime.Parse(dto.FlowEDate).ToString("yyyy-MM-dd 00:00:00")))// dto.FlowEDate
+            //          .WhereIF(!string.IsNullOrEmpty(dto.FlowFrom), p => p.FromName.Contains(dto.FlowFrom))
+            //          .WhereIF(dto.IdentityType.HasValue, p => p.IdentityType == dto.IdentityType)
+            //          .OrderByDescending(p => p.PubDate)
+            //            .Select(p => new OrderListDto
+            //            {
+            //                FlowID = p.OrderId,
+            //                FlowCode = p.OrderNo,
+            //                FlowPwd = p.OrderPwd,
+            //                FlowTitle = p.Title,
+            //                FlowFromName = p.SourceChannelCode,
+            //                FlowPurTypeName = p.AcceptTypeCode,
+            //                ConTypeName = p.HotspotName,
+            //                FlowAddDate = p.CreationTime,
+            //                PubDate = p.CreationTime,
+            //                RSFlagName = p.State == "1" ? "办理完成" : "办理中"
+            //            });
+
+            var (total, items) = await queryNew
                 .OrderByDescending(p => p.PubDate)
                  .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 

src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -679,6 +679,7 @@ namespace Hotline.Api.Controllers
             var knowledge = await _knowledgeRepository.Queryable()
                 .Includes(x => x.SourceOrganize)
                 .Includes(x => x.KnowledgeTypes)
+                .Includes(x=>x.KnowledgeOrganizes)
                 .Includes(x => x.HotspotType)
                 .FirstAsync(p => p.Id == Id, HttpContext.RequestAborted);
             if (knowledge is null)

src/Hotline.Application/StatisticalReport/IOrderReportApplication.cs

@@ -117,6 +117,13 @@ namespace Hotline.Application.StatisticalReport
         /// <returns></returns>
         ISugarQueryable<DepartmentAcceptanceTypeStatisticsDto> DepartmentAcceptanceTypeStatistics(DepartmentKeyWordRequest dto);
 
+        /// <summary>
+        /// 部门受理类型统计
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        ISugarQueryable<DepartmentAcceptanceTypeStatisticsV1Dto> DepartmentAcceptanceTypeStatisticsV1(DepartmentKeyWordRequest dto);
+
         /// <summary>
         /// 部门受理类型统计周期--明细列表
         /// </summary>

src/Hotline.Application/StatisticalReport/OrderReportApplication.cs

@@ -23,6 +23,7 @@ using Hotline.Statistics;
 using Hotline.Users;
 using MapsterMapper;
 using Microsoft.AspNetCore.Mvc;
+using Quartz.Simpl;
 using SqlSugar;
 using System.Data;
 using XF.Domain.Authentications;
@@ -2305,6 +2306,78 @@ namespace Hotline.Application.StatisticalReport
                  .MergeTable();
         }
 
+        /// <summary>
+        /// 部门受理类型统计周期（宜宾原始）
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        public ISugarQueryable<DepartmentAcceptanceTypeStatisticsV1Dto> DepartmentAcceptanceTypeStatisticsV1(DepartmentKeyWordRequest dto)
+        {
+            var IsCenter = _sessionContext.OrgIsCenter;
+            var centerOrgName = _systemSettingCacheManager.GetSetting(SettingConstants.CenterOrgName)?.SettingValue[0];
+
+
+            var orderData = _orderRepository.Queryable()
+              .WhereIF(dto.StartTime.HasValue, it => it.StartTime >= dto.StartTime)
+              .WhereIF(dto.EndTime.HasValue, it => it.StartTime <= dto.EndTime)
+              .WhereIF(dto.TypeId != null && dto.TypeId == 1, it => it.IdentityType == EIdentityType.Citizen)
+              .WhereIF(dto.TypeId != null && dto.TypeId == 2, it => it.IdentityType == EIdentityType.Enterprise)
+              .Select(it => new
+              {
+                  OrgCode = string.IsNullOrEmpty(dto.OrgCode) ? it.ActualHandleOrgCode.Substring(0, 6) : it.ActualHandleOrgCode.Substring(0, _sessionContext.RequiredOrgId.Length + 3),
+                  AcceptTypeCode = it.AcceptTypeCode
+              })
+              .MergeTable()
+
+              //.WhereIF(!IsCenter, p => p.OrgCode.StartsWith(_sessionContext.RequiredOrgId))
+
+              .LeftJoin<SystemOrganize>((it, o) => it.OrgCode == o.Id)
+              .GroupBy((it, o) => new
+              {
+                  it.OrgCode,
+                  o.Name,
+                  o.OrgType
+              })
+              .Select((it, o) => new DepartmentAcceptanceTypeStatisticsV1Dto
+              {
+                  OrgName = it.OrgCode == "001" ? centerOrgName : o.Name,
+                  OrgCode = it.OrgCode,
+                  OrgType = o.OrgType,
+                  OrgTypeText = o.OrgType == EOrgType.County ? "区县部门" : "市直部门",
+                  ZxAllCount = SqlFunc.AggregateSum(SqlFunc.IIF(it.AcceptTypeCode == "10", 1, 0)),
+                  ZxAcceptanceTypeCode = "10",
+
+                  JyAllCount = SqlFunc.AggregateSum(SqlFunc.IIF(it.AcceptTypeCode == "15", 1, 0)),
+                  JyAcceptanceTypeCode = "15",
+
+                  QzAllCount = SqlFunc.AggregateSum(SqlFunc.IIF(it.AcceptTypeCode == "20", 1, 0)),
+                  QzAcceptanceTypeCode = "20",
+
+                  ByAllCount = SqlFunc.AggregateSum(SqlFunc.IIF(it.AcceptTypeCode == "25", 1, 0)),
+                  ByAcceptanceTypeCode = "25",
+
+                  JbAllCount = SqlFunc.AggregateSum(SqlFunc.IIF(it.AcceptTypeCode == "30", 1, 0)),
+                  JbAcceptanceTypeCode = "30",
+
+                  TsAllCount = SqlFunc.AggregateSum(SqlFunc.IIF(it.AcceptTypeCode == "35", 1, 0)),
+                  TsAcceptanceTypeCode = "35",
+
+                  QtAllCount = SqlFunc.AggregateSum(SqlFunc.IIF(it.AcceptTypeCode == "40", 1, 0)),
+                  QtAcceptanceTypeCode = "40",
+
+                  YjAllCount = SqlFunc.AggregateSum(SqlFunc.IIF(it.AcceptTypeCode == "1", 1, 0)),
+                  YjAcceptanceTypeCode = "1",
+
+                  HmAllCount = SqlFunc.AggregateSum(SqlFunc.IIF(it.AcceptTypeCode == "2", 1, 0)),
+                  HmAcceptanceTypeCode = "2",
+
+                  DqAllCount = SqlFunc.AggregateSum(SqlFunc.IIF(it.AcceptTypeCode == "3", 1, 0)),
+                  DqAcceptanceTypeCode = "3"
+              }).MergeTable();
+            return orderData;
+        }
+
+
         /// <summary>
         /// 受理类型统计
         /// </summary>

src/Hotline.Share/Dtos/Knowledge/KnowledgeDto.cs

@@ -268,7 +268,8 @@ namespace Hotline.Share.Dtos.Knowledge
         public List<FileJson>? FileJson { get; set; }
 
         public List<KnowledgeTypeDto> KnowledgeTypes { get; set; }
-    }
+		public List<OrgDto> KnowledgeOrganizes { get; set; }
+	}
 
     public class KnowledgeBaseDto {
 		public DateTime? LastModificationTime { get; set; }

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

@@ -1,4 +1,6 @@
-namespace Hotline.Share.Dtos.Order
+using Hotline.Settings;
+
+namespace Hotline.Share.Dtos.Order
 {
 
     public class DepartmentAcceptanceTypeStatisticsDto
@@ -101,4 +103,85 @@
             return 0;
         }
     }
+
+    public class DepartmentAcceptanceTypeStatisticsV1Dto
+    {
+        /// <summary>
+        /// 部门名称
+        /// </summary>
+        public string OrgName { get; set; }
+        public string OrgCode { get; set; }
+
+        /// <summary>
+        /// 部门类型
+        /// </summary>
+        public EOrgType OrgType { get; set; }
+        public string OrgTypeText { get; set; }
+
+        /// <summary>
+        /// 总量
+        /// </summary>
+        public int AllCount => ZxAllCount + JyAllCount + QzAllCount + ByAllCount + JbAllCount + TsAllCount + QtAllCount;
+        public string? AcceptanceTypeCode { get; set; }
+
+        /// <summary>
+        /// 咨询
+        /// </summary>
+        public int ZxAllCount { get; set; }
+        public string? ZxAcceptanceTypeCode { get; set; }
+
+        /// <summary>
+        /// 建议
+        /// </summary>
+        public int JyAllCount { get; set; }
+        public string? JyAcceptanceTypeCode { get; set; }
+
+        /// <summary>
+        /// 求助
+        /// </summary>
+        public int QzAllCount { get; set; }
+        public string? QzAcceptanceTypeCode { get; set; }
+
+        /// <summary>
+        /// 表扬
+        /// </summary>
+        public int ByAllCount { get; set; }
+        public string? ByAcceptanceTypeCode { get; set; }
+
+        /// <summary>
+        /// 举报
+        /// </summary>
+        public int JbAllCount { get; set; }
+        public string? JbAcceptanceTypeCode { get; set; }
+
+        /// <summary>
+        /// 投诉
+        /// </summary>
+        public int TsAllCount { get; set; }
+        public string? TsAcceptanceTypeCode { get; set; }
+
+        /// <summary>
+        /// 其他
+        /// </summary>
+        public int QtAllCount { get; set; }
+        public string? QtAcceptanceTypeCode { get; set; }
+
+        /// <summary>
+        /// 意见
+        /// </summary>
+        public int YjAllCount { get; set; }
+        public string? YjAcceptanceTypeCode { get; set; }
+
+        /// <summary>
+        /// 惠民帮助
+        /// </summary>
+        public int HmAllCount { get; set; }
+        public string? HmAcceptanceTypeCode { get; set; }
+
+        /// <summary>
+        /// 大气污染举报
+        /// </summary>
+        public int DqAllCount { get; set; }
+        public string? DqAcceptanceTypeCode { get; set; }
+    }
 }

src/Hotline.Share/Requests/DepartmentKeyWordRequest.cs

@@ -5,12 +5,12 @@
         /// <summary>
         /// 开始时间
         /// </summary>
-        public DateTime StartTime { get; set; }
+        public DateTime? StartTime { get; set; }
 
         /// <summary>
         /// 结束时间
         /// </summary>
-        public DateTime EndTime { get; set; }
+        public DateTime? EndTime { get; set; }
 
         /// <summary>
         /// 部门编码