From 8a70790b2712169cedd4a69e131fcc73e8215219 Mon Sep 17 00:00:00 2001 From: lizhicheng Date: Fri, 21 Oct 2022 09:56:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/resource/ResourceDao.xml | 78 ++++++++++++------- 1 file changed, 52 insertions(+), 26 deletions(-) diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index 45af7f2a..a229dc7f 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -1757,39 +1757,54 @@ AND taa.resource_id = tdr.id AND (tdr.type = '应用资源' OR tdr.type = '智能算法' OR tdr.type = '图层服务' OR tdr.type = '开发组件' OR tdr.type = '业务组件') - AND taa.approve_status = #{approveStatus} AND sd.id = #{deptId} + + AND tdr.type = #{type} + AND SUBSTR(taa.create_date, 1, 10) BETWEEN #{startDate} AND #{endDate} GROUP BY sd.id, tdr.type - UNION + + UNION - SELECT - COUNT( id ) AS 'count', - dept AS 'deptName', - NULL AS "dept_id", - 99 AS "deptType", - NULL AS "district", - 'hys' AS 'type' - FROM - t_meetingroom_book tmb - GROUP BY - deptName + SELECT + COUNT( id ) AS 'count', + dept AS 'deptName', + NULL AS "dept_id", + 99 AS "deptType", + NULL AS "district", + 'hys' AS 'type' + FROM + t_meetingroom_book tmb + where 1=1 + + + AND tmb.state=2 + + + AND tmb.state=3 + + + AND tmb.state not in (2, 3) + + + + AND tmb.dept = #{deptId} + + + AND SUBSTR(tmb.create_date, 1, 10) BETWEEN #{startDate} AND #{endDate} + + GROUP BY + deptName +