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 @@ - + 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