:fix:修改查询字段

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

@@ -343,14 +343,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
         //是否转端
         List<Long> isChange = dto.getIsChange();
         if (CollectionUtils.isNotEmpty(isChange)) {
-            if (isChange.contains(2L)) {
-                //是否转端
-                criA.where().andIsNull("is_change_game_type");
-            }
-            if (isChange.contains(1L) || isChange.contains(0L)) {
-                //是否转端
-                criA.where().andInList("is_change_game_type", dto.getIsChange());
-            }
+            criA.where().andInList("is_change_game_type", dto.getIsChange());
         }
         if (StringUtils.isNotBlank(dto.getWeChatCompany())) {
             //企业微信号
@@ -406,14 +399,8 @@ public class RoleManageServiceImpl implements IRoleManageService {
         }
         List<Long> isRemoveGame = dto.getIsRemoveGame();
         if (CollectionUtils.isNotEmpty(isRemoveGame)) {
-            if (isRemoveGame.contains(2L)) {
-                //是否退游
-                criA.where().andIsNull("is_remove_game");
-            }
-            if (isRemoveGame.contains(1L) || isRemoveGame.contains(0L)) {
-                //是否退游
-                criA.where().andInList("is_remove_game", dto.getIsRemoveGame());
-            }
+            //是否退游
+            criA.where().andInList("is_remove_game", dto.getIsRemoveGame());
         }
         if (dto.getIsRemoveGameForSystem() != null) {
             //是否退游(系统判定)
@@ -421,31 +408,17 @@ public class RoleManageServiceImpl implements IRoleManageService {
         }
         List<Long> isWakeUp = dto.getIsWakeUp();
         if (CollectionUtils.isNotEmpty(isWakeUp)) {
-            if (isWakeUp.contains(2L)) {
-                //是否唤醒
-                criA.where().andIsNull("is_wake_up");
-            }
-            if (isChange.contains(1L) || isChange.contains(0L)) {
-                //是否唤醒
-                criA.where().andInList("is_wake_up", dto.getIsWakeUp());
-            }
+            criA.where().andInList("is_wake_up", dto.getIsWakeUp());
         }
         List<Long> isAddCorpWechat = dto.getIsAddCorpWechat();
         if (CollectionUtils.isNotEmpty(isAddCorpWechat)) {
-            if (isAddCorpWechat.contains(2L)) {
-                //是否添加企微
-                criA.where().andIsNull("is_add_corp_wechat");
-            }
-            if (isAddCorpWechat.contains(0L) || isAddCorpWechat.contains(1L)) {
-                //是否添加企微
-                criA.where().andInList("is_add_corp_wechat", dto.getIsAddCorpWechat());
-            }
+            //是否添加企微
+            criA.where().andInList("is_add_corp_wechat", dto.getIsAddCorpWechat());
         }
         //角色最近活跃时间
         if (dto.getLastActiveTimeMax() != null && dto.getLastActiveTimeMin() != null) {
             criA.where().andBetween("DATE(role_active_time)", dto.getLastActiveTimeMin(), dto.getLastActiveTimeMax());
         }
-
         return criA;
     }
 
@@ -722,27 +695,16 @@ public class RoleManageServiceImpl implements IRoleManageService {
             //是否退游(系统判定)
             criA.where().andEquals("is_remove_game_for_system", dto.getIsRemoveGameForSystem());
         }
+        //是否唤醒
         List<Long> isWakeUp = dto.getIsWakeUp();
         if (CollectionUtils.isNotEmpty(isWakeUp)) {
-            if (isWakeUp.contains(2L)) {
-                //是否唤醒
-                criA.where().andIsNull("is_wake_up");
-            }
-            if (isChange.contains(1L) || isChange.contains(0L)) {
-                //是否唤醒
-                criA.where().andInList("is_wake_up", dto.getIsWakeUp());
-            }
+            criA.where().andInList("is_wake_up", dto.getIsWakeUp());
         }
         List<Long> isAddCorpWechat = dto.getIsAddCorpWechat();
         if (CollectionUtils.isNotEmpty(isAddCorpWechat)) {
-            if (isAddCorpWechat.contains(2L)) {
-                //是否添加企微
-                criA.where().andIsNull("is_add_corp_wechat");
-            }
-            if (isAddCorpWechat.contains(0L) || isAddCorpWechat.contains(1L)) {
-                //是否添加企微
-                criA.where().andInList("is_add_corp_wechat", dto.getIsAddCorpWechat());
-            }
+
+            criA.where().andInList("is_add_corp_wechat", dto.getIsAddCorpWechat());
+
         }
         //给充值时间查询条件
         Criteria criTodayAmount = Cnd.cri();
@@ -1583,15 +1545,14 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 		IFNULL(j.is_send_mail, 0) as is_send_mail, -- 是否发送邮件
                 		j.send_gift_id as send_gift_id, -- 最新发送礼包id
                 		k.gift_name as gift_name, -- 礼包名
-                		j.is_change_game_type as is_change_game_type, -- 是否转端 1-是；0-否
-                  		j.is_add_corp_wechat as is_add_corp_wechat, -- 是否添加企微 1-是； 0-否
+                		IFNULL(j.is_change_game_type,2) as is_change_game_type, -- 是否转端 1-是；0-否 2-未操作
+                  		IFNULL(j.is_add_corp_wechat,2) as is_add_corp_wechat, -- 是否添加企微 1-是； 0-否 2-未操作
                 		j.add_corp_user_id as add_corp_user_id, -- 企微号
                 		j.user_wechat as user_wechat, -- 客户微信号
                 		j.user_phone as user_phone, -- 客户手机号
-                		IF(TIMESTAMPDIFF(HOUR, g.update_time, NOW()) > 72,
-                        				IF(TIMESTAMPDIFF(HOUR, f.pay_time, NOW()) < 72 , 0, 1) , 0) as is_remove_game_for_system, -- 是否退游 1-是;0-否(系统判定)
-                        j.is_remove_game as is_remove_game, -- 是否退游 1-是;0-否;null-代表未操作数据
-                		j.is_wake_up as is_wake_up, -- 是否唤醒 1-是；0-否
+                		IF(TIMESTAMPDIFF(HOUR, g.update_time, NOW()) > 72,IF(TIMESTAMPDIFF(HOUR, f.pay_time, NOW()) < 72 , 0, 1) , 0) as is_remove_game_for_system, -- 是否退游 1-是;0-否(系统判定)
+                        IFNULL(j.is_remove_game,2) as is_remove_game, -- 是否退游 1-是;0-否;null-代表未操作数据
+                		IFNULL(j.is_wake_up,2) as is_wake_up, -- 是否唤醒 1-是；0-否 2-未操作
                 		j.remark as remark, -- 备注
                 		j.gs_id as gs_id, -- GS_ID
                 		j.customer_service_id as customer_service_id, -- 客服ID
@@ -2391,13 +2352,13 @@ public class RoleManageServiceImpl implements IRoleManageService {
                         y.put_user_id as put_user_id, -- 投手id
                         IFNULL(j.is_send_mail, 0) as is_send_mail, -- 是否发送邮件
                         j.send_gift_id as send_gift_id, -- 最新发送礼包id
-                        j.is_change_game_type as is_change_game_type, -- 是否转端 1-是；0-否
-                        j.is_add_corp_wechat as is_add_corp_wechat, -- 是否添加企微 1-是； 0-否
+                        IFNULL(j.is_change_game_type,2) as is_change_game_type, -- 是否转端 1-是；0-否
+                        IFNULL(j.is_add_corp_wechat,2) as is_add_corp_wechat, -- 是否添加企微 1-是； 0-否
                         j.user_phone as user_phone, -- 客户手机号
                         IF(TIMESTAMPDIFF(HOUR, g.update_time, NOW()) > 72,
                         IF(TIMESTAMPDIFF(HOUR, f.pay_time, NOW()) < 72 , 0, 1) , 0) as is_remove_game_for_system, -- 是否退游 1-是;0-否(系统判定)
-                        j.is_remove_game as is_remove_game, -- 是否退游 1-是;0-否;null-代表未操作数据
-                        j.is_wake_up as is_wake_up, -- 是否唤醒 1-是；0-否
+                        IFNULL(j.is_remove_game,2) as is_remove_game, -- 是否退游 1-是;0-否;2-代表未操作数据
+                        IFNULL(j.is_wake_up,2) as is_wake_up, -- 是否唤醒 1-是；0-否 2-未操作
                         j.gs_id as gs_id, -- GS_ID
                         j.customer_service_id as customer_service_id, -- 客服ID
                         j.oper_user_id as oper_user_id, -- 运营ID