From eb44fe6dfe2810f3ecf89d178b748da229b0f58f Mon Sep 17 00:00:00 2001
From: wangpeng <wangpeng@zcloudchina.com>
Date: Wed, 21 Feb 2024 15:27:54 +0800
Subject: [PATCH] =?UTF-8?q?BI=E9=A1=B5=E9=9D=A2=E4=BB=BB=E5=8A=A1=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E6=83=85=E5=86=B5=E7=BB=9F=E8=AE=A1=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=9A=90=E6=82=A3=E6=8E=92=E6=9F=A5=E6=95=B0=E6=8D=AE=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/hidden/HiddenMapper.xml        | 41 +++++++++++--------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml b/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml
index 683c8c4..85cae8e 100644
--- a/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml
+++ b/src/main/resources/mybatis/datasource/hidden/HiddenMapper.xml
@@ -1256,9 +1256,18 @@
    	<!--根据企业ID获取驾驶舱隐患统计信息 -->
 	<select id="getBICount" parameterType="pd" resultType="pd">
        SELECT
-			<include refid="Field"></include>
+		f.LIST_TYPE, f.HIDDEN_ID, f.LISTMANAGER_ID, f.RISKITEM_ID, f.CHECKRECORD_ID, f.RECORDITEM_ID, f.SOURCE, f.CHECK_CONTENT,
+		f.HIDDENDESCR, f.HIDDENPART, f.CREATOR, f.CREATTIME,
+		f.RECTIFYDESCR, f.RECTIFICATIONTYPE, f.RECTIFICATIONOR, f.RECTIFICATIONTIME,
+		f.HIDDENLEVEL, f.STATE,
+		f.CHECKDEPT, f.CHECKOR, f.CHECKTIME, f.CHECKDESCR,
+		f.ISQUALIFIED, f.ISDELETE, f.CORPINFO_ID, f.HIDDENFINDDEPT,
+		f.RECTIFICATIONDEADLINE, f.RECTIFICATIONDEPT, f.REVIEWOR, f.REVIEWTIME, f.REVIEWDEPT,
+		f.LONGITUDE, f.LATITUDE,
+		f.HAVESCHEME, f.HAVEPLAN, f.HIDDENTYPE, f.HIDDENTYPE1, f.HIDDENTYPE2, f.HIDDENTYPE3, f.HIDDENTYPE_NAME,
+		f.ISCONFIRM, f.OPERATTIME, f.HIDDEN_CATEGORY
 		FROM
-			BUS_HIDDEN f
+			vi_hidden_all f
 		WHERE f.ISDELETE = '0' and f.STATE != '0' and f.HIDDENLEVEL = 'hiddenLevel0001'
 		<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
 			and f.CORPINFO_ID =#{CORPINFO_ID}
@@ -1423,7 +1432,7 @@
 					count( 1 ) NUMBER,
 					DATE_FORMAT( h.CREATTIME, '%Y-%m' ) TIME
 				FROM
-					bus_hidden h
+					vi_hidden_all h
 				WHERE
 					h.ISDELETE = '0'
 					AND h.CORPINFO_ID = #{CORPINFO_ID}
@@ -1441,7 +1450,7 @@
 					count( 1 ) NUMBER,
 					DATE_FORMAT( h.CREATTIME, '%Y-%m' ) TIME
 				FROM
-					bus_hidden h
+					vi_hidden_all h
 				WHERE
 					h.ISDELETE = '0'
 					AND h.CORPINFO_ID = #{CORPINFO_ID}
@@ -1459,7 +1468,7 @@
 					count( 1 ) NUMBER,
 					DATE_FORMAT( h.CREATTIME, '%Y-%m' ) TIME
 				FROM
-					bus_hidden h
+					vi_hidden_all h
 				WHERE
 					h.ISDELETE = '0'
 					AND h.CORPINFO_ID = #{CORPINFO_ID}
@@ -1474,21 +1483,21 @@
 			</if>
 			<if test="TYPE==4"><!-- 已验收  -->
 				SELECT
-				count( 1 ) NUMBER,
-				DATE_FORMAT( h.CREATTIME, '%Y-%m' ) TIME
+					count( 1 ) NUMBER,
+					DATE_FORMAT( h.CREATTIME, '%Y-%m' ) TIME
 				FROM
-				bus_hidden h
+					vi_hidden_all h
 				WHERE
-				h.ISDELETE = '0'
-				AND h.CORPINFO_ID = #{CORPINFO_ID}
-				AND h.HIDDENLEVEL = 'hiddenLevel0001'
-				AND h.STATE in('4')
-				AND DATE_FORMAT( h.CREATTIME, '%Y-%m' ) &gt;= #{TIME}
-				AND DATE_FORMAT( h.CREATTIME, '%Y-%m' ) &lt;= DATE_FORMAT( NOW(), '%Y-%m' )
+					h.ISDELETE = '0'
+					AND h.CORPINFO_ID = #{CORPINFO_ID}
+					AND h.HIDDENLEVEL = 'hiddenLevel0001'
+					AND h.STATE in('4')
+					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' )
+					DATE_FORMAT( h.CREATTIME, '%Y-%m' )
 				ORDER BY
-				DATE_FORMAT( h.CREATTIME, '%Y-%m' )
+					DATE_FORMAT( h.CREATTIME, '%Y-%m' )
 			</if>
 		</if>
   	</select>