From 624140d67af745e5c1afd6e7e1223940094f6826 Mon Sep 17 00:00:00 2001
From: dinggang <2498628697@qq.com>
Date: Mon, 28 Nov 2022 19:10:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E7=94=A8=E6=88=B7=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=B4=A2=E5=BC=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/db/V7.9__sys_user_add_index.sql        |   2 +
 .../processForm/TAbilityApplicationDao.xml    | 313 +++++++++++++-----
 2 files changed, 228 insertions(+), 87 deletions(-)
 create mode 100644 config/db/V7.9__sys_user_add_index.sql

diff --git a/config/db/V7.9__sys_user_add_index.sql b/config/db/V7.9__sys_user_add_index.sql
new file mode 100644
index 00000000..d57174a5
--- /dev/null
+++ b/config/db/V7.9__sys_user_add_index.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `sys_user`
+	ADD INDEX `idx_dept_id`(`dept_id`);
\ No newline at end of file
diff --git a/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml b/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml
index 3233c4a5..9fd8976f 100644
--- a/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml
+++ b/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml
@@ -699,46 +699,74 @@
     </select>
 
     <select id="getDistrictFundStatement" resultType="java.util.Map">
-        ( SELECT
-        srg.id AS "districtId ",
-        srg.NAME AS "districtName",
-        convert(IFNULL(SUM( taa.apply_price ), 0) / 10000, decimal(15, 1)) AS "applyPrice",
-        srg.sort
-        FROM
-        ( SELECT id, NAME, sort FROM sys_region WHERE tree_level = 3 AND 9 >= sort ) srg
-        LEFT JOIN sys_dept sd ON sd.district = srg.id
-        LEFT JOIN sys_user su ON su.dept_id = sd.id
-        LEFT JOIN t_ability_application taa ON taa.user_id = su.id
-        WHERE
-        taa.del_flag = 0
-        AND taa.approve_status IN ( '通过', '审核中' )
-        GROUP BY
-        srg.id
-        ) UNION ALL
         SELECT
-        id AS "districtId",
-        NAME AS "districtName",
-        0 AS "applyPrice",
-        sort
+            districtId,
+            districtName,
+            SUM(applyPrice) AS "applyPrice"
         FROM
-        sys_region
+            (
+                SELECT
+                    srg.id AS "districtId",
+                    srg.NAME AS "districtName",
+                    CONVERT (
+                        IFNULL( SUM( taa.apply_price ), 0 ) / 10000,
+                        DECIMAL ( 15, 1 )) AS "applyPrice",
+                    srg.sort
+                FROM
+                        ( SELECT id, NAME, sort FROM sys_region WHERE tree_level = 3 AND 9 >= sort ) srg
+                            LEFT JOIN sys_dept sd ON sd.district = srg.id
+                            LEFT JOIN tb_data_resource tdr ON tdr.dept_id = sd.id
+                            LEFT JOIN (
+                        SELECT
+                            resource_id,
+                            SUM( apply_price ) AS "apply_price"
+                        FROM
+                            t_ability_application taa
+                        WHERE
+                            taa.del_flag = 0
+                          AND taa.approve_status IN ( '通过', '审核中' )
+                        GROUP BY
+                            resource_id
+                    ) taa ON taa.resource_id = tdr.id
+                GROUP BY
+                    srg.id UNION ALL
+                SELECT
+                    tmb.district AS "districtId",
+                    srg.NAME AS "districtName",
+                    SUM( tmb.applyPrice ) AS "applyPrice",
+                    srg.sort
+                FROM
+                    (
+                        SELECT
+                            sd.id AS "deptId",
+                            tmb.dept AS "deptName",
+                            CONVERT (
+                                IFNULL( SUM( tmb.apply_price ), 0 ) / 10000,
+                                DECIMAL ( 15, 1 )) AS "applyPrice",
+                            sd.district
+                        FROM
+                            t_meetingroom_book tmb
+                                LEFT JOIN ( SELECT id, NAME, district FROM sys_dept ) sd ON tmb.dept = sd.NAME
+                        WHERE
+                            tmb.state IN ( 0, 2 )
+                        GROUP BY
+                            sd.id,
+                            tmb.dept
+                    ) tmb
+                        LEFT JOIN ( SELECT id, NAME, tree_level, sort FROM sys_region ) srg ON tmb.district = srg.id
+                WHERE
+                    srg.tree_level = 3
+                GROUP BY
+                    tmb.district
+            ) temp
         WHERE
