添加首页统计模块

bill-manager/src/main/java/com/mortals/xhx/module/ph/web/PhQueueStatController.java

@@ -91,7 +91,7 @@ public class PhQueueStatController extends BaseCRUDJsonBodyMappingController<PhQ
     private static void addGroup(PhQueueStatEntity query) {
         if (!ObjectUtils.isEmpty(query.getSiteId())) {
             List<String> groupList = query.getGroupList();
-            if (groupList.contains("siteId")) {
+            if (!groupList.contains("siteId")) {
                 groupList.add("siteId");
             }
         }
@@ -100,7 +100,7 @@ public class PhQueueStatController extends BaseCRUDJsonBodyMappingController<PhQ
                 ||!ObjectUtils.isEmpty(query.getSectionNameList())
                 ||!ObjectUtils.isEmpty(query.getSectionNameNotList())) {
             List<String> groupList = query.getGroupList();
-            if (groupList.contains("sectionName")) {
+            if (!groupList.contains("sectionName")) {
                 groupList.add("sectionName");
             }
         }
@@ -108,7 +108,7 @@ public class PhQueueStatController extends BaseCRUDJsonBodyMappingController<PhQ
                 ||!ObjectUtils.isEmpty(query.getHallNameList())
                 ||!ObjectUtils.isEmpty(query.getHallNameNotList())) {
             List<String> groupList = query.getGroupList();
-            if (groupList.contains("hallName")) {
+            if (!groupList.contains("hallName")) {
                 groupList.add("hallName");
             }
         }
@@ -117,7 +117,7 @@ public class PhQueueStatController extends BaseCRUDJsonBodyMappingController<PhQ
                 ||!ObjectUtils.isEmpty(query.getWindowFromnumList())
                 ||!ObjectUtils.isEmpty(query.getWindowFromnumNotList())) {
             List<String> groupList = query.getGroupList();
-            if (groupList.contains("windowFromnum")) {
+            if (!groupList.contains("windowFromnum")) {
                 groupList.add("windowFromnum");
             }
         }
@@ -126,7 +126,7 @@ public class PhQueueStatController extends BaseCRUDJsonBodyMappingController<PhQ
                 ||!ObjectUtils.isEmpty(query.getBusinessList())
                 ||!ObjectUtils.isEmpty(query.getHallNameNotList())) {
             List<String> groupList = query.getGroupList();
-            if (groupList.contains("business")) {
+            if (!groupList.contains("business")) {
                 groupList.add("business");
             }
         }

bill-manager/src/main/java/com/mortals/xhx/module/pj/web/PjEvaluateStatController.java

@@ -93,7 +93,7 @@ public class PjEvaluateStatController extends BaseCRUDJsonBodyMappingController<
     private static void addGroup(PjEvaluateStatEntity query) {
         if (!ObjectUtils.isEmpty(query.getSiteId())) {
             List<String> groupList = query.getGroupList();
-            if (groupList.contains("siteId")) {
+            if (!groupList.contains("siteId")) {
                 groupList.add("siteId");
             }
         }
@@ -102,7 +102,7 @@ public class PjEvaluateStatController extends BaseCRUDJsonBodyMappingController<
                 ||!ObjectUtils.isEmpty(query.getSectionNameList())
                 ||!ObjectUtils.isEmpty(query.getSectionNameNotList())) {
             List<String> groupList = query.getGroupList();
-            if (groupList.contains("sectionName")) {
+            if (!groupList.contains("sectionName")) {
                 groupList.add("sectionName");
             }
         }
@@ -110,7 +110,7 @@ public class PjEvaluateStatController extends BaseCRUDJsonBodyMappingController<
                 ||!ObjectUtils.isEmpty(query.getHallNameList())
                 ||!ObjectUtils.isEmpty(query.getHallNameNotList())) {
             List<String> groupList = query.getGroupList();
-            if (groupList.contains("hallName")) {
+            if (!groupList.contains("hallName")) {
                 groupList.add("hallName");
             }
         }
@@ -119,7 +119,7 @@ public class PjEvaluateStatController extends BaseCRUDJsonBodyMappingController<
                 ||!ObjectUtils.isEmpty(query.getWindowFromnumList())
                 ||!ObjectUtils.isEmpty(query.getWindowFromnumNotList())) {
             List<String> groupList = query.getGroupList();
-            if (groupList.contains("windowFromnum")) {
+            if (!groupList.contains("windowFromnum")) {
                 groupList.add("windowFromnum");
             }
         }
@@ -128,7 +128,7 @@ public class PjEvaluateStatController extends BaseCRUDJsonBodyMappingController<
                 ||!ObjectUtils.isEmpty(query.getPjOptionList())
                 ||!ObjectUtils.isEmpty(query.getPjOptionNotList())) {
             List<String> groupList = query.getGroupList();
-            if (groupList.contains("pjOption")) {
+            if (!groupList.contains("pjOption")) {
                 groupList.add("pjOption");
             }
         }

bill-manager/src/test/java/com/mortals/httpclient/ph/PhQueueStatController.http

@@ -23,7 +23,7 @@ Content-Type: application/json
   "siteId": 1,
   "sectionNameNotList": [""],
 
-  "groupList": ["year","month","day","siteId","sectionName"],
+  "groupList": ["year","month","day"],
   "page": 1,
   "size": 20
 }