修改评价统计更新与组合查询

bill-manager/src/main/java/com/mortals/xhx/module/ph/service/impl/PhQueueStatServiceImpl.java

@@ -6,15 +6,11 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
-import com.mortals.xhx.common.code.TimeUnitEnum;
 import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.module.ph.model.PhQueueEntity;
 import com.mortals.xhx.module.ph.model.PhQueueQuery;
 import com.mortals.xhx.module.ph.model.PhQueueStatQuery;
 import com.mortals.xhx.module.ph.service.PhQueueService;
-import com.mortals.xhx.module.pj.model.PjEvaluateEntity;
-import com.mortals.xhx.module.pj.model.PjEvaluateStatEntity;
-import com.mortals.xhx.module.pj.model.PjEvaluateStatQuery;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -110,7 +106,7 @@ public class PhQueueStatServiceImpl extends AbstractCRUDServiceImpl<PhQueueStatD
             return phQueueStatEntity;
         }).filter(f -> f != null).collect(Collectors.toList());
 
-        saveUpdatePhqueueStatList(saveAndUpdatelist);
+        saveUpdatePjStatList(saveAndUpdatelist);
 
     }
 
@@ -129,7 +125,7 @@ public class PhQueueStatServiceImpl extends AbstractCRUDServiceImpl<PhQueueStatD
             phQueueStatEntity.setHallName(hallName);
             return phQueueStatEntity;
         }).filter(f -> f != null).collect(Collectors.toList());
-        saveUpdatePhqueueStatList(saveAndUpdatelist);
+        saveUpdatePjStatList(saveAndUpdatelist);
     }
 
 
@@ -147,7 +143,7 @@ public class PhQueueStatServiceImpl extends AbstractCRUDServiceImpl<PhQueueStatD
             phQueueStatEntity.setBusiness(bussiness);
             return phQueueStatEntity;
         }).filter(f -> f != null).collect(Collectors.toList());
-        saveUpdatePhqueueStatList(saveAndUpdatelist);
+        saveUpdatePjStatList(saveAndUpdatelist);
     }
 
     private void updateSiteWindowPhCount(String currentDate, PhQueueStatEntity entity, List<PhQueueEntity> phQueueEntities) {
@@ -165,7 +161,7 @@ public class PhQueueStatServiceImpl extends AbstractCRUDServiceImpl<PhQueueStatD
             phQueueStatEntity.setWindowFromnum(window);
             return phQueueStatEntity;
         }).filter(f -> f != null).collect(Collectors.toList());
-        saveUpdatePhqueueStatList(saveAndUpdatelist);
+        saveUpdatePjStatList(saveAndUpdatelist);
     }
 
 
@@ -231,7 +227,7 @@ public class PhQueueStatServiceImpl extends AbstractCRUDServiceImpl<PhQueueStatD
             phQueueStatEntity.setSectionName(split[1]);
             return phQueueStatEntity;
         }).filter(f -> f != null).collect(Collectors.toList());
-        saveUpdatePhqueueStatList(saveAndUpdatelist);
+        saveUpdatePjStatList(saveAndUpdatelist);
     }
 
 
@@ -252,7 +248,7 @@ public class PhQueueStatServiceImpl extends AbstractCRUDServiceImpl<PhQueueStatD
             phQueueStatEntity.setWindowFromnum(split[1]);
             return phQueueStatEntity;
         }).filter(f -> f != null).collect(Collectors.toList());
-        saveUpdatePhqueueStatList(saveAndUpdatelist);
+        saveUpdatePjStatList(saveAndUpdatelist);
     }
 
 
@@ -273,7 +269,7 @@ public class PhQueueStatServiceImpl extends AbstractCRUDServiceImpl<PhQueueStatD
             phQueueStatEntity.setWindowFromnum(split[1]);
             return phQueueStatEntity;
         }).filter(f -> f != null).collect(Collectors.toList());
