Merge branch 'package' of GameCenter/game-center into dev

game-gs-data/game-gs-data-serve/src/main/java/com/zanxiang/game/gs/data/serve/service/impl/AdsRoleAmountDataParentServiceImpl.java

@@ -58,12 +58,6 @@ public class AdsRoleAmountDataParentServiceImpl extends ServiceImpl<AdsRoleAmoun
 
     @Override
     public PageVO<BigRVO, Row> bigRListOfPage(BigRDTO dto) {
-        if (null == dto.getDtBegin()) {
-            dto.setDtBegin(LocalDate.now());
-        }
-        if (null == dto.getDtEnd()) {
-            dto.setDtEnd(LocalDate.now());
-        }
         if (StringUtils.isBlank(dto.getSortFiled())) {
             dto.setSortFiled(ADS_ROLE_AMOUNT_DATA_PARENT.TOTAL_AMOUNT.getName());
         } else {
@@ -153,8 +147,8 @@ public class AdsRoleAmountDataParentServiceImpl extends ServiceImpl<AdsRoleAmoun
                 .on(ADS_ROLE_AMOUNT_DATA_PARENT.GAME_ID.eq(ADS_ROLE_AMOUNT_DATA_TODAY_PARENT.GAME_ID)
                         .and(ADS_ROLE_AMOUNT_DATA_PARENT.ROLE_ID.eq(ADS_ROLE_AMOUNT_DATA_TODAY_PARENT.ROLE_ID)))
                 .and(ADS_ROLE_AMOUNT_DATA_PARENT.SERVER_ID.isNotNull().or(ADS_ROLE_AMOUNT_DATA_TODAY_PARENT.SERVER_ID.isNotNull()))
-                .ge(AdsRoleAmountDataTodayParent::getDay, dto.getDtBegin())
-                .le(AdsRoleAmountDataTodayParent::getDay, dto.getDtBegin())
+                .ge(AdsRoleAmountDataTodayParent::getDay, dto.getDtBegin(), null != dto.getDtBegin())
+                .le(AdsRoleAmountDataTodayParent::getDay, dto.getDtBegin(), null != dto.getDtEnd())
                 .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()))