修改内容：角色战力排行榜修改

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

@@ -57,6 +57,12 @@ public class RoleCombatRankingDTO extends BasePage {
     @ApiModelProperty(value = "是否合服：true -> 合服 ； false -> 不合服")
     private Boolean isMergeServer;
 
+    /**
+     * 区服名称
+     */
+    @ApiModelProperty(value = "区服名称")
+    private String serverName;
+
     /**
      * 排序字段
      */

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

@@ -196,7 +196,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
      */
     private Map<String, Object> getNameById(Map<String, Object> dataMap){
 
-        /*//投手名
+        //投手名
         if (dataMap.get("put_user_id") != null) {
             dataMap.put("put_user_name",
                     sysUserRpc.getById(Long.valueOf((String) dataMap.get("put_user_id"))).getData().getNickname());
@@ -215,7 +215,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
         if (dataMap.get("customer_service_id") != null) {
             dataMap.put("customer_service_name",
                     sysUserRpc.getById((Long) dataMap.get("customer_service_id")).getData().getNickname());
-        }*/
+        }
 
         return dataMap;
     }
@@ -240,6 +240,10 @@ public class RoleManageServiceImpl implements IRoleManageService {
             //原始区服列表
             cri.where().andIn("server_id", dto.getServerIds().toArray(String[]::new));
         }
+        if (StringUtils.isNotBlank(dto.getServerName())) {
+            //区服名称
+            cri.where().andLike("server_name", dto.getServerName());
+        }
         if (StringUtils.isNotBlank(dto.getSourceSystem())) {
             cri.where().andEquals("source_system", dto.getSourceSystem());
         }
@@ -284,6 +288,10 @@ public class RoleManageServiceImpl implements IRoleManageService {
             //原始服区服列表
             criRole.where().andIn("server_id", dto.getServerIds().toArray(String[]::new));
         }
+        if (StringUtils.isNotBlank(dto.getServerName())) {
+            //区服名称
+            cri.where().andLike("server_name", dto.getServerName());
+        }
         if (StringUtils.isNotBlank(dto.getSourceSystem())) {
             criRole.where().andEquals("source_system", dto.getSourceSystem());
         }
@@ -361,6 +369,10 @@ public class RoleManageServiceImpl implements IRoleManageService {
         if (StringUtils.isNotBlank(dto.getSourceSystem())) {
             cri.where().andEquals("source_system", dto.getSourceSystem());
         }
+        if (StringUtils.isNotBlank(dto.getServerName())) {
+            //区服名称
+            cri.where().andLike("boss_server_name", dto.getServerName());
+        }
         //拼接分组条件
         cri.getGroupBy().groupBy("source_system" , "boss_server_id" , "parent_game_id" , "super_game_id");
         //分页
@@ -401,6 +413,10 @@ public class RoleManageServiceImpl implements IRoleManageService {
             //合服区服列表
             criRole.where().andIn("boss_server_id", dto.getServerIds().toArray(String[]::new));
         }
+        if (StringUtils.isNotBlank(dto.getServerName())) {
+            //区服名称
+            cri.where().andLike("boss_server_name", dto.getServerName());
+        }
         if (StringUtils.isNotBlank(dto.getSourceSystem())) {
             criRole.where().andEquals("source_system", dto.getSourceSystem());
         }
@@ -478,6 +494,10 @@ public class RoleManageServiceImpl implements IRoleManageService {
             //原始区服列表
             cri.where().andIn("server_id", dto.getServerIds().toArray(String[]::new));
         }
+        if (StringUtils.isNotBlank(dto.getServerName())) {
+            //区服名称
+            cri.where().andLike("server_name", dto.getServerName());
+        }
         if (StringUtils.isNotBlank(dto.getSourceSystem())) {
             cri.where().andEquals("source_system", dto.getSourceSystem());
         }
@@ -522,6 +542,10 @@ public class RoleManageServiceImpl implements IRoleManageService {
             //原始服区服列表
             criRole.where().andIn("server_id", dto.getServerIds().toArray(String[]::new));
         }
+        if (StringUtils.isNotBlank(dto.getServerName())) {
+            //区服名称
+            cri.where().andLike("server_name", dto.getServerName());
+        }
         if (StringUtils.isNotBlank(dto.getSourceSystem())) {
             criRole.where().andEquals("source_system", dto.getSourceSystem());
         }
@@ -595,6 +619,10 @@ public class RoleManageServiceImpl implements IRoleManageService {
         if (StringUtils.isNotBlank(dto.getSourceSystem())) {
             cri.where().andEquals("source_system", dto.getSourceSystem());
         }
+        if (StringUtils.isNotBlank(dto.getServerName())) {
+            //区服名称
+            cri.where().andLike("boss_server_name", dto.getServerName());
+        }
         //拼接分组条件
         cri.getGroupBy().groupBy("source_system" , "boss_server_id" , "super_game_id");
         //分页
@@ -635,6 +663,10 @@ public class RoleManageServiceImpl implements IRoleManageService {
             //合服区服列表
             criRole.where().andIn("boss_server_id", dto.getServerIds().toArray(String[]::new));
         }
+        if (StringUtils.isNotBlank(dto.getServerName())) {
+            //区服名称
+            cri.where().andLike("boss_server_name", dto.getServerName());
+        }
         if (StringUtils.isNotBlank(dto.getSourceSystem())) {
             criRole.where().andEquals("source_system", dto.getSourceSystem());
         }
@@ -1041,7 +1073,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                             game_id,
                             gift_name
                         FROM dm_game_order.t_game_gift
-                    ) k on j.source_system = k.source_system AND j.send_gift_id = k.id AND j.game_id = k.game_id
+                    ) k on j.source_system = k.source_system AND j.send_gift_id = k.id
                     LEFT JOIN (
                         SELECT
                             source_system ,
@@ -1402,7 +1434,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                                game_id,
                                gift_name
                            FROM dm_game_order.t_game_gift
-                       ) k on j.source_system = k.source_system AND j.send_gift_id = k.id AND j.game_id = k.game_id
+                       ) k on j.source_system = k.source_system AND j.send_gift_id = k.id
                        LEFT JOIN (
                            SELECT
                                source_system ,
@@ -1514,6 +1546,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                     	server_id, -- 区服ID
                     	MAX(server_name) as server_name, -- 区服名
                     	MAX(dt) as dt, -- 开服时间
+                    	TIMESTAMPDIFF(DAY, MAX(dt), NOW()) start_day, -- 开服天数
                     	boss_server_id, -- 合服ID
                     	MAX(boss_server_name) as boss_server_name, -- 合服名
                     	MAX(merge_time) as merge_time , -- 合服时间
@@ -1816,6 +1849,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 	server_id, -- 区服ID
                 	MAX(server_name) as server_name, -- 区服名
                 	MAX(dt) as dt, -- 开服日期
+                	TIMESTAMPDIFF(DAY, MAX(dt), NOW()) start_day, -- 开服天数
                 	boss_server_id, -- 合服ID
                 	MAX(boss_server_name) as boss_server_name, -- 合服名
                 	MAX(merge_time) as merge_time , -- 合服时间