|  | @@ -155,8 +155,8 @@ public class AdsRoleAmountDataParentServiceImpl extends ServiceImpl<AdsRoleAmoun
 | 
											
												
													
														|  |                  .and(ADS_ROLE_AMOUNT_DATA_PARENT.SERVER_ID.isNotNull().or(ADS_ROLE_AMOUNT_DATA_TODAY_PARENT.SERVER_ID.isNotNull()))
 |  |                  .and(ADS_ROLE_AMOUNT_DATA_PARENT.SERVER_ID.isNotNull().or(ADS_ROLE_AMOUNT_DATA_TODAY_PARENT.SERVER_ID.isNotNull()))
 | 
											
												
													
														|  |                  .ge(AdsRoleAmountDataTodayParent::getDay, dto.getDtBegin())
 |  |                  .ge(AdsRoleAmountDataTodayParent::getDay, dto.getDtBegin())
 | 
											
												
													
														|  |                  .le(AdsRoleAmountDataTodayParent::getDay, dto.getDtBegin())
 |  |                  .le(AdsRoleAmountDataTodayParent::getDay, dto.getDtBegin())
 | 
											
												
													
														|  | -                .ge(AdsRoleAmountDataParent::getRoleTime, LocalDateTime.of(dto.getRoleCreateDayBegin(), LocalTime.MIDNIGHT))
 |  | 
 | 
											
												
													
														|  | -                .le(AdsRoleAmountDataParent::getRoleTime, LocalDateTime.of(dto.getRoleCreateDayEnd(), LocalTime.MAX))
 |  | 
 | 
											
												
													
														|  | 
 |  | +                .ge(AdsRoleAmountDataParent::getRoleTime, null == dto.getRoleCreateDayBegin() ? null : LocalDateTime.of(dto.getRoleCreateDayBegin(), LocalTime.MIDNIGHT), null != dto.getRoleCreateDayBegin())
 | 
											
												
													
														|  | 
 |  | +                .le(AdsRoleAmountDataParent::getRoleTime, null == dto.getRoleCreateDayEnd() ? null : LocalDateTime.of(dto.getRoleCreateDayEnd(), LocalTime.MAX), null != dto.getRoleCreateDayEnd())
 | 
											
												
													
														|  |                  .in(AdsRoleAmountDataParent::getGsId, dto.getGsIdList(), CollectionUtils.isNotEmpty(dto.getGsIdList()))
 |  |                  .in(AdsRoleAmountDataParent::getGsId, dto.getGsIdList(), CollectionUtils.isNotEmpty(dto.getGsIdList()))
 | 
											
												
													
														|  |                  .eq(AdsRoleAmountDataParent::getParentGameId, dto.getParentGameId(), null != dto.getParentGameId())
 |  |                  .eq(AdsRoleAmountDataParent::getParentGameId, dto.getParentGameId(), null != dto.getParentGameId())
 | 
											
												
													
														|  |                  .like(AdsRoleAmountDataParent::getRoleName, dto.getRoleName(), StringUtils.isNotBlank(dto.getRoleName()))
 |  |                  .like(AdsRoleAmountDataParent::getRoleName, dto.getRoleName(), StringUtils.isNotBlank(dto.getRoleName()))
 |