-        tree_level = 3
-        AND 9 >= sort
-        AND id NOT IN (
-        SELECT
-        srg.id
-        FROM
-        ( SELECT id, NAME, sort FROM sys_region WHERE tree_level = 3 AND 9 >= sort ) srg
-        LEFT JOIN sys_dept sd ON sd.district = srg.id
-        LEFT JOIN sys_user su ON su.dept_id = sd.id
-        LEFT JOIN t_ability_application taa ON taa.user_id = su.id
-        WHERE
-        taa.del_flag = 0
-        AND taa.approve_status IN ( '通过', '审核中' )
+            temp.districtId IS NOT NULL
         GROUP BY
-        srg.id
-        ) ORDER BY sort
+            temp.districtId,
+            temp.districtName,
+            temp.sort
+        ORDER BY
+            temp.sort
     </select>
 
     <select id="getComponentFundStatement" resultType="java.util.Map">
@@ -797,6 +825,7 @@
         WHERE
             tdr.del_flag = 0
         ORDER BY taa.price DESC
+        LIMIT 30
 
     </select>
 
@@ -814,64 +843,117 @@
 
     <select id="getProvideDeptFundStatement" resultType="java.util.Map">
         SELECT
-            sd.id AS "deptId",
-            sd.NAME AS "deptName",
-            COUNT( tdr.id ) AS "resourceCount",
-            convert(IFNULL( SUM( taa.price ), 0 ) / 10000, decimal(15,1)) AS "applyPrice"
+            deptId,
+            deptName,
+            SUM( resourceCount ) AS "resourceCount",
+            SUM( applyPrice ) AS "applyPrice"
         FROM
-            sys_dept sd
-                LEFT JOIN tb_data_resource tdr ON tdr.dept_id = sd.id
-                LEFT JOIN (
+            (
                 SELECT
-                    resource_id,
-                    SUM( apply_price ) AS "price",
-                    COUNT( resource_id ) AS "applyCount"
+                    sd.id AS "deptId",
+                    sd.NAME AS "deptName",
+                    COUNT( tdr.id ) AS "resourceCount",
+                    CONVERT (
+                        IFNULL( SUM( taa.price ), 0 ) / 10000,
+                        DECIMAL ( 15, 1 )) AS "applyPrice"
                 FROM
-                    t_ability_application taa
+                    sys_dept sd
+                        LEFT JOIN tb_data_resource tdr ON tdr.dept_id = sd.id
+                        LEFT JOIN (
+                        SELECT
+                            resource_id,
+                            SUM( apply_price ) AS "price",
+                            COUNT( resource_id ) AS "applyCount"
+                        FROM
+                            t_ability_application taa
+                        WHERE
+                            taa.del_flag = 0
+                          AND taa.approve_status IN ( '通过', '审核中' )
+                        GROUP BY
+                            resource_id
+                    ) taa ON taa.resource_id = tdr.id
                 WHERE
-                    taa.del_flag = 0
-                  AND taa.approve_status IN ( '通过', '审核中' )
+                    tdr.del_flag = 0
+                  AND sd.type = 2
                 GROUP BY
-                    resource_id
-            ) taa ON taa.resource_id = tdr.id
-        WHERE
-            tdr.del_flag = 0
-          AND sd.type = 2
+                    sd.id UNION ALL
+                SELECT
+                    1067246875800000066 AS "deptId",
+                    '青岛市大数据发展管理局' AS "deptName",
+                    ( SELECT COUNT( id ) FROM t_meetingroom ) AS "resourceCount",
+                    CONVERT (
+                        IFNULL( SUM( tmb.apply_price ), 0 ) / 10000,
+                        DECIMAL ( 15, 1 )) AS "applyPrice"
+                FROM
+                    t_meetingroom tm
+                        LEFT JOIN t_meetingroom_book tmb ON tmb.room_id = tm.id
+                WHERE
+                    tm.del_flag = 0
+                  AND tmb.state IN ( 0, 2 )
+            ) temp
         GROUP BY
