| 
					
				 | 
			
			
				@@ -28,6 +28,7 @@ using OASystem.Infrastructure.Repositories.Groups; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 using StackExchange.Redis; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 using System; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 using System.Data; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+using System.Runtime.Intrinsics.Arm; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 using TencentCloud.Ocr.V20181119.Models; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 using static OASystem.API.OAMethodLib.GeneralMethod; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 using TypeInfo = OASystem.Domain.ViewModels.Statistics.TypeInfo; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -7931,9 +7932,26 @@ GROUP BY 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 ORDER BY 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   CNYTotal ASC", beginDt, endDt); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            var dailyItems = await _sqlSugar.SqlQueryable<DailyInfo>(dailySql).ToArrayAsync(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            var dailyItems = await _sqlSugar.Queryable<Fin_DailyFeePayment, Sys_SetData, Sys_SetDataType, Sys_Company>((dfp, sd, sdt, c) => 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                new JoinQueryInfos( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    JoinType.Left, dfp.PriceTypeId == sd.Id, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    JoinType.Left, sd.STid == sdt.Id, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    JoinType.Left, dfp.CompanyId == c.Id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                 )).Select((dfp, sd, sdt, c) => new DailyInfo() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    Id = dfp.Id, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    PriceParentTypeId = sdt.Id, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    PriceParentTypeName = sdt.Name, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    PriceTypeId = sd.Id, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    PriceTypeName = sd.Name, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    CompanyName = c.CompanyName, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    Instructions = dfp.Instructions, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    CNYTotal = dfp.SumPrice, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //PriceInfos = SqlFunc.Subqueryable<Fin_DailyFeePaymentContent>().Where(dfpc => dfp.IsDel == 0 && dfp.Id == dfpc.DFPId).ToList() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                .ToListAsync(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             view.GroupItems = groupItems; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            view.DailyItems = dailyItems; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            //view.DailyItems = dailyItems; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return view; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -8078,7 +8096,6 @@ ORDER BY 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //51    其他费用 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             var feeTypeDatas = await _sqlSugar.Queryable<Sys_SetData>().Where(x => x.IsDel == 0 && new int[] { 48, 49, 90, 50, 51 }.Contains(x.Id)).ToListAsync(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (excelType == 1) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 //团组收款、成本、利润 合计 
			 |