From 15c3d39b8bcc3fbc48be026697b829a8fa8ec2a9 Mon Sep 17 00:00:00 2001
From: wangpeng <wangpeng@zcloudchina.com>
Date: Fri, 23 Feb 2024 10:08:25 +0800
Subject: [PATCH] =?UTF-8?q?BI=E9=A1=B5=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=A0=A1=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/datasource/check/CheckRecordMapper.xml     |  4 ++--
 .../mybatis/datasource/hidden/HiddenMapper.xml         | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml b/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml
index 7a0f7b1..71072c1 100644
--- a/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml
+++ b/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml
@@ -1610,8 +1610,8 @@
 
 	<select id="listTypeBi" parameterType="pd" resultType="pd">
 		select count(1) count,d.NAME
-		from bus_checkrecord f
-		left join BUS_LISTMANAGER l on f.LISTMANAGER_ID = l.LISTMANAGER_ID
+		from vi_list_checkrecord_all f
+		left join vi_list_all l on f.LISTMANAGER_ID = l.LISTMANAGER_ID and f.LIST_TYPE = l.LIST_TYPE
 		left join sys_dictionaries d on d.BIANMA = l.SCREENTYPE
 		where f.ISDELETE = '0'
 		AND f.FINISHED = '1'
diff --git a/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml b/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml
index f3e36dd..ad73e84 100644
--- a/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml
+++ b/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml
@@ -1436,16 +1436,18 @@
 				WHERE
 					h.ISDELETE = '0'
 					AND h.CORPINFO_ID = #{CORPINFO_ID}
-					AND h.state != '0'
+				<!-- AND h.state != '0' -->
+				<!-- 不包含安全环保检查的状态 100-安全环保检查暂存的隐患 101.检查已归档，待指派 102.检查已归档，指派中 -2.待确认 -->
+					AND h.STATE NOT IN ('0','100','101','102','-2')
 					AND h.HIDDENLEVEL = 'hiddenLevel0001'
 					AND DATE_FORMAT( h.CREATTIME, '%Y-%m' ) &gt;= #{TIME}
 					AND DATE_FORMAT( h.CREATTIME, '%Y-%m' ) &lt;= DATE_FORMAT( NOW(), '%Y-%m' )
 				GROUP BY
 					DATE_FORMAT( h.CREATTIME, '%Y-%m' )
 				ORDER BY
-		   			DATE_FORMAT( h.CREATTIME, '%Y-%m' )
-			</if>
-			<if test="TYPE==2"><!-- 未整改   -->
+                   DATE_FORMAT( h.CREATTIME, '%Y-%m' )
+        </if>
+        <if test="TYPE==2"><!-- 未整改   -->
 				SELECT
 					count( 1 ) NUMBER,
 					DATE_FORMAT( h.CREATTIME, '%Y-%m' ) TIME