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

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/RoleLevelParamDTO.java

@@ -42,10 +42,10 @@ public class RoleLevelParamDTO extends BasePage {
    private String serverName;
 
    @ApiModelProperty(value = "角色创建时间最小值")
-   private LocalDateTime createTimeMin;
+   private LocalDate createTimeMin;
 
    @ApiModelProperty(value = "角色创建时间最大值")
-   private LocalDateTime createTimeMax;
+   private LocalDate createTimeMax;
 
    @ApiModelProperty(value = "角色等级最小值")
    private Long roleLevelMin;
@@ -54,10 +54,10 @@ public class RoleLevelParamDTO extends BasePage {
    private Long roleLevelMax;
 
    @ApiModelProperty(value = "等级上报最小值")
-   private LocalDateTime levelTimeMin;
+   private LocalDate levelTimeMin;
 
    @ApiModelProperty(value = "等级上报最大值")
-   private LocalDateTime levelTimeMax;
+   private LocalDate levelTimeMax;
 
    @ApiModelProperty(value = "gsId")
    private Long gsId;

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

@@ -35,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StopWatch;
 
+import java.time.LocalTime;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -1025,11 +1026,11 @@ public class RoleManageServiceImpl implements IRoleManageService {
         }
         //角色创建时间
         if (dto.getCreateTimeMin() != null && dto.getCreateTimeMax() != null) {
-            criA.where().andBetween("a.create_time", dto.getCreateTimeMin(), dto.getCreateTimeMax());
+            criA.where().andBetween("a.create_time", dto.getCreateTimeMin().atTime(LocalTime.MIN), dto.getCreateTimeMax().atTime(LocalTime.MAX));
         }
         //等级上报时间
         if (dto.getLevelTimeMin() != null && dto.getLevelTimeMax() != null) {
-            criA.where().andBetween("a.level_time", dto.getLevelTimeMin(), dto.getLevelTimeMax());
+            criA.where().andBetween("a.level_time", dto.getLevelTimeMin().atTime(LocalTime.MIN), dto.getLevelTimeMax().atTime(LocalTime.MAX));
         }
 
         return criA;