From 81053da3a30de3cbb656c2ec9c9b5fcee68a69eb Mon Sep 17 00:00:00 2001
From: wangpeng <wangpeng@zcloudchina.com>
Date: Wed, 21 Feb 2024 14:21:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90=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?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/datasource/check/CheckRecordMapper.xml        | 4 ++--
 .../mybatis/datasource/check/CheckUserMapper.xml          | 4 ++--
 .../mybatis/datasource/check/ListManagerMapper.xml        | 5 +++--
 .../datasource/statistics/ListStatisticsMapper.xml        | 8 ++++----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml b/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml
index d1c6bfc..4800cf7 100644
--- a/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml
+++ b/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml
@@ -1669,8 +1669,8 @@
 			c.PERIODEND,
 			COUNT(h.HIDDEN_ID) HIDDEN_COUNT
 		FROM
-			BUS_CHECKRECORD c
-			left join bus_hidden h on h.CHECKRECORD_ID = c.CHECKRECORD_ID and h.ISDELETE = '0'
+			vi_list_checkrecord_all c
+			left join vi_hidden_all h on h.CHECKRECORD_ID = c.CHECKRECORD_ID and h.LIST_TYPE = c.HIDDEN_RISKSTANDARD and h.ISDELETE = '0'
 		WHERE
 			c.FINISHED = 1
 		  	and (#{MONTH} &gt;= DATE_FORMAT(c.PERIODSTART,'%Y-%m') and #{MONTH} &lt;=DATE_FORMAT(c.PERIODEND,'%Y-%m'))
diff --git a/src/main/resources/mybatis/datasource/check/CheckUserMapper.xml b/src/main/resources/mybatis/datasource/check/CheckUserMapper.xml
index fc48089..f55da33 100644
--- a/src/main/resources/mybatis/datasource/check/CheckUserMapper.xml
+++ b/src/main/resources/mybatis/datasource/check/CheckUserMapper.xml
@@ -131,8 +131,8 @@
 			c.USER_ID,
 			count( c.CHECKUSER_ID ) NUM
 		FROM
-			bus_checkuser c
-			LEFT JOIN bus_checkrecord cr ON c.CHECKRECORD_ID = cr.CHECKRECORD_ID
+			vi_list_checkuser_all c
+			LEFT JOIN vi_list_checkrecord_all cr ON cr.CHECKRECORD_ID = c.CHECKRECORD_ID and cr.HIDDEN_RISKSTANDARD = c.HIDDEN_RISKSTANDARD
 		WHERE
 			cr.isdelete = '0'
 			AND cr.FINISHED = '1'
diff --git a/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml b/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml
index b54a70e..dafe111 100644
--- a/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml
+++ b/src/main/resources/mybatis/datasource/check/ListManagerMapper.xml
@@ -1912,7 +1912,7 @@
 		count(1) NUM,
 		f.USER_ID
 		FROM
-		bus_listmanager f
+		vi_list_all f
 		LEFT JOIN SYS_USER u ON u.USER_ID = f.USER_ID
 		WHERE
 		f.ISDELETE = '0'
@@ -1967,6 +1967,7 @@
 	<!--查询人员清单 -->
 	<select id="getListByCorplistPage" parameterType="page" resultType="pd">
 		SELECT
+		f.LIST_TYPE,
 		f.LISTMANAGER_ID,
 		f.NAME,
 		f.CREATTIME,
@@ -1976,7 +1977,7 @@
 		getFullName(d.DEPARTMENT_ID)  DEPARTMENT_NAME,
 		po.NAME  POST_NAME
 		FROM
-		bus_listmanager f
+		vi_list_all f
 		left join sys_dictionaries p on p.BIANMA = f.PERIOD
 		left join sys_dictionaries t on t.BIANMA = f.TYPE
 		left join sys_user u on u.USER_ID = f.USER_ID
diff --git a/src/main/resources/mybatis/datasource/statistics/ListStatisticsMapper.xml b/src/main/resources/mybatis/datasource/statistics/ListStatisticsMapper.xml
index 2ea8116..94bb57c 100644
--- a/src/main/resources/mybatis/datasource/statistics/ListStatisticsMapper.xml
+++ b/src/main/resources/mybatis/datasource/statistics/ListStatisticsMapper.xml
@@ -209,7 +209,7 @@
 			sum(f.NOTEXAMINEDNUM) NUM,
 			f.USER_ID
 		FROM
-			bus_list_statistics f
+			vi_list_statistics_all f
 		WHERE
 			f.CORPINFO_ID = #{CORPINFO_ID}
 			and f.USER_ID is not null
@@ -259,8 +259,8 @@
 					SELECT
 						COUNT( distinct bcr.LISTMANAGER_ID )
 					FROM
-						BUS_CHECKRECORD bcr
-						LEFT JOIN BUS_CHECKUSER bcu ON bcu.CHECKRECORD_ID = bcr.CHECKRECORD_ID
+						vi_list_checkrecord_all bcr
+						LEFT JOIN vi_list_checkuser_all bcu ON bcu.CHECKRECORD_ID = bcr.CHECKRECORD_ID and bcu.HIDDEN_RISKSTANDARD = bcr.HIDDEN_RISKSTANDARD
 					WHERE
 						bcu.USER_ID = u.USER_ID
 						AND bcr.FINISHED = '1'
@@ -430,7 +430,7 @@
 			CAST( sum(  f.NOTEXAMINEDNUM ) AS SIGNED ) NUM,
 			f.USER_ID
 		FROM
-			bus_list_statistics f
+			vi_list_statistics_all f
 
 		LEFT JOIN SYS_USER u ON u.USER_ID = f.USER_ID
 		WHERE