添加首页统计模块

bill-manager/src/main/java/com/mortals/xhx/module/ph/model/vo/PhQueueStatVo.java

 package com.mortals.xhx.module.ph.model.vo;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.ph.model.PhQueueStatEntity;
 import java.util.ArrayList;
@@ -17,27 +18,32 @@ import java.util.Date;
 public class PhQueueStatVo extends BaseEntityLong {
 
     /** ID列表 */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private List <Long> idList;
 
-
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private List<String> sectionNameList;
-
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private List <String> sectionNameNotList;
-
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private List<String> businessList;
-
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private List<String> businessNotList;
-
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private List<String> windowFromnumList;
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private List <String> windowFromnumNotList;
-
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private List<String> hallNameList;
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private List <String> hallNameNotList;
 
     /** 开始 评价时间 */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String timeStart;
 
     /** 结束 评价时间 */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String timeEnd;
 
 }
\ No newline at end of file

bill-manager/src/main/java/com/mortals/xhx/module/ph/model/vo/PhQueueVo.java

 package com.mortals.xhx.module.ph.model.vo;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.mortals.framework.annotation.desensitization.IdCardDesensitize;
 import com.mortals.framework.annotation.desensitization.MobileDesensitize;
 import com.mortals.framework.model.BaseEntityLong;
@@ -25,6 +26,7 @@ public class PhQueueVo extends BaseEntityLong {
     private String taketimeStart;
 
     /** 结束 取号时间 */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String taketimeEnd;
 
     @IdCardDesensitize

bill-manager/src/main/java/com/mortals/xhx/module/pj/model/vo/PjEvaluateStatVo.java

 package com.mortals.xhx.module.pj.model.vo;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.pj.model.PjEvaluateStatEntity;
 import java.util.ArrayList;
@@ -17,24 +18,31 @@ import java.util.Date;
 public class PjEvaluateStatVo extends BaseEntityLong {
 
     /** ID列表 */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private List <Long> idList;
-
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private List<String> sectionNameList;
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private List <String> sectionNameNotList;
-
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private List<String> pjOptionList;
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private List <String> pjOptionNotList;
-
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private List<String> windowFromnumList;
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private List <String> windowFromnumNotList;
-
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private List<String> hallNameList;
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private List <String> hallNameNotList;
 
     /** 开始 评价时间 */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String timeStart;
 
     /** 结束 评价时间 */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String timeEnd;
 
 }
\ No newline at end of file

bill-manager/src/main/resources/sqlmap/module/ph/PhQueueStatMapperExt.xml

@@ -8,9 +8,11 @@
         <!-- 获取分组字段 -->
         <if test="groupList != null and !groupList.isEmpty()">
             <foreach collection="groupList" open="" close="" index="index" item="item">
-                ${item},
+                a.${item},
             </foreach>
         </if>
+        a.siteCode,
+        a.siteName,
         <!-- 平均等待时间-->
         avg(IFNULL(a.waitTime,0)) waitTime,
         <!-- 评价数量-->

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

@@ -20,10 +20,12 @@ Content-Type: application/json
 {
   "timeStart": "2023-04-01",
   "timeEnd": "2023-05-03",
+  "siteId": 1,
+  "sectionNameNotList": [""],
 
-  "groupList": ["year","month","day","sectionName"],
+  "groupList": ["year","month","day","siteId","sectionName"],
   "page": 1,
-  "size": 10
+  "size": 20
 }
 
 

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

@@ -48,7 +48,7 @@ Content-Type: application/json
 
 {
   "pjTimeStart": "2023-04-01",
-  "pjTimeEnd": "2023-04-03"
+  "pjTimeEnd": "2023-05-03"
 }
 
 ###排队
@@ -57,7 +57,7 @@ Content-Type: application/json
 
 {
   "taketimeStart": "2023-04-01",
-  "taketimeEnd": "2023-04-01"
+  "taketimeEnd": "2023-06-01"
 }