添加首页统计模块

bill-manager/db/add.sql

@@ -50,60 +50,8 @@ PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='排号汇总';
 
 
--- ----------------------------
--- 排号汇总统计表
--- ----------------------------
-DROP TABLE IF EXISTS `mortals_xhx_ph_queue_stat`;
-CREATE TABLE `mortals_xhx_ph_queue_stat` (
-    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
-    `site_id` bigint(20)    DEFAULT '0'  COMMENT '站点Id',
-    `site_code` varchar(128)      COMMENT '站点编码',
-    `site_name` varchar(128)      COMMENT '站点名称',
-    `business` varchar(128) NOT NULL     COMMENT '业务名',
-    `section_name` varchar(128) NOT NULL     COMMENT '部门',
-    `hall_name` varchar(128) DEFAULT NULL COMMENT '大厅名称',
-    `wait_time` int(9) DEFAULT '0' COMMENT '平均等待时间,单位s',
-    `window_fromnum` varchar(128) NOT NULL     COMMENT '窗口编号',
-    `ph_count` int(9) NOT NULL COMMENT '取号数量',
-    `year` int(9) NOT NULL COMMENT '年',
-    `month` int(9) NOT NULL COMMENT '月',
-    `day` int(9) NOT NULL COMMENT '日',
-    `createTime` datetime NOT NULL COMMENT '创建时间',
-    `updateUserId` bigint(20) DEFAULT NULL COMMENT '更新用户',
-    `updateTime` datetime DEFAULT NULL COMMENT '更新时间',
-    PRIMARY KEY (`id`) USING BTREE
-,KEY `year` (`year`) USING BTREE
-,KEY `month` (`month`) USING BTREE
-,KEY `day` (`day`) USING BTREE
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='排队叫号汇总统计';
 
 
--- ----------------------------
--- 评价汇总表
--- ----------------------------
-DROP TABLE IF EXISTS `mortals_xhx_pj_evaluate_stat`;
-CREATE TABLE `mortals_xhx_pj_evaluate_stat` (
-`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
-`site_id` bigint(20)    DEFAULT '0'  COMMENT '站点Id',
-`site_code` varchar(128)      COMMENT '站点编码',
-`site_name` varchar(128)      COMMENT '站点名称',
-`section_name` varchar(128) NOT NULL     COMMENT '部门',
-`pj_option` varchar(32) NOT NULL     COMMENT '评价选项(非常满意,满意,基本满意,不满意,非常不满意)',
-`window_fromnum` varchar(128) NOT NULL     COMMENT '窗口编号',
-`hall_name` varchar(128) DEFAULT NULL COMMENT '大厅名称',
-`pj_count` int(9) NOT NULL COMMENT '评价数量',
-`year` int(9) NOT NULL COMMENT '年',
-`month` int(9) NOT NULL COMMENT '月',
-`day` int(9) NOT NULL COMMENT '日',
-`createTime` datetime NOT NULL COMMENT '创建时间',
-`updateUserId` bigint(20) DEFAULT NULL COMMENT '更新用户',
-`updateTime` datetime DEFAULT NULL COMMENT '更新时间',
-PRIMARY KEY (`id`) USING BTREE
-    ,KEY `year` (`year`) USING BTREE
-    ,KEY `month` (`month`) USING BTREE
-    ,KEY `day` (`day`) USING BTREE
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='评价汇总统计';
-
 
 -- ----------------------------
 -- 评价汇总统计表
@@ -202,6 +150,59 @@ CREATE TABLE mortals_xhx_access_system(
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='区域接入系统';
 
 
+-- ----------------------------
+-- 排号汇总统计表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_ph_queue_stat`;
+CREATE TABLE `mortals_xhx_ph_queue_stat` (
+    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+    `siteId` bigint(20)    DEFAULT '0'  COMMENT '站点Id',
+    `siteCode` varchar(128)      COMMENT '站点编码',
+    `siteName` varchar(128)      COMMENT '站点名称',
+    `business` varchar(128) NOT NULL     COMMENT '业务名',
+    `sectionName` varchar(128) NOT NULL     COMMENT '部门',
+    `hallName` varchar(128) DEFAULT NULL COMMENT '大厅名称',
+    `windowFromnum` varchar(128) NOT NULL     COMMENT '窗口编号',
+    `waitTime` int(9) DEFAULT '0' COMMENT '平均等待时间,单位s',
+    `phCount` int(9) NOT NULL COMMENT '取号数量',
+    `year` int(9) NOT NULL COMMENT '年',
+    `month` int(9) NOT NULL COMMENT '月',
+    `day` int(9) NOT NULL COMMENT '日',
+    `createTime` datetime NOT NULL COMMENT '创建时间',
+    `updateUserId` bigint(20) DEFAULT NULL COMMENT '更新用户',
+    `updateTime` datetime DEFAULT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`) USING BTREE
+,KEY `year` (`year`) USING BTREE
+,KEY `month` (`month`) USING BTREE
+,KEY `day` (`day`) USING BTREE
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='排队叫号汇总统计';
+
+
+-- ----------------------------
+-- 评价汇总表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_pj_evaluate_stat`;
+CREATE TABLE `mortals_xhx_pj_evaluate_stat` (
+`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+`siteId` bigint(20)    DEFAULT '0'  COMMENT '站点Id',
+`siteCode` varchar(128)      COMMENT '站点编码',
+`siteName` varchar(128)      COMMENT '站点名称',
+`sectionName` varchar(128) NOT NULL     COMMENT '部门',
+`pjOption` varchar(32) NOT NULL     COMMENT '评价选项(非常满意,满意,基本满意,不满意,非常不满意)',
+`windowFromnum` varchar(128) NOT NULL     COMMENT '窗口编号',
+`hallName` varchar(128) DEFAULT NULL COMMENT '大厅名称',
+`pjCount` int(9) NOT NULL COMMENT '评价数量',
+`year` int(9) NOT NULL COMMENT '年',
+`month` int(9) NOT NULL COMMENT '月',
+`day` int(9) NOT NULL COMMENT '日',
+`createTime` datetime NOT NULL COMMENT '创建时间',
+`updateUserId` bigint(20) DEFAULT NULL COMMENT '更新用户',
+`updateTime` datetime DEFAULT NULL COMMENT '更新时间',
+PRIMARY KEY (`id`) USING BTREE
+    ,KEY `year` (`year`) USING BTREE
+    ,KEY `month` (`month`) USING BTREE
+    ,KEY `day` (`day`) USING BTREE
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='评价汇总统计';
 
 -- ----------------------------
 -- 汇总统计表
@@ -209,16 +210,16 @@ CREATE TABLE mortals_xhx_access_system(
 DROP TABLE IF EXISTS `mortals_xhx_stat`;
 CREATE TABLE `mortals_xhx_stat` (
     `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
-    `site_id` bigint(20)      COMMENT '站点Id',
-    `site_code` varchar(128)  DEFAULT ''     COMMENT '站点编码',
-    `site_name` varchar(128)  DEFAULT ''    COMMENT '站点名称',
+    `siteId` bigint(20)      COMMENT '站点Id',
+    `siteCode` varchar(128)  DEFAULT ''     COMMENT '站点编码',
+    `siteName` varchar(128)  DEFAULT ''    COMMENT '站点名称',
     `count` int(9) NOT NULL COMMENT '数量',
     `year` int(9) NOT NULL COMMENT '年',
     `month` int(9) NOT NULL COMMENT '月',
     `day` int(9) NOT NULL COMMENT '日',
-    `create_user_id` bigint(20)      COMMENT '创建用户',
-    `create_time` datetime NOT NULL     COMMENT '创建时间',
-    `update_time` datetime      COMMENT '更新时间',
+    `createUserId` bigint(20)      COMMENT '创建用户',
+    `createTime` datetime NOT NULL     COMMENT '创建时间',
+    `updateTime` datetime      COMMENT '更新时间',
     PRIMARY KEY (`id`) USING BTREE
     ,KEY `year` (`year`) USING BTREE
     ,KEY `month` (`month`) USING BTREE

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

@@ -11,12 +11,6 @@
                 ${item},
             </foreach>
         </if>
-        a.site_id,
-        a.site_code,
-        a.site_name,
-        a.section_name,
-        a.hall_name,
-        a.business,
         <!-- 平均等待时间-->
         avg(IFNULL(a.wait_time,0)) wait_time,
         <!-- 评价数量-->

bill-manager/src/main/resources/sqlmap/module/pj/PjEvaluateStatMapperExt.xml

@@ -11,13 +11,6 @@
                 ${item},
             </foreach>
         </if>
-        a.site_id,
-        a.site_code,
-        a.site_name,
-        a.section_name,
-        a.pj_option,
-        a.hall_name,
-        a.window_fromnum,
         <!-- 评价数量-->
         sum(IFNULL(a.pj_count,0)) pj_count
 

bill-manager/src/main/resources/sqlmap/module/stat/StatMapperExt.xml

@@ -11,9 +11,6 @@
                 ${item},
             </foreach>
         </if>
-        a.site_id,
-        a.site_code,
-        a.site_name,
         <!-- 评价数量-->
         sum(IFNULL(a.count,0)) count
 

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

@@ -21,7 +21,7 @@ Content-Type: application/json
   "timeStart": "2023-04-01",
   "timeEnd": "2023-05-03",
 
-  "groupList": ["year","month","day"],
+  "groupList": ["year","month","day","section_name"],
   "page": 1,
   "size": 10
 }