添加首页统计模块

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

@@ -17,6 +17,7 @@ import com.mortals.xhx.module.ph.model.PhQueueQuery;
 import com.mortals.xhx.module.ph.model.PhQueueStatEntity;
 import com.mortals.xhx.module.ph.model.PhQueueStatQuery;
 import com.mortals.xhx.module.ph.service.PhQueueStatService;
+import com.mortals.xhx.module.pj.model.PjEvaluateStatEntity;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
@@ -83,10 +84,55 @@ public class PhQueueStatController extends BaseCRUDJsonBodyMappingController<PhQ
         if (ObjectUtils.isEmpty(query.getSectionName())) query.setSectionName("");
         if (ObjectUtils.isEmpty(query.getBusiness())) query.setBusiness("");
         if (ObjectUtils.isEmpty(query.getWindowFromnum())) query.setWindowFromnum("");
-
+        addGroup(query);
         model.put("siteId", query.getSiteId());
     }
 
+    private static void addGroup(PhQueueStatEntity query) {
+        if (!ObjectUtils.isEmpty(query.getSiteId())) {
+            List<String> groupList = query.getGroupList();
+            if (groupList.contains("siteId")) {
+                groupList.add("siteId");
+            }
+        }
+
+        if (!ObjectUtils.isEmpty(query.getSectionName())
+                ||!ObjectUtils.isEmpty(query.getSectionNameList())
+                ||!ObjectUtils.isEmpty(query.getSectionNameNotList())) {
+            List<String> groupList = query.getGroupList();
+            if (groupList.contains("sectionName")) {
+                groupList.add("sectionName");
+            }
+        }
+        if (!ObjectUtils.isEmpty(query.getHallName())
+                ||!ObjectUtils.isEmpty(query.getHallNameList())
+                ||!ObjectUtils.isEmpty(query.getHallNameNotList())) {
+            List<String> groupList = query.getGroupList();
+            if (groupList.contains("hallName")) {
+                groupList.add("hallName");
+            }
+        }
+
+        if (!ObjectUtils.isEmpty(query.getWindowFromnum())
+                ||!ObjectUtils.isEmpty(query.getWindowFromnumList())
+                ||!ObjectUtils.isEmpty(query.getWindowFromnumNotList())) {
+            List<String> groupList = query.getGroupList();
+            if (groupList.contains("windowFromnum")) {
+                groupList.add("windowFromnum");
+            }
+        }
+
+        if (!ObjectUtils.isEmpty(query.getBusiness())
+                ||!ObjectUtils.isEmpty(query.getBusinessList())
+                ||!ObjectUtils.isEmpty(query.getHallNameNotList())) {
+            List<String> groupList = query.getGroupList();
+            if (groupList.contains("business")) {
+                groupList.add("business");
+            }
+        }
+
+    }
+
     @PostMapping(value = "/stat")
     @UnAuth
     public Rest<String> addAttendanceRecordCustom(@RequestBody PhQueueQuery phQueueQuery) {

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

@@ -56,13 +56,13 @@ public class PjEvaluateStatController extends BaseCRUDJsonBodyMappingController<
 
         //通过站点 查询存在的部门 大厅等
         Object siteId = model.get("siteId");
-        if(!ObjectUtils.isEmpty(siteId)){
+        if (!ObjectUtils.isEmpty(siteId)) {
             PjEvaluateStatQuery pjEvaluateStatQuery = new PjEvaluateStatQuery();
-            pjEvaluateStatQuery.setSiteId((Long)siteId);
+            pjEvaluateStatQuery.setSiteId((Long) siteId);
             List<PjEvaluateStatEntity> pjEvaluateStatEntities = this.service.find(pjEvaluateStatQuery, context);
-            Map<String, String> sectionNameMap = pjEvaluateStatEntities.stream().filter(f->!ObjectUtils.isEmpty(f.getSectionName())).collect(Collectors.toMap(PjEvaluateStatEntity::getSectionName, PjEvaluateStatEntity::getSectionName, (k1, k2) -> k2));
-            Map<String, String> hallNameMap = pjEvaluateStatEntities.stream().filter(f->!ObjectUtils.isEmpty(f.getHallName())).collect(Collectors.toMap(PjEvaluateStatEntity::getHallName, PjEvaluateStatEntity::getHallName, (k1, k2) -> k2));
-            Map<String, String> windowFromnumMap = pjEvaluateStatEntities.stream().filter(f->!ObjectUtils.isEmpty(f.getWindowFromnum())).collect(Collectors.toMap(PjEvaluateStatEntity::getWindowFromnum, PjEvaluateStatEntity::getWindowFromnum, (k1, k2) -> k2));
+            Map<String, String> sectionNameMap = pjEvaluateStatEntities.stream().filter(f -> !ObjectUtils.isEmpty(f.getSectionName())).collect(Collectors.toMap(PjEvaluateStatEntity::getSectionName, PjEvaluateStatEntity::getSectionName, (k1, k2) -> k2));
+            Map<String, String> hallNameMap = pjEvaluateStatEntities.stream().filter(f -> !ObjectUtils.isEmpty(f.getHallName())).collect(Collectors.toMap(PjEvaluateStatEntity::getHallName, PjEvaluateStatEntity::getHallName, (k1, k2) -> k2));
+            Map<String, String> windowFromnumMap = pjEvaluateStatEntities.stream().filter(f -> !ObjectUtils.isEmpty(f.getWindowFromnum())).collect(Collectors.toMap(PjEvaluateStatEntity::getWindowFromnum, PjEvaluateStatEntity::getWindowFromnum, (k1, k2) -> k2));
 
             this.addDict(model, "sectionNameList", sectionNameMap);
             this.addDict(model, "hallNameList", hallNameMap);
@@ -83,8 +83,55 @@ public class PjEvaluateStatController extends BaseCRUDJsonBodyMappingController<
 
         //年月日
 
+        //根据查询条件自动添加分组字段
+        addGroup(query);
 
-        model.put("siteId",query.getSiteId());
+        model.put("siteId", query.getSiteId());
+
+    }
+
+    private static void addGroup(PjEvaluateStatEntity query) {
+        if (!ObjectUtils.isEmpty(query.getSiteId())) {
+            List<String> groupList = query.getGroupList();
+            if (groupList.contains("siteId")) {
+                groupList.add("siteId");
+            }
+        }
+
+        if (!ObjectUtils.isEmpty(query.getSectionName())
+                ||!ObjectUtils.isEmpty(query.getSectionNameList())
+                ||!ObjectUtils.isEmpty(query.getSectionNameNotList())) {
+            List<String> groupList = query.getGroupList();
+            if (groupList.contains("sectionName")) {
+                groupList.add("sectionName");
+            }
+        }
+        if (!ObjectUtils.isEmpty(query.getHallName())
+                ||!ObjectUtils.isEmpty(query.getHallNameList())
+                ||!ObjectUtils.isEmpty(query.getHallNameNotList())) {
+            List<String> groupList = query.getGroupList();
+            if (groupList.contains("hallName")) {
+                groupList.add("hallName");
+            }
+        }
+
+        if (!ObjectUtils.isEmpty(query.getWindowFromnum())
+                ||!ObjectUtils.isEmpty(query.getWindowFromnumList())
+                ||!ObjectUtils.isEmpty(query.getWindowFromnumNotList())) {
+            List<String> groupList = query.getGroupList();
+            if (groupList.contains("windowFromnum")) {
+                groupList.add("windowFromnum");
+            }
+        }
+
+        if (!ObjectUtils.isEmpty(query.getPjOption())
+                ||!ObjectUtils.isEmpty(query.getPjOptionList())
+                ||!ObjectUtils.isEmpty(query.getPjOptionNotList())) {
+            List<String> groupList = query.getGroupList();
+            if (groupList.contains("pjOption")) {
+                groupList.add("pjOption");
+            }
+        }
 
     }