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

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

@@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -83,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())) query.setHallName("");
-        if (ObjectUtils.isEmpty(query.getSectionName())) query.setSectionName("");
-        if (ObjectUtils.isEmpty(query.getBusiness())) query.setBusiness("");
-        if (ObjectUtils.isEmpty(query.getWindowFromnum())) query.setWindowFromnum("");
+        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(""));
         addGroup(query);
         model.put("siteId", query.getSiteId());
     }

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

@@ -18,8 +18,8 @@ POST {{baseUrl}}/ph/queue/stat/interlist
 Content-Type: application/json
 
 {
-  "timeStart": "2024-07-01",
-  "timeEnd": "2024-07-15",
+  "timeStart": "2024-06-24",
+  "timeEnd": "2024-06-24",
   "siteId": 1,
   "businessNotList": [""],