Bläddra i källkod

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

tangjiang 3 månader sedan
förälder
incheckning
25da8a465b

+ 3 - 2
src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -901,10 +901,11 @@ namespace Hotline.Api.Controllers.Bi
             {
                 OrgName = "合计",
                 OrgCode = "",
-                AllTotal = list.Sum(p => p.AllTotal),
+                //AllTotal = list.Sum(p => p.AllTotal),
                 PassTotal = list.Sum(p => p.PassTotal),
                 NoPassTotal = list.Sum(p => p.NoPassTotal),
-                ExaminingTotal = list.Sum(p => p.ExaminingTotal)
+                ExaminingTotal = list.Sum(p => p.ExaminingTotal),
+                WithdrawTotal = list.Sum(p=> p.WithdrawTotal)
             });
 
             var orderDtos = _mapper.Map<ICollection<BiOrderDelayDataDto>>(list);

+ 5 - 0
src/Hotline.Application/Snapshot/SnapshotApplicationBase.cs

@@ -202,6 +202,11 @@ public abstract class SnapshotApplicationBase
         if (indurstry.IndustryType == EIndustryType.Declare)
         {
             outDto.AreaTree = (await _systemAreaDomainService.GetAreaTree(parentId: "510300")).Adapt<List<SystemAreaOutDto>>();
+            outDto.AreaTree.ToList().ForEach(m => 
+            {
+                if (m.Children.IsNullOrEmpty())
+                    m.Children = new List<SystemAreaOutDto>() { new SystemAreaOutDto { Id = "0",  AreaName = "无"} };
+            });
             outDto.Files = (await _fileRepository.GetByKeyAsync(indurstry.Id, requestAborted)).Adapt<List<IndustryFileDto>>();
             outDto.Files.ToList().ForEach(m => m.Url = fileDownloadApi + m.AdditionId);
             outDto.WorkplaceName = _systemDicDataCacheManager.WorkplaceName;