-            sd.id
+            deptId,
+            deptName
         ORDER BY
-            applyPrice DESC
+            SUM( applyPrice ) DESC
         LIMIT 10
     </select>
 
     <select id="getApplyDeptFundStatement" resultType="java.util.Map">
         SELECT
-            sd.id AS "deptId",
-            sd.NAME AS "deptName",
-            SUM( taa.applyCount ) AS "applyCount",
-            convert(IFNULL( SUM( taa.price ), 0 ) / 10000, decimal(15,1)) AS "applyPrice"
+            deptId,
+            deptName,
+            SUM( applyCount ) AS "applyCount",
+            SUM( applyPrice ) AS "applyPrice"
         FROM
             (
                 SELECT
-                    SUM( apply_price ) AS "price",
-                    COUNT( id ) AS "applyCount",
-                    user_id
+                    sd.id AS "deptId",
+                    sd.NAME AS "deptName",
+                    SUM( taa.applyCount ) AS "applyCount",
+                    CONVERT (
+                        IFNULL( SUM( taa.price ), 0 ) / 10000,
+                        DECIMAL ( 15, 1 )) AS "applyPrice"
                 FROM
-                    t_ability_application taa
+                    (
+                        SELECT
+                            SUM( apply_price ) AS "price",
+                            COUNT( id ) AS "applyCount",
+                            user_id
+                        FROM
+                            t_ability_application taa
+                        WHERE
+                            taa.del_flag = 0
+                          AND taa.approve_status IN ( '通过', '审核中' )
+                        GROUP BY
+                            user_id
+                    ) taa
+                        LEFT JOIN sys_user su ON taa.user_id = su.id
+                        LEFT JOIN sys_dept sd ON su.dept_id = sd.id
                 WHERE
-                    taa.del_flag = 0
-                  AND taa.approve_status IN ( '通过', '审核中' )
+                    sd.type = 2
                 GROUP BY
-                    user_id
-            ) taa
-                LEFT JOIN sys_user su ON taa.user_id = su.id
-                LEFT JOIN sys_dept sd ON su.dept_id = sd.id
-        WHERE
-            sd.type = 2
+                    sd.id UNION ALL
+                SELECT
+                    sd.id AS "deptId",
+                    tmb.dept AS "deptName",
+                    COUNT( tmb.id ) AS "applyCount",
+                    CONVERT (
+                        IFNULL( SUM( tmb.apply_price ), 0 ) / 10000,
+                        DECIMAL ( 15, 1 )) AS "applyPrice"
+                FROM
+                    t_meetingroom_book tmb
+                        LEFT JOIN ( SELECT id, NAME FROM sys_dept ) sd ON tmb.dept = sd.NAME
+                WHERE
+                    tmb.state IN ( 0, 2 )
+                GROUP BY
+                    sd.id,
+                    tmb.dept
+            ) temp
         GROUP BY
-            sd.id
+            deptName, deptId
         ORDER BY
-            applyPrice DESC
+            SUM( applyPrice ) DESC
         LIMIT 10
     </select>
 
@@ -896,21 +978,78 @@
 
     <select id="getApplyDistrictFundStatement" resultType="java.util.Map">
         SELECT
-        srg.id AS "districtId ",
-        srg.NAME AS "districtName",
-        IFNULL(SUM(taa.applyCount), 0) AS "applyCount",
-        convert(IFNULL( SUM( taa.apply_price ), 0 ) / 10000, decimal(15,1)) AS "applyPrice",
-        srg.sort
+            districtId,
+            districtName,
+            SUM( applyCount ),
+            SUM( applyPrice )
         FROM
