修改稽查查询
							parent
							
								
									e28665fd05
								
							
						
					
					
						commit
						281d10f3b4
					
				| 
						 | 
				
			
			@ -162,7 +162,8 @@ namespace IRaCIS.Core.Application.Service.Inspection
 | 
			
		|||
                        };
 | 
			
		||||
 | 
			
		||||
            query = query.WhereIf(dto.SiteId != null, x => x.SiteId == dto.SiteId)
 | 
			
		||||
                   .Where(x => (x.TrialId == dto.TrialId) || (x.TrialId == null && x.CreateTime >= trialData.CreateTime && x.CreateTime <= trialData.TrialFinishTime))
 | 
			
		||||
                    //.Where(x => (x.TrialId == dto.TrialId) || (x.TrialId == null && x.CreateTime >= trialData.CreateTime && x.CreateTime <= trialData.TrialFinishTime))
 | 
			
		||||
                    .Where(x => x.TrialId == dto.TrialId )
 | 
			
		||||
 | 
			
		||||
            #region 废弃
 | 
			
		||||
                   //   .WhereIf(dto.BatchId != null && dto.ObjectRelationParentId == null && dto.GeneralId == null, x => x.BatchId == dto.BatchId)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue