首页统计修改数

src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -595,7 +595,7 @@ public class SysUserController extends BaseController {
     @GetMapping("/selectCountyanddistrictDactive")
     @ApiOperation(value = "维护中心首页市直部门，三县两区注册数和活跃数对比", notes = "维护中心首页市直部门，三县两区注册数和活跃数对比")
     public AjaxResult selectCountyanddistrictDactive(SysUser sysUser) {
-        List<SysUser> list = userService.selectCountyanddistrictDactive(sysUser);
+        List<SysUser> list = userService.selectMaintenanceCenterHomepageList(sysUser);
         return AjaxResult.success(list);
     }
 

src/main/resources/mapper/system/SysUserMapper.xml

@@ -867,66 +867,24 @@
             LEFT JOIN sys_dept d ON ud.dept_id = d.dept_id
             WHERE u.del_flag = 0
             GROUP BY u.user_id
-        ) a
-            UNION
+            ) a
+        UNION
         SELECT
             'hy' AS `NAME`,
             COUNT(*) AS `count`
         FROM (
-                SELECT
-                    u.user_id,
-                    d.dept_id,
-                    d.parent_id,
-                    d.ancestors
-                FROM
-                    (SELECT DISTINCT user_name FROM sys_logininfor) l
-                    LEFT JOIN sys_user u ON l.user_name = u.user_name
-                    LEFT JOIN sys_user_dept ud ON u.user_id = ud.user_id
-                    LEFT JOIN sys_dept d ON ud.dept_id = d.dept_id
-                WHERE
-                    u.del_flag = 0
-                GROUP BY
-                    u.user_id
-            ) a
-           UNION
-        SELECT
-            'sx' AS name,
-            COUNT(a) AS count
-        FROM (
-            SELECT u.user_id AS a
-            FROM sys_user u
-            LEFT JOIN sys_user_dept ud ON u.user_id = ud.user_id
-            LEFT JOIN sys_dept d ON ud.dept_id = d.dept_id
-            WHERE d.dept_id IN (365,314391,314392,314393,314394)
-                 AND u.del_flag = 0
-            GROUP BY u.user_id
-        ) s
-            UNION
-        SELECT
-            'sb' AS name,
-            COUNT(a) AS count
-        FROM (
-            SELECT u.user_id AS a
-            FROM sys_user u
-            LEFT JOIN sys_user_dept ud ON u.user_id = ud.user_id
-            LEFT JOIN sys_dept d ON ud.dept_id = d.dept_id
-            WHERE d.dept_id IN (365)
-                 AND u.del_flag = 0
-            GROUP BY u.user_id
-        ) s
-            UNION
-        SELECT
-            'xs' AS name,
-            COUNT(a) AS count
-        FROM (
-            SELECT u.user_id AS a
-            FROM sys_user u
-            LEFT JOIN sys_user_dept ud ON u.user_id = ud.user_id
-            LEFT JOIN sys_dept d ON ud.dept_id = d.dept_id
-            WHERE d.dept_id IN (314391,314392,314393,314394)
-                 AND u.del_flag = 0
-            GROUP BY u.user_id
-        ) s
+                 SELECT
+                     u.user_id
+
+                 FROM
+                         (SELECT DISTINCT user_name FROM sys_logininfor where status = 0) l
+                             LEFT JOIN sys_user u ON l.user_name = u.user_name
+
+                 WHERE
+                     u.del_flag = 0 AND u.user_id >1
+                 GROUP BY
+                     u.user_id
+             ) a
     </select>
 
     <select id="selectMaintenanceCenterHomepageList" resultMap="SysUserResult">
@@ -955,48 +913,51 @@
 
 
     <select id="selectMaintenanceCenterTotalanDactive" resultMap="SysUserResult">
-     SELECT * FROM (
         SELECT
-            '注册用户数' AS `NAME`,
-            COUNT(dept_id) AS `count`
+            *
         FROM
             (
                 SELECT
-                    u.user_id,
-                    d.dept_id,
-                    d.parent_id,
-                    d.ancestors
+                    '注册用户数' AS `NAME`,
+                    COUNT( dept_id ) AS `count`
                 FROM
-                    sys_user u
-                LEFT JOIN sys_user_dept ud ON u.user_id = ud.user_id
-                LEFT JOIN sys_dept d ON ud.dept_id = d.dept_id
-                WHERE
-                    u.del_flag = 0
-                GROUP BY
-                    u.user_id
-            ) a
-    UNION
-        SELECT
-            '活跃用户数' AS `NAME`,
-            COUNT(*) AS `count`
-        FROM
-            (
+                    (
+                        SELECT
+                            u.user_id,
+                            d.dept_id,
+                            d.parent_id,
+                            d.ancestors
+                        FROM
+                            sys_user u
+                                LEFT JOIN sys_user_dept ud ON u.user_id = ud.user_id
+                                LEFT JOIN sys_dept d ON ud.dept_id = d.dept_id
+                        WHERE
+                            u.del_flag = 0
+                        GROUP BY
+                            u.user_id
+                    ) a UNION
                 SELECT
-                    u.user_id,
-                    d.dept_id,
-                    d.parent_id,
-                    d.ancestors
+                    '活跃用户数' AS `NAME`,
+                    COUNT(*) AS `count`
                 FROM
-                    (SELECT DISTINCT user_name FROM sys_logininfor) l
-                    LEFT JOIN sys_user u ON l.user_name = u.user_name
-                    LEFT JOIN sys_user_dept ud ON u.user_id = ud.user_id
-                    LEFT JOIN sys_dept d ON ud.dept_id = d.dept_id
-                WHERE
-                    u.del_flag = 0
-                GROUP BY
-                    u.user_id
-            ) a
-    ) b;
+                    (
+                        SELECT
+                            u.user_id,
+                            d.dept_id,
+                            d.parent_id,
+                            d.ancestors
+                        FROM
+                                ( SELECT DISTINCT user_name FROM sys_logininfor WHERE STATUS = 0 ) l
+                                    LEFT JOIN sys_user u ON l.user_name = u.user_name
+                                    LEFT JOIN sys_user_dept ud ON u.user_id = ud.user_id
+                                    LEFT JOIN sys_dept d ON ud.dept_id = d.dept_id
+                        WHERE
+                            u.del_flag = 0
+                          AND u.user_id > 1
+                        GROUP BY
+                            u.user_id
+                    ) a
+            ) b;
     </select>