-        ( SELECT id, NAME, sort FROM sys_region WHERE tree_level = 3 AND 9 >= sort ) srg
-        LEFT JOIN sys_dept sd ON sd.district = srg.id
-        LEFT JOIN tb_data_resource tdr ON tdr.dept_id = sd.id
-        LEFT JOIN (SELECT resource_id, SUM(apply_price) AS "apply_price", COUNT(id) AS "applyCount" FROM t_ability_application taa WHERE
-        taa.del_flag = 0
-        AND taa.approve_status IN ( '通过', '审核中' ) GROUP BY resource_id  ) taa ON taa.resource_id = tdr.id
+            (
+                SELECT
+                    srg.id AS "districtId",
+                    srg.NAME AS "districtName",
+                    IFNULL( SUM( taa.applyCount ), 0 ) AS "applyCount",
+                    CONVERT (
+                        IFNULL( SUM( taa.apply_price ), 0 ) / 10000,
+                        DECIMAL ( 15, 1 )) AS "applyPrice",
+                    srg.sort
+                FROM
+                        ( SELECT id, NAME, sort FROM sys_region WHERE tree_level = 3 AND 9 >= sort ) srg
+                            LEFT JOIN sys_dept sd ON sd.district = srg.id
+                            LEFT JOIN tb_data_resource tdr ON tdr.dept_id = sd.id
+                            LEFT JOIN (
+                        SELECT
+                            resource_id,
+                            SUM( apply_price ) AS "apply_price",
+                            COUNT( id ) AS "applyCount"
+                        FROM
+                            t_ability_application taa
+                        WHERE
+                            taa.del_flag = 0
+                          AND taa.approve_status IN ( '通过', '审核中' )
+                        GROUP BY
+                            resource_id
+                    ) taa ON taa.resource_id = tdr.id
+                GROUP BY
+                    srg.id UNION ALL
+                SELECT
+                    tmb.district AS "districtId",
+                    srg.NAME AS "districtName",
+                    SUM( tmb.applyCount ) AS "applyCount",
+                    SUM( tmb.applyPrice ) AS "applyPrice",
+                    srg.sort
+                FROM
+                    (
+                        SELECT
+                            sd.id AS "deptId",
+                            tmb.dept AS "deptName",
+                            COUNT( tmb.id ) AS "applyCount",
+                            CONVERT (
+                                IFNULL( SUM( tmb.apply_price ), 0 ) / 10000,
+                                DECIMAL ( 15, 1 )) AS "applyPrice",
+                            sd.district
+                        FROM
+                            t_meetingroom_book tmb
+                                LEFT JOIN ( SELECT id, NAME, district FROM sys_dept ) sd ON tmb.dept = sd.NAME
+                        WHERE
+                            tmb.state IN ( 0, 2 )
+                        GROUP BY
+                            sd.id,
+                            tmb.dept
+                    ) tmb
+                        LEFT JOIN ( SELECT id, NAME, tree_level, sort FROM sys_region ) srg ON tmb.district = srg.id
+                WHERE
+                    srg.tree_level = 3
+                GROUP BY
+                    tmb.district
+            ) temp
+        WHERE
+            temp.districtId IS NOT NULL
         GROUP BY
-        srg.id
-        ORDER BY srg.sort
+            temp.districtId,
+            temp.districtName,
+            temp.sort
+        ORDER BY
+            temp.sort
     </select>
 
 

From 6c82631bf9aa9ca8f78883660477411ace2aa59b Mon Sep 17 00:00:00 2001
From: dinggang <2498628697@qq.com>
Date: Mon, 28 Nov 2022 19:11:57 +0800
Subject: [PATCH 2/2] .

---
 renren-admin/src/main/resources/db/V7.9__sys_user_add_index.sql | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 renren-admin/src/main/resources/db/V7.9__sys_user_add_index.sql

diff --git a/renren-admin/src/main/resources/db/V7.9__sys_user_add_index.sql b/renren-admin/src/main/resources/db/V7.9__sys_user_add_index.sql
new file mode 100644
index 00000000..d57174a5
--- /dev/null
+++ b/renren-admin/src/main/resources/db/V7.9__sys_user_add_index.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `sys_user`
+	ADD INDEX `idx_dept_id`(`dept_id`);
\ No newline at end of file