src/Hotline.Api/Controllers/DataSharing/WebPortalController.cs

@@ -359,7 +359,7 @@ namespace Hotline.Api.Controllers.DataSharing
         [HttpPost("getchartdata")]
         public async Task<OpenResponse> GetChartData()
         {
-            var startDate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
+            var startDate = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd 00:00:00"));
             var endDate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 23:59:59"));
 
             //数据查询
@@ -421,10 +421,10 @@ namespace Hotline.Api.Controllers.DataSharing
             var endDate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 23:59:59"));
             GetStatistDto getStatistDto = new()
             {
-                AllCount = await _dataOrderRepository.Queryable().GroupBy(p => p.OrderId).CountAsync(),
-                AllTrandCount = await _dataOrderRepository.Queryable().GroupBy(p => p.OrderId).Where(p => p.HandleState == "办理完成").CountAsync(),
-                DayCount = await _dataOrderRepository.Queryable().GroupBy(p => p.OrderId).Where(p => p.CaseDate >= startDate).Where(p => p.CaseDate <= endDate).CountAsync(),
-                DayTrandCount = await _dataOrderRepository.Queryable().GroupBy(p => p.OrderId).Where(p => p.HandleState == "办理完成").Where(p => p.CaseDate >= startDate).Where(p => p.CaseDate <= endDate).CountAsync()
+                AllCount = await _dataOrderRepository.Queryable().CountAsync(),
+                AllTrandCount = await _dataOrderRepository.Queryable().Where(p => p.HandleState == "办理完成").CountAsync(),
+                DayCount = await _dataOrderRepository.Queryable().Where(p => p.CaseDate >= startDate).Where(p => p.CaseDate <= endDate).CountAsync(),
+                DayTrandCount = await _dataOrderRepository.Queryable().Where(p => p.HandleState == "办理完成").Where(p => p.CaseDate >= startDate).Where(p => p.CaseDate <= endDate).CountAsync()
             };
 
             return OpenResponse.Ok(WebPortalDeResponse<GetStatistDto>.Success(getStatistDto));

src/Hotline.Application/Mappers/DataSharing/DsMapperConfigs.cs

@@ -114,7 +114,7 @@ namespace Hotline.Application.Mappers.DataSharing
             //延期申请
             config.ForType<PublishOrderDelayDto, DsDelayCaseInfoSend>()
             .Map(d => d.ApplyDelaynum, x => x.DelayNum)
-            .Map(d => d.ApplyDelayunit, x =>(int) x.DelayUnit)
+            .Map(d => d.ApplyDelayunit, x => (int)x.DelayUnit)
             .Map(d => d.ApplyName, x => x.EmployeeName)
             .Map(d => d.ApplyTime, x => x.ApplyDelayTime)
             .Map(d => d.ApplyOuname, x => x.ApplyOrgName)
@@ -130,7 +130,7 @@ namespace Hotline.Application.Mappers.DataSharing
            .Map(d => d.Title, x => x.CaseTitle)
            //.Map(d => d.AcceptorName, x => x.CaseRegister)
            //.Map(d => d.AcceptorStaffNo, x => x.CaseRegisterNo)
-          // .Map(d => d.CreationTime, x => x.CaseDate)
+           // .Map(d => d.CreationTime, x => x.CaseDate)
            .Map(d => d.Contact, x => x.PhoneNumber)
            .Map(d => d.FromName, x => x.AppLicantName)
            .Map(d => d.AgeRangeCode, x => x.AppLicantAge)
@@ -653,7 +653,8 @@ namespace Hotline.Application.Mappers.DataSharing
             #region 门户网站数据
             //办件摘编列表
             config.ForType<DsOrder, OrderListDto>()
-            .Map(d => d.FlowID, x => x.OrderId)
+               .Ignore(d => d.Source)
+               .Map(d => d.FlowID, x => x.OrderId)
                .Map(d => d.FlowCode, x => x.OrderNo)
                .Map(d => d.FlowPwd, x => x.Password)
                .Map(d => d.FlowTitle, x => string.IsNullOrEmpty(x.ArrangeTitle) ? x.Title : x.ArrangeTitle)

src/Hotline/DataSharing/Province/Services/ProvinceService.cs

@@ -446,7 +446,7 @@ namespace Hotline.DataSharing.Province.Services
                         CaseSource = dto.SourceChannel,
                         CaseSourceCode = dto.SourceChannelCode,
                         ExpiredTime = submitCaseInfo.TfdBackTimeBf,
-                        CaseType = submitCaseInfo.CaseType,
+                        CaseType = dto.AcceptType,
                         CaseTypeCode = dto.AcceptTypeCode,
                         AllDuration = 0,
                         IsProvince = false,