-        saveUpdatePhqueueStatList(saveAndUpdatelist);
+        saveUpdatePjStatList(saveAndUpdatelist);
     }
 
     private void updateBusinessAndSectionNameAndWindow(PhQueueStatEntity entity, List<PhQueueEntity> phQueueEntities) {
@@ -296,10 +292,10 @@ public class PhQueueStatServiceImpl extends AbstractCRUDServiceImpl<PhQueueStatD
             phQueueStatEntity.setWindowFromnum(split[2]);
             return phQueueStatEntity;
         }).filter(f -> f != null).collect(Collectors.toList());
-        saveUpdatePhqueueStatList(saveAndUpdatelist);
+        saveUpdatePjStatList(saveAndUpdatelist);
     }
 
-    private static PhQueueStatQuery getPhQueueStatQuery(PhQueueStatEntity entity) {
+    private  PhQueueStatQuery getPhQueueStatQuery(PhQueueStatEntity entity) {
         PhQueueStatQuery phQueueStatQuery = new PhQueueStatQuery().siteId(entity.getSiteId())
                 .year(entity.getYear())
                 .month(entity.getMonth())
@@ -336,19 +332,18 @@ public class PhQueueStatServiceImpl extends AbstractCRUDServiceImpl<PhQueueStatD
     }
 
 
-    private void saveUpdatePhqueueStatList(List<PhQueueStatEntity> saveAndUpdatelist) {
+    private void saveUpdatePjStatList(List<PhQueueStatEntity> saveAndUpdatelist) {
             if (!ObjectUtils.isEmpty(saveAndUpdatelist)) {
                 Map<Boolean, List<PhQueueStatEntity>> saveUpdateCollect = saveAndUpdatelist.parallelStream().collect(Collectors.partitioningBy(i -> i.newEntity()));
 
-                log.info("新增站点排队部门统计数据，数量：{}", saveUpdateCollect.get(true).size());
+                log.info("新增站点评价统计数据，数量：{}", saveUpdateCollect.get(true).size());
                 if (!ObjectUtils.isEmpty(saveUpdateCollect.get(true))) {
                     //新增列表
                     this.save(saveUpdateCollect.get(true));
                 }
-                log.info("更新站点排队部门统计数据，数量：{}", saveUpdateCollect.get(true).size());
+                log.info("更新站点评价统计数据，数量：{}", saveUpdateCollect.get(true).size());
                 if (!ObjectUtils.isEmpty(saveUpdateCollect.get(false))) {
                     //更新列表
-
                     this.update(saveUpdateCollect.get(true));
                 }
 

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

@@ -28,6 +28,39 @@ Content-Type: application/json
   "size": 10
 }
 
+###排队叫号汇总统计列表2
+POST {{baseUrl}}/ph/queue/stat/interlist
+Content-Type: application/json
+
+{
+  "timeStart": "2024-06-24",
+  "timeEnd": "2024-06-24",
+  "siteId": 1,
+  "businessList": ["交通违法处理"],
+
+  "sectionNameList": ["市公安局"],
+
+  "groupList": ["year","month","day","business","sectionName"],
+  "page": 1,
+  "size": 10
+}
+
+
+###排队叫号汇总统计列表3
+POST {{baseUrl}}/ph/queue/stat/interlist
+Content-Type: application/json
+
+{
+  "siteId": 1,
+  "month": 6,
+  "year": 2024,
+  "businessList": ["交通违法处理"],
+  "sectionNameList": ["市公安局"],
+
+  "groupList": ["year","month","business","sectionName"],
+  "page": 1,
+  "size": 10
+}
 
 
 ###排队叫号汇总统计更新与保存

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

@@ -56,8 +56,8 @@ POST {{baseUrl}}/ph/queue/stat/stat
 Content-Type: application/json
 
 {
-  "taketimeStart": "2024-06-24",
-  "taketimeEnd": "2024-06-24"
+  "taketimeStart": "2024-06-01",
+  "taketimeEnd": "2024-07-15"
 }