From 2467da9106c419e0dc6b0565dd71d16c516e8d49 Mon Sep 17 00:00:00 2001
From: dinggang <2498628697@qq.com>
Date: Thu, 13 Oct 2022 11:32:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/db/V6.5__tb_fuse_add_col.sql                        | 2 +-
 .../src/main/resources/db/V6.5__tb_fuse_add_col.sql        | 2 +-
 renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml  | 2 +-
 .../mapper/processForm/TAbilityApplicationDao.xml          | 7 +++++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/config/db/V6.5__tb_fuse_add_col.sql b/config/db/V6.5__tb_fuse_add_col.sql
index 20051adc..3e286532 100644
--- a/config/db/V6.5__tb_fuse_add_col.sql
+++ b/config/db/V6.5__tb_fuse_add_col.sql
@@ -1,3 +1,3 @@
 ALTER TABLE `tb_fuse` ADD COLUMN `infrastructure_count` int NULL DEFAULT 0 COMMENT '基础设施数量';
-ALTER TABLE `tb_fuse` ADD COLUMN `dataSource_count` int NULL DEFAULT 0 COMMENT '数据资源数量';
+ALTER TABLE `tb_fuse` ADD COLUMN `data_source_count` int NULL DEFAULT 0 COMMENT '数据资源数量';
 ALTER TABLE `tb_fuse` ADD COLUMN `component_count` int NULL DEFAULT 0 COMMENT '组件服务数量';
\ No newline at end of file
diff --git a/renren-admin/src/main/resources/db/V6.5__tb_fuse_add_col.sql b/renren-admin/src/main/resources/db/V6.5__tb_fuse_add_col.sql
index 20051adc..3e286532 100644
--- a/renren-admin/src/main/resources/db/V6.5__tb_fuse_add_col.sql
+++ b/renren-admin/src/main/resources/db/V6.5__tb_fuse_add_col.sql
@@ -1,3 +1,3 @@
 ALTER TABLE `tb_fuse` ADD COLUMN `infrastructure_count` int NULL DEFAULT 0 COMMENT '基础设施数量';
-ALTER TABLE `tb_fuse` ADD COLUMN `dataSource_count` int NULL DEFAULT 0 COMMENT '数据资源数量';
+ALTER TABLE `tb_fuse` ADD COLUMN `data_source_count` int NULL DEFAULT 0 COMMENT '数据资源数量';
 ALTER TABLE `tb_fuse` ADD COLUMN `component_count` int NULL DEFAULT 0 COMMENT '组件服务数量';
\ No newline at end of file
diff --git a/renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml b/renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml
index 03038efb..a3fba930 100644
--- a/renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml
+++ b/renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml
@@ -17,7 +17,7 @@
         <result property="isCollect" column="isCollect"/>
         <result property="collectCount" column="collectCount"/>
         <result property="infrastructureCount" column="infrastructure_count"/>
-        <result property="dataSourceCount" column="dataSource_count"/>
+        <result property="dataSourceCount" column="data_source_count"/>
         <result property="componentCount" column="component_count"/>
     </resultMap>
 
diff --git a/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml b/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml
index c10081c7..17c2821b 100644
--- a/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml
+++ b/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml
@@ -119,6 +119,13 @@
         AND su.dept_id != ''
         AND su.dept_id IS NOT NULL
         GROUP BY tda.attr_value
+
+        UNION
+        SELECT
+            '会议室' AS 'type',
+            COUNT( id ) AS 'amount'
+        FROM
+            t_meetingroom_book tmb
         ) temp2
     </select>