修改排队统计更新与组合查询

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

@@ -84,10 +84,10 @@ public class PhQueueStatController extends BaseCRUDJsonBodyMappingController<PhQ
 
     @Override
     protected void doListBefore(PhQueueStatEntity query, Map<String, Object> model, Context context) throws AppException {
-        if (ObjectUtils.isEmpty(query.getHallName())&&ObjectUtils.isEmpty(query.getHallNameList())) query.setHallNameList(Arrays.asList(""));
-        if (ObjectUtils.isEmpty(query.getSectionName())&&ObjectUtils.isEmpty(query.getSectionNameList())) query.setSectionNameList(Arrays.asList(""));
-        if (ObjectUtils.isEmpty(query.getBusiness())&&ObjectUtils.isEmpty(query.getBusinessList())) query.setBusinessList(Arrays.asList(""));
-        if (ObjectUtils.isEmpty(query.getWindowFromnum())&&ObjectUtils.isEmpty(query.getWindowFromnumList())) query.setWindowFromnumList(Arrays.asList(""));
+        if (ObjectUtils.isEmpty(query.getHallName())&&ObjectUtils.isEmpty(query.getHallNameList())&&ObjectUtils.isEmpty(query.getHallNameNotList())) query.setHallNameList(Arrays.asList(""));
+        if (ObjectUtils.isEmpty(query.getSectionName())&&ObjectUtils.isEmpty(query.getSectionNameList())&&ObjectUtils.isEmpty(query.getSectionNameNotList())) query.setSectionNameList(Arrays.asList(""));
+        if (ObjectUtils.isEmpty(query.getBusiness())&&ObjectUtils.isEmpty(query.getBusinessList())&&ObjectUtils.isEmpty(query.getHallNameNotList())) query.setBusinessList(Arrays.asList(""));
+        if (ObjectUtils.isEmpty(query.getWindowFromnum())&&ObjectUtils.isEmpty(query.getWindowFromnumList())&&ObjectUtils.isEmpty(query.getWindowFromnumNotList())) query.setWindowFromnumList(Arrays.asList(""));
         addGroup(query);
         model.put("siteId", query.getSiteId());
     }