| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -96,12 +96,15 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        String lesseeName = (String) params.get("lesseeName"); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        String lesseeIdCard = (String) params.get("lesseeIdCard"); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        String lesseeMobile = (String) params.get("lesseeMobile"); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        String createdBy = (String) params.get("createdBy"); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        String startTime = (String) params.get("startTime"); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        String endTime = (String) params.get("endTime"); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        String endDate = (String) params.get("endDate"); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        String customerId = (String) params.get("customerId"); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        String dataFlag = (String) params.get("dataFlag"); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        QueryWrapper<RentContractInfoEntity> wrapper = new QueryWrapper<>(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        wrapper.eq(StringUtils.isNotBlank(gridId), "GRID_ID", gridId); | 
				
			
			
		
	
	
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
				
				 | 
				
					@ -116,10 +119,13 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        wrapper.eq(StringUtils.isNotBlank(lesseeName), "LESSEE_NAME", lesseeName); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        wrapper.eq(StringUtils.isNotBlank(lesseeIdCard), "LESSEE_ID_CARD", lesseeIdCard); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        wrapper.eq(StringUtils.isNotBlank(lesseeMobile), "LESSEE_MOBILE", lesseeMobile); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        wrapper.eq(StringUtils.isNotBlank(createdBy), "CREATED_BY", createdBy); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        wrapper.eq(StringUtils.isNotBlank(endDate), "END_DATE", endDate); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        wrapper.eq(StringUtils.isNotBlank(customerId), "CUSTOMER_ID", customerId); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        wrapper.eq(StringUtils.isNotBlank(dataFlag), "CREATED_BY", loginUserUtil.getLoginUserId()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        return wrapper; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    } | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  |