From d086ad5dccf60034ff0951cab9f8ad048c85a532 Mon Sep 17 00:00:00 2001 From: wangpeng Date: Wed, 21 Feb 2024 17:20:55 +0800 Subject: [PATCH] =?UTF-8?q?BI=E9=A1=B5=E9=9D=A2=E7=BB=9F=E8=AE=A1=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=9A=90=E6=82=A3=E6=8E=92=E6=9F=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/check/CheckRecordMapper.xml | 40 +++++++++---------- .../datasource/check/ListManagerMapper.xml | 8 ++-- .../statistics/ListStatisticsMapper.xml | 3 +- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml b/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml index 4800cf7..37cfa5e 100644 --- a/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml +++ b/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml @@ -1144,8 +1144,8 @@ l.PERIOD, DATE_FORMAT( f.CHECK_TIME, '%Y-%m-%d' ) CHECK_TIME FROM - BUS_CHECKRECORD f - LEFT JOIN BUS_LISTMANAGER l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID + vi_list_checkrecord_all f + LEFT JOIN vi_list_all l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID and l.LIST_TYPE = f.HIDDEN_RISKSTANDARD WHERE f.FINISHED = '1' AND f.ISSTATISTICS = '1' @@ -1176,8 +1176,8 @@ l.PERIOD, YEARWEEK(DATE_FORMAT(f.CHECK_TIME,'%Y-%m-%d'),1) WEEKNUM FROM - BUS_CHECKRECORD f - LEFT JOIN BUS_LISTMANAGER l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID + vi_list_checkrecord_all f + LEFT JOIN vi_list_all l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID and l.LIST_TYPE = f.HIDDEN_RISKSTANDARD WHERE f.FINISHED = '1' AND f.ISDELETE = '0' @@ -1209,8 +1209,8 @@ l.TYPE, l.PERIOD FROM - BUS_CHECKRECORD f - LEFT JOIN BUS_LISTMANAGER l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID + vi_list_checkrecord_all f + LEFT JOIN vi_list_all l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID and l.LIST_TYPE = f.HIDDEN_RISKSTANDARD WHERE f.FINISHED = '1' AND f.ISSTATISTICS = '1' @@ -1240,8 +1240,8 @@ l.PERIOD, DATE_FORMAT( f.CHECK_TIME, '%Y-%m' ) CHECK_TIME FROM - BUS_CHECKRECORD f - LEFT JOIN BUS_LISTMANAGER l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID + vi_list_checkrecord_all f + LEFT JOIN vi_list_all l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID and l.LIST_TYPE = f.HIDDEN_RISKSTANDARD WHERE f.FINISHED = '1' AND f.ISDELETE = '0' @@ -1277,8 +1277,8 @@ DATE_FORMAT( f.CHECK_TIME, '%Y' ), QUARTER ( f.CHECK_TIME )) CHECK_TIME_quarter FROM - BUS_CHECKRECORD f - LEFT JOIN bus_listmanager l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID + vi_list_checkrecord_all f + LEFT JOIN vi_list_all l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID and l.LIST_TYPE = f.HIDDEN_RISKSTANDARD WHERE f.FINISHED = '1' AND f.ISDELETE = '0' @@ -1319,8 +1319,8 @@ l.PERIOD, concat(DATE_FORMAT(f.CHECK_TIME, '%Y'), INTERVAL(CONVERT(MONTH(f.CHECK_TIME),SIGNED),7,13) ) FROM - BUS_CHECKRECORD f - LEFT JOIN bus_listmanager l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID + vi_list_checkrecord_all f + LEFT JOIN vi_list_all l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID and l.LIST_TYPE = f.HIDDEN_RISKSTANDARD WHERE f.FINISHED = '1' AND f.ISSTATISTICS = '1' @@ -1359,8 +1359,8 @@ l.PERIOD, DATE_FORMAT( f.CHECK_TIME, '%Y' ) CHECK_TIME FROM - BUS_CHECKRECORD f - LEFT JOIN BUS_LISTMANAGER l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID + vi_list_checkrecord_all f + LEFT JOIN vi_list_all l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID and l.LIST_TYPE = f.HIDDEN_RISKSTANDARD WHERE f.FINISHED = '1' AND f.ISSTATISTICS = '1' @@ -1398,8 +1398,8 @@ 1, count( 1 )) num FROM - BUS_CHECKRECORD f - LEFT JOIN BUS_LISTMANAGER l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID + vi_list_checkrecord_all f + LEFT JOIN vi_list_all l ON l.LISTMANAGER_ID = f.LISTMANAGER_ID and l.LIST_TYPE = f.HIDDEN_RISKSTANDARD WHERE f.FINISHED = '1' AND f.ISSTATISTICS = '1' @@ -1571,8 +1571,8 @@ count( s.USER_ID ) FROM sys_user s - LEFT JOIN bus_checkuser cu ON s.USER_ID = cu.USER_ID - LEFT JOIN bus_checkrecord f ON f.CHECKRECORD_ID = cu.CHECKRECORD_ID + LEFT JOIN vi_list_checkuser_all cu ON s.USER_ID = cu.USER_ID + LEFT JOIN vi_list_checkrecord_all f ON f.CHECKRECORD_ID = cu.CHECKRECORD_ID and f.HIDDEN_RISKSTANDARD = cu.HIDDEN_RISKSTANDARD WHERE s.ISDELETE = 0 and s.CORPINFO_ID = #{CORPINFO_ID} @@ -1594,8 +1594,8 @@ count( s.DEPARTMENT_ID ) FROM oa_department s - LEFT JOIN bus_checkuser cu ON s.DEPARTMENT_ID = cu.DEPARTMENT_ID - LEFT JOIN bus_checkrecord f ON f.CHECKRECORD_ID = cu.CHECKRECORD_ID + LEFT JOIN vi_list_checkuser_all cu ON s.DEPARTMENT_ID = cu.DEPARTMENT_ID + LEFT JOIN vi_list_checkrecord_all f ON f.CHECKRECORD_ID = cu.CHECKRECORD_ID and f.HIDDEN_RISKSTANDARD = cu.HIDDEN_RISKSTANDARD WHERE s.CORPINFO_ID = #{CORPINFO_ID} AND s.ISDELETE = 0 diff --git a/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml b/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml index 2bb2975..5cc5b2b 100644 --- a/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml +++ b/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml @@ -2135,7 +2135,7 @@ SELECT count( 1 ) FROM - bus_listmanager + vi_list_all WHERE CORPINFO_ID = #{CORPINFO_ID} and ISDELETE = '0' @@ -2150,8 +2150,8 @@ SELECT count( s.LISTMANAGER_ID ) FROM - bus_listmanager s - LEFT JOIN bus_checkrecord f ON f.LISTMANAGER_ID = s.LISTMANAGER_ID + vi_list_all s + LEFT JOIN vi_list_checkrecord_all f ON f.LISTMANAGER_ID = s.LISTMANAGER_ID and f.HIDDEN_RISKSTANDARD = s.LIST_TYPE WHERE s.CORPINFO_ID = #{CORPINFO_ID} AND f.FINISHED = '1' @@ -2451,7 +2451,7 @@ select + f.HIDDEN_RISKSTANDARD, from - f + vi_list_statistics_all f where f.CORPINFO_ID = #{CORPINFO_ID} and f.TYPE != 'listType0006' and