diff --git a/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml b/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml
index 1fc2a485..b45eb49a 100644
--- a/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml
+++ b/src/main/resources/mybatis/datasource/bus/HiddenMapper.xml
@@ -14,10 +14,7 @@
 
     <!-- 字段 -->
     <sql id="Field">
-        f
-        .
-        SOURCE
-        ,
+        f.SOURCE,
 		f.RISK_UNIT,
 		f.IDENTIFICATION,
 		f.RISK_DESCR,
@@ -74,8 +71,7 @@
 
     <!-- 字段用于新增 -->
     <sql id="Field2">
-        SOURCE
-        ,
+        SOURCE,
 		RISK_UNIT,
 		IDENTIFICATION,
 		RISK_DESCR,
@@ -130,8 +126,7 @@
 
     <!-- 字段值 -->
     <sql id="FieldValue">
-        #{SOURCE}
-        ,
+        #{SOURCE},
         #{RISK_UNIT},
         #{IDENTIFICATION},
         #{RISK_DESCR},
@@ -172,10 +167,7 @@
         #{ISCONFIRM},
         #{CONFIRM_USER},
         #{DISCOVERYTIME},
-        getHiddenType
-        (
-        #{HIDDENTYPE}
-        ),
+        getHiddenType(#{HIDDENTYPE}),
         #{INVESTMENT_FUNDS},
         #{LISTMANAGER_ID},
         #{FOREIGN_ID},
@@ -431,10 +423,8 @@
         select
         <include refid="Field"></include>
         from
-        <include refid="tableName"></include>
-        f
-        where ( f.CHECKRECORD_ID = #{CHECKRECORD_ID} or LISTMANAGER_ID = #{LISTMANAGER_ID} ) and f.ISDELETE = '0' and
-        f.STATE = '1'
+        <include refid="tableName"></include> f
+        where ( f.CHECKRECORD_ID = #{CHECKRECORD_ID} or LISTMANAGER_ID = #{LISTMANAGER_ID} ) and f.ISDELETE = '0' and f.STATE = '1'
     </select>
     <!-- 整改 -->
     <update id="rectify" parameterType="pd">
@@ -503,8 +493,7 @@
     <!-- 定时修改过期隐患 -->
     <update id="editDeadline" parameterType="pd">
         update
-        <include refid="tableName"></include>
-        f
+        <include refid="tableName"></include> f
         set
         STATE = '-1'
         where
@@ -520,8 +509,7 @@
     <!-- 修改延期隐患为未整改 -->
     <update id="editDeferredDeadline" parameterType="pd">
         UPDATE
-        <include refid="tableName"></include>
-        f
+        <include refid="tableName"></include> f
         SET f.STATE = '1'
         WHERE
         f.RECTIFICATIONDEADLINE is not null
@@ -557,8 +545,7 @@
         isa.ASSESS_SCORE,
         isa.ASSESS_PENALTY_AMOUNT
         from
-        <include refid="tableName"></include>
-        f
+        <include refid="tableName"></include> f
         left join vi_user_all cr on cr.USER_ID = f.CREATOR
         left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
         left join sys_user ch on ch.USER_ID = f.CHECKOR
@@ -569,8 +556,7 @@
         left join bus_checkrecord bc on bc.CHECKRECORD_ID = f.CHECKRECORD_ID and bc.ISDELETE = 0
         left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
         left join <include refid="dicTableName"></include> ht on f.HIDDENTYPE = ht.BIANMA
-        left join <include refid="dicTableName"></include> hiddenType2 on f.HIDDENTYPE2 =
-        hiddenType2.BIANMA  <!-- 隐患类型-->
+        left join <include refid="dicTableName"></include> hiddenType2 on f.HIDDENTYPE2 = hiddenType2.BIANMA  <!-- 隐患类型-->
         left join bus_hiddenregion hregion on hregion.HIDDENREGION_ID = f.HIDDENPART
         left join oa_department hregionDept on hregionDept.DEPARTMENT_ID = conUser.DEPARTMENT_ID
         left join sys_user su on su.USER_ID = f.CONFIRM_USER
@@ -602,7 +588,7 @@
         hregionDept.NAME as hregionDeptName,
         hregion.HIDDENREGION as hregionName,
         od.DEPARTMENT_ID as confirmDept,
-        -- fc.NAME FINAL_CHECKOR_NAME,
+        -- 		fc.NAME FINAL_CHECKOR_NAME,
         isa.INSPECTION_ASSESS_ID,
         siu.NAME as acceptName,
         isa.ASSESS_SCORE,
@@ -619,13 +605,12 @@
         left join bus_checkrecord bc on bc.CHECKRECORD_ID = f.CHECKRECORD_ID and bc.ISDELETE = 0
         left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
         left join <include refid="dicTableName"></include> ht on f.HIDDENTYPE = ht.BIANMA
-        left join <include refid="dicTableName"></include> hiddenType2 on f.HIDDENTYPE2 =
-        hiddenType2.BIANMA  <!-- 隐患类型-->
+        left join <include refid="dicTableName"></include> hiddenType2 on f.HIDDENTYPE2 = hiddenType2.BIANMA  <!-- 隐患类型-->
         left join bus_hiddenregion hregion on hregion.HIDDENREGION_ID = f.HIDDENPART
         left join oa_department hregionDept on hregionDept.DEPARTMENT_ID = conUser.DEPARTMENT_ID
         left join sys_user su on su.USER_ID = f.CONFIRM_USER
         left join oa_department od on od.DEPARTMENT_ID = su.DEPARTMENT_ID
-        -- LEFT JOIN vi_user_all fc ON fc.USER_ID = f.FINAL_CHECKOR
+        -- 		LEFT JOIN vi_user_all fc ON fc.USER_ID = f.FINAL_CHECKOR
         LEFT JOIN vi_user_all siu ON siu.USER_ID = f.CHECKOR
         LEFT JOIN BUS_INSPECTION_SAFETYENVIRONMENTAL_ASSESS isa ON isa.HIDDEN_ID = f.HIDDEN_ID and isa.ISDELETE = '0'
         where
@@ -644,14 +629,12 @@
         chd.NAME CHECKDEPTNAME,
         lv.NAME HIDDENLEVELNAME,
         hregion.HIDDENREGION as HREGIONNAME,
-        confirmUser.NAME as confirmUserName,
-        (select group_concat(chr.NAME) from BUS_HIDDENCHECK bh left join sys_user chr on chr.USER_ID=bh.USER_ID where
-        bh.HIDDEN_ID=f.HIDDEN_ID ) CHECKNAME,
-        (select group_concat(bh.USER_ID) from BUS_HIDDENCHECK bh where bh.HIDDEN_ID=f.HIDDEN_ID ) CHECKUSERS
+        confirmUser.NAME  as confirmUserName,
+        (select group_concat(chr.NAME) from BUS_HIDDENCHECK bh left join sys_user chr on chr.USER_ID=bh.USER_ID where bh.HIDDEN_ID=f.HIDDEN_ID ) CHECKNAME,
+        (select group_concat(bh.USER_ID) from BUS_HIDDENCHECK bh  where bh.HIDDEN_ID=f.HIDDEN_ID ) CHECKUSERS
         ,(select count(1) from BUS_HIDDENEXAMINE eax where eax.HIDDEN_ID = f.HIDDEN_ID and eax.STATE = '-1') as exaCount
         from
-        <include refid="tableName"></include>
-        f
+        <include refid="tableName"></include> f
         LEFT JOIN sys_user confirmUser on confirmUser.USER_ID = f.CONFIRM_USER  <!-- 隐患确认人 -->
         left join vi_user_all cr on cr.USER_ID = f.CREATOR
         left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
@@ -661,8 +644,7 @@
         left join oa_department red on red.DEPARTMENT_ID = f.RECTIFICATIONDEPT
         left join oa_department chd on chd.DEPARTMENT_ID = f.CHECKDEPT
         left join
-        <include refid="dicTableName"></include>
-        lv on f.HIDDENLEVEL = lv.BIANMA
+        <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
         left join bus_hiddenregion hregion on hregion.HIDDENREGION_ID = f.HIDDENPART
         LEFT JOIN bus_hiddencheck hch on hch.HIDDEN_ID = f.HIDDEN_ID
         left join bus_hidden_user bhu on bhu.HIDDEN_ID = f.HIDDEN_ID
@@ -673,16 +655,14 @@
                 <when test='pd.roleLevel == "0"'>
                 </when>
                 <when test='pd.roleLevel == "1"'>
-                    and (confirmUser.DEPARTMENT_ID in (${pd.supDeparIds}) or bhu.DEPARTMENT_ID in (${pd.supDeparIds}) or
-                    f.RECTIFICATIONDEPT in (${pd.supDeparIds}) or hch.DEPARTMENT_ID in (${pd.supDeparIds}))
+                    and (confirmUser.DEPARTMENT_ID in (${pd.supDeparIds}) or bhu.DEPARTMENT_ID in (${pd.supDeparIds}) or f.RECTIFICATIONDEPT in (${pd.supDeparIds})  or hch.DEPARTMENT_ID in (${pd.supDeparIds}))
                 </when>
                 <when test='pd.roleLevel == "2"'>
-                    and (bhu.USER_ID =#{pd.loginUserId} or f.CONFIRM_USER = #{pd.loginUserId} or f.RECTIFICATIONOR =
-                    #{pd.loginUserId} or f.CHECKOR = #{pd.loginUserId} or hch.USER_ID = #{pd.loginUserId} )
+                    and (bhu.USER_ID =#{pd.loginUserId} or f.CONFIRM_USER = #{pd.loginUserId} or f.RECTIFICATIONOR = #{pd.loginUserId} or f.CHECKOR = #{pd.loginUserId} or hch.USER_ID = #{pd.loginUserId} )
                 </when>
             </choose>
         </if>
-        and (f.STATE not in ('0','7','5') or f.STATE ='16')
+        and (f.STATE not in ('0','7','5')  or f.STATE ='16')
         and f.HIDDENLEVEL != 'hiddenLevel2002' and f.HIDDENLEVEL != 'hiddenLevel1001' and f.HIDDENLEVEL != 'jdyh001'
         <if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 企业ID -->
             and f.CORPINFO_ID = #{pd.CORPINFO_ID}
@@ -702,18 +682,17 @@
         <!--<if test="pd.HIDDENFIND_NAME != null and pd.HIDDENFIND_NAME != ''">&lt;!&ndash; 关键词检索 &ndash;&gt;
 			and su2.NAME LIKE CONCAT(CONCAT('%', #{pd.HIDDENFIND_NAME}),'%')
 		</if>-->
-        <if test="pd.confirmUserName != null and pd.confirmUserName != ''"><!-- 关键词检索 -->
+        <if  test="pd.confirmUserName != null and pd.confirmUserName != ''"><!-- 关键词检索 -->
             and confirmUser.NAME LIKE CONCAT(CONCAT('%', #{pd.confirmUserName}),'%')
         </if>
         <if test="pd.RECTIFICATIONORNAME != null and pd.RECTIFICATIONORNAME != ''"><!-- 关键词检索 -->
             and re.NAME LIKE CONCAT(CONCAT('%', #{pd.RECTIFICATIONORNAME}),'%')
         </if>
         <if test="pd.keyHiddenPart != null and pd.keyHiddenPart != ''"><!-- 关键词检索 -->
-            and f.HIDDENPART = #{pd.keyHiddenPart}
+            and f.HIDDENPART  = #{pd.keyHiddenPart}
         </if>
         <if test="pd.CHECKNAME != null and pd.CHECKNAME != ''"><!-- 关键词检索 -->
-            and (select group_concat(chr.NAME) from BUS_HIDDENCHECK bh left join sys_user chr on chr.USER_ID=bh.USER_ID
-            where bh.HIDDEN_ID=f.HIDDEN_ID ) LIKE CONCAT(CONCAT('%', #{pd.CHECKNAME}),'%')
+            and (select group_concat(chr.NAME) from BUS_HIDDENCHECK bh left join sys_user chr on chr.USER_ID=bh.USER_ID where bh.HIDDEN_ID=f.HIDDEN_ID ) LIKE CONCAT(CONCAT('%', #{pd.CHECKNAME}),'%')
         </if>
         <if test="pd.HIDDENDESCR != null and pd.HIDDENDESCR != ''"><!-- 关键词检索 -->
             and f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{pd.HIDDENDESCR}),'%')
@@ -733,7 +712,7 @@
         <if test="pd.ENDTIME != null and pd.ENDTIME != ''">
             and f.CREATTIME &lt;= #{pd.ENDTIME}
         </if>
-        <if test="pd.STATE != null and pd.STATE !='' and pd.STATE != 0">
+        <if test="pd.STATE != null and pd.STATE !='' and pd.STATE != 0" >
             and f.STATE = #{pd.STATE}
         </if>
         <if test="pd.SELF_USER_ID != null and pd.SELF_USER_ID != ''">
@@ -811,7 +790,7 @@
         <if test="pd.SOURCE != null and pd.SOURCE != ''"><!-- 关键词检索 -->
             <choose>
                 <when test='pd.SOURCE=="1"'>
-                    and f.SOURCE = '1'
+                    and	f.SOURCE = '1'
                 </when>
                 <when test='pd.SOURCE=="2"'>
                     and f.SOURCE = '2'
@@ -858,7 +837,7 @@
         <if test="pd.BISTATE != null and pd.BISTATE != ''"><!-- 由BI页跳转过来参数 -->
             <choose>
                 <when test='pd.BISTATE=="1"'>
-                    and f.STATE != '0'
+                    and	f.STATE != '0'
                 </when>
                 <when test='pd.BISTATE=="2"'>
                     and f.STATE != '4'
@@ -869,15 +848,13 @@
             </choose>
         </if>
         <if test="pd.HIDDENFIND_NAME != null and pd.HIDDENFIND_NAME != ''"><!-- 隐患发现人 -->
-            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID =
-            hfu.USER_ID where user.NAME LIKE CONCAT(CONCAT('%', #{pd.HIDDENFIND_NAME}),'%') )
+            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.NAME  LIKE CONCAT(CONCAT('%', #{pd.HIDDENFIND_NAME}),'%') )
         </if>
         <if test="pd.keyFindUserDept != null and pd.keyFindUserDept != ''"><!-- 隐患发现部门 -->
-            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID =
-            hfu.USER_ID where user.DEPARTMENT_ID = #{pd.keyFindUserDept} )
+            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.DEPARTMENT_ID  = #{pd.keyFindUserDept} )
         </if>
         group by f.hidden_id
-        order by f.STATE ='16' desc, f.CREATTIME desc
+        order by f.STATE ='16'  desc, f.CREATTIME  desc
     </select>
 
     <select id="listAll" parameterType="pd" resultType="pd">
@@ -895,11 +872,9 @@
         sys.NAME HIDDENTYPENAME,
         bh.HIDDENREGION as HIDDENPARTNAME,
         conUser.NAME as conUserName,
-        (select group_concat(chr.NAME) from BUS_HIDDENCHECK bh left join sys_user chr on chr.USER_ID=bh.USER_ID where
-        bh.HIDDEN_ID=f.HIDDEN_ID ) CHECKNAME
+        (select group_concat(chr.NAME) from BUS_HIDDENCHECK bh left join sys_user chr on chr.USER_ID=bh.USER_ID where bh.HIDDEN_ID=f.HIDDEN_ID ) CHECKNAME
         from
-        <include refid="tableName"></include>
-        f
+        <include refid="tableName"></include> f
         left join `qa-cmt-prevention`.`vi_user_all` cr on cr.USER_ID = f.CREATOR
         left join `qa-cmt-prevention`.`vi_user_all` re on re.USER_ID = f.RECTIFICATIONOR
         left join `qa-cmt-prevention`.`vi_user_all` ch on ch.USER_ID = f.CHECKOR
@@ -910,12 +885,10 @@
         left join oa_department chd on chd.DEPARTMENT_ID = f.CHECKDEPT
         left join bus_hiddenregion bh on bh.HIDDENREGION_ID = f.HIDDENPART
         left join
-        <include refid="dicTableName"></include>
-        lv
+        <include refid="dicTableName"></include> lv
         on f.HIDDENLEVEL = lv.BIANMA
         left join
-        <include refid="dicTableName"></include>
-        sys
+        <include refid="dicTableName"></include> sys
         on f.HIDDENTYPE = sys.BIANMA
         where f.ISDELETE = '0' and f.STATE != '0'
         and f.STATE not in ('5','7','8','100','101','102')
@@ -950,7 +923,7 @@
             f.HIDDEN_ID in(select fh.HIDDEN_ID from bus_hidden_user fh where fh.USER_ID = #{queryUserId}
             or f.CONFIRM_USER = #{queryUserId}
             or f.RECTIFICATIONOR = #{queryUserId}
-            or f.HIDDEN_ID in(select ch.HIDDEN_ID from bus_hiddencheck ch where ch.USER_ID = #{queryUserId})
+            or  f.HIDDEN_ID in(select ch.HIDDEN_ID from bus_hiddencheck ch where ch.USER_ID = #{queryUserId})
             ))
         </if>
         <if test="HIDDENDESCR != null and HIDDENDESCR != ''"><!-- 关键词检索 -->
@@ -971,7 +944,7 @@
         <if test="ENDTIME != null and ENDTIME != ''">
             and f.DISCOVERYTIME <![CDATA[ <= ]]> CONCAT_WS(' ', #{ENDTIME}, '00:00')
         </if>
-        <if test="STATE != null and STATE !='' and STATE != 0">
+        <if test="STATE != null and STATE !='' and STATE != 0" >
             and f.STATE = #{STATE}
         </if>
         <if test="SELF_USER_ID != null and SELF_USER_ID != ''">
@@ -984,13 +957,11 @@
             </if>
             <if test="DISPOSESTATE==3"><!-- 验收 -->
                 and f.STATE = '3'
-                and (select count(1) from BUS_HIDDENCHECK bh where bh.USER_ID=#{SELFUSERID} and bh.HIDDEN_ID=f.HIDDEN_ID
-                and bh.STATUS=0)>0
+                and (select count(1) from BUS_HIDDENCHECK bh where bh.USER_ID=#{SELFUSERID} and bh.HIDDEN_ID=f.HIDDEN_ID and bh.STATUS=0)>0
             </if>
             <if test="DISPOSESTATE==4"><!-- 已验收 -->
                 and f.STATE = '4'
-                and (f.RECTIFICATIONOR = #{SELFUSERID} or f.CREATOR = #{SELFUSERID} or (select count(1) from
-                BUS_HIDDENCHECK bh where bh.USER_ID=#{SELFUSERID} and bh.HIDDEN_ID=f.HIDDEN_ID)>0)
+                and (f.RECTIFICATIONOR = #{SELFUSERID} or f.CREATOR = #{SELFUSERID} or (select count(1) from BUS_HIDDENCHECK bh where bh.USER_ID=#{SELFUSERID} and bh.HIDDEN_ID=f.HIDDEN_ID)>0)
             </if>
             <if test="DISPOSESTATE==-1"><!-- 所有 -->
                 <if test="CORPINFO_ID != null and CORPINFO_ID != ''"><!-- 关键词检索 -->
@@ -1027,11 +998,9 @@
         chd.NAME CHECKDEPTNAME,
         lv.NAME HIDDENLEVELNAME,
         ( SELECT max( bh.CHECK_TIME ) FROM BUS_HIDDENCHECK bh WHERE bh.HIDDEN_ID = f.HIDDEN_ID ) CHECK_TIME,
-        (select group_concat(chr.NAME) from BUS_HIDDENCHECK bh left join sys_user chr on chr.USER_ID=bh.USER_ID where
-        bh.HIDDEN_ID=f.HIDDEN_ID ) CHECKNAME
+        (select group_concat(chr.NAME) from BUS_HIDDENCHECK bh left join sys_user chr on chr.USER_ID=bh.USER_ID where bh.HIDDEN_ID=f.HIDDEN_ID ) CHECKNAME
         from
-        <include refid="tableName"></include>
-        f
+        <include refid="tableName"></include> f
         left join sys_user cr on cr.USER_ID = f.CREATOR
         left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
         left join sys_user ch on ch.USER_ID = f.CHECKOR
@@ -1040,8 +1009,7 @@
         left join oa_department red on red.DEPARTMENT_ID = f.RECTIFICATIONDEPT
         left join oa_department chd on chd.DEPARTMENT_ID = f.CHECKDEPT
         left join
-        <include refid="dicTableName"></include>
-        lv
+        <include refid="dicTableName"></include> lv
         on f.HIDDENLEVEL = lv.BIANMA
         where f.ISDELETE = '0' and f.STATE != '0'
         <if test="SOURCE != null and SOURCE != ''">
@@ -1087,7 +1055,7 @@
         <if test="ENDTIME != null and ENDTIME != ''">
             and f.CREATTIME &lt;= #{ENDTIME}
         </if>
-        <if test="STATE != null and STATE !='' and STATE != 0">
+        <if test="STATE != null and STATE !='' and STATE != 0" >
             and f.STATE = #{STATE}
         </if>
         <if test="SELF_USER_ID != null and SELF_USER_ID != ''">
@@ -1100,13 +1068,11 @@
             </if>
             <if test="DISPOSESTATE==3"><!-- 验收 -->
                 and f.STATE = '3'
-                and (select count(1) from BUS_HIDDENCHECK bh where bh.USER_ID=#{SELFUSERID} and bh.HIDDEN_ID=f.HIDDEN_ID
-                and bh.STATUS=0)>0
+                and (select count(1) from BUS_HIDDENCHECK bh where bh.USER_ID=#{SELFUSERID} and bh.HIDDEN_ID=f.HIDDEN_ID and bh.STATUS=0)>0
             </if>
             <if test="DISPOSESTATE==4"><!-- 已验收 -->
                 and f.STATE = '4'
-                and (f.RECTIFICATIONOR = #{SELFUSERID} or f.CREATOR = #{SELFUSERID} or (select count(1) from
-                BUS_HIDDENCHECK bh where bh.USER_ID=#{SELFUSERID} and bh.HIDDEN_ID=f.HIDDEN_ID)>0)
+                and (f.RECTIFICATIONOR = #{SELFUSERID} or f.CREATOR = #{SELFUSERID} or (select count(1) from BUS_HIDDENCHECK bh where bh.USER_ID=#{SELFUSERID} and bh.HIDDEN_ID=f.HIDDEN_ID)>0)
             </if>
             <if test="DISPOSESTATE==-1"><!-- 所有 -->
                 <if test="CORPINFO_ID != null and CORPINFO_ID != ''"><!-- 关键词检索 -->
@@ -1242,7 +1208,7 @@
             <foreach item="item" index="index" collection="DEPARTMENT_IDS" open="(" separator="," close=")">
                 #{item}
             </foreach>
-            or f.RECTIFICATIONOR = #{SELFUSERID}
+            or  f.RECTIFICATIONOR = #{SELFUSERID}
             )
         </if>
         <if test="SELFUSERID != null and SELFUSERID != ''">
@@ -1315,14 +1281,12 @@
                 </when>
                 <when test='roleLevel == "1"'>
                     <if test="supDeparIds != null and supDeparIds != ''">
-                        and (confirmUser.DEPARTMENT_ID in (${supDeparIds}) or bhu.DEPARTMENT_ID in (${supDeparIds}) or
-                        f.RECTIFICATIONDEPT in (${supDeparIds}) or hch.DEPARTMENT_ID in (${supDeparIds}))
+                        and (confirmUser.DEPARTMENT_ID in (${supDeparIds}) or bhu.DEPARTMENT_ID in (${supDeparIds}) or f.RECTIFICATIONDEPT in (${supDeparIds})  or hch.DEPARTMENT_ID in (${supDeparIds}))
                     </if>
                 </when>
                 <when test='roleLevel == "2"'>
                     <if test="SELFUSERID != null and SELFUSERID != ''">
-                        and (bhu.USER_ID = #{SELFUSERID} or f.CONFIRM_USER = #{SELFUSERID} or f.RECTIFICATIONOR =
-                        #{SELFUSERID} or f.CHECKOR = #{SELFUSERID} )
+                        and (bhu.USER_ID = #{SELFUSERID} or f.CONFIRM_USER = #{SELFUSERID} or f.RECTIFICATIONOR = #{SELFUSERID} or f.CHECKOR = #{SELFUSERID} )
                     </if>
                 </when>
             </choose>
@@ -1441,17 +1405,15 @@
 
     <!--  -->
     <select id="getCountByHiddenType" parameterType="pd" resultType="pd">
-        SELECT f.HIDDENTYPE,
-               dic.DICTIONARIES_ID,
-               COUNT(1) AS count
+        SELECT
+            f.HIDDENTYPE,
+            dic.DICTIONARIES_ID,
+            COUNT(1) AS count
         FROM
             BUS_HIDDEN f
-            left join sys_dictionaries dic
-        on dic.BIANMA = f.HIDDENTYPE
+            left join sys_dictionaries dic on dic.BIANMA = f.HIDDENTYPE
         WHERE
-            f.CORPINFO_ID = #{CORPINFO_ID}
-          AND f.ISDELETE = '0'
-          and dic.DICTIONARIES_ID is not null
+            f.CORPINFO_ID = #{CORPINFO_ID}  AND f.ISDELETE = '0' and dic.DICTIONARIES_ID is not null
         GROUP BY
             f.HIDDENTYPE
     </select>
@@ -1583,28 +1545,25 @@
         select
         f.*
         ,lv.NAME HIDDENLEVELNAME
-        ,re.NAME as RECTIFICATIONORNAME
-        ,confirmUser.NAME as confirmUserName
+        ,re.NAME  as RECTIFICATIONORNAME
+        ,confirmUser.NAME  as confirmUserName
         ,hiddenType.NAME as hiddenTypeName
         ,hiddenType2.NAME as hiddenTypeName2
         ,hregion.HIDDENREGION as hregionName
         ,(select count(1) from BUS_HIDDENEXAMINE eax where eax.HIDDEN_ID = f.HIDDEN_ID and eax.STATE = '-1') as exaCount
         from
-        <include refid="tableName"></include>
-        f
+        <include refid="tableName"></include> f
         LEFT JOIN sys_user confirmUser on confirmUser.USER_ID = f.CONFIRM_USER  <!-- 隐患确认人 -->
         left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
         left join <include refid="dicTableName"></include> hiddenType on f.HIDDENTYPE = hiddenType.BIANMA  <!-- 隐患类型-->
-        left join <include refid="dicTableName"></include> hiddenType2 on f.HIDDENTYPE2 =
-        hiddenType2.BIANMA  <!-- 隐患类型-->
+        left join <include refid="dicTableName"></include> hiddenType2 on f.HIDDENTYPE2 = hiddenType2.BIANMA  <!-- 隐患类型-->
         left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
         left join bus_hiddenregion hregion on hregion.HIDDENREGION_ID = f.HIDDENPART
         left join bus_listmanager list on list.LISTMANAGER_ID = f.LISTMANAGER_ID
         LEFT JOIN bus_hiddencheck hch on hch.HIDDEN_ID = f.HIDDEN_ID
         left join bus_hidden_user bhu on bhu.HIDDEN_ID = f.HIDDEN_ID
         <if test='pd.ArrayDATA_IDS !=null and pd.ArrayDATA_IDS !=""'>
-            left JOIN (select USER_ID from sys_USER where DEPARTMENT_ID in(${pd.ArrayDATA_IDS})) userfind on
-            userfind.USER_ID = f.CREATOR
+            left JOIN (select USER_ID from sys_USER where DEPARTMENT_ID in(${pd.ArrayDATA_IDS})) userfind on userfind.USER_ID = f.CREATOR
         </if>
         where f.ISDELETE = '0'
 
@@ -1613,12 +1572,10 @@
                 <when test='pd.roleLevel == "0"'>
                 </when>
                 <when test="pd.roleLevel =='1'">
-                    and (confirmUser.DEPARTMENT_ID in (${pd.supDeparIds}) or bhu.DEPARTMENT_ID in (${pd.supDeparIds}) or
-                    f.RECTIFICATIONDEPT in (${pd.supDeparIds}) or hch.DEPARTMENT_ID in (${pd.supDeparIds}))
+                    and (confirmUser.DEPARTMENT_ID in (${pd.supDeparIds}) or bhu.DEPARTMENT_ID in (${pd.supDeparIds}) or f.RECTIFICATIONDEPT in (${pd.supDeparIds})  or hch.DEPARTMENT_ID in (${pd.supDeparIds}))
                 </when>
                 <when test="pd.roleLevel == '2'">
-                    and (bhu.USER_ID =#{pd.loginUserId} or f.CONFIRM_USER = #{pd.loginUserId} or f.RECTIFICATIONOR =
-                    #{pd.loginUserId} or f.CHECKOR = #{pd.loginUserId} )
+                    and (bhu.USER_ID =#{pd.loginUserId} or f.CONFIRM_USER = #{pd.loginUserId} or f.RECTIFICATIONOR = #{pd.loginUserId} or f.CHECKOR = #{pd.loginUserId} )
                 </when>
             </choose>
         </if>
@@ -1651,12 +1608,10 @@
             and (f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{pd.HIDDENDESCR}),'%'))
         </if>
         <if test="pd.keyFindUserName != null and pd.keyFindUserName != ''"><!-- 隐患发现人 -->
-            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID =
-            hfu.USER_ID where user.NAME LIKE CONCAT(CONCAT('%', #{pd.keyFindUserName}),'%') )
+            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.NAME  LIKE CONCAT(CONCAT('%', #{pd.keyFindUserName}),'%') )
         </if>
         <if test="pd.keyFindUserDept != null and pd.keyFindUserDept != ''"><!-- 隐患发现部门 -->
-            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID =
-            hfu.USER_ID where user.DEPARTMENT_ID = #{pd.keyFindUserDept} )
+            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.DEPARTMENT_ID  = #{pd.keyFindUserDept} )
         </if>
         <if test="pd.keyHiddenType != null and pd.keyHiddenType != ''"><!-- 隐患类型 -->
             and f.HIDDENTYPE = #{pd.keyHiddenType}
@@ -1684,6 +1639,7 @@
         </if>
 
 
+
         <!--		<if test="pd.keyFindEndTime != null and pd.keyFindEndTime != ''">&lt;!&ndash; 隐患发现时间 &ndash;&gt;-->
         <!--			and f.DISCOVERYTIME &lt;= #{pd.keyFindEndTime}-->
         <!--		</if>-->
@@ -1691,8 +1647,7 @@
             and (confirmUser.NAME LIKE CONCAT(CONCAT('%', #{pd.keyConfirmUser}),'%'))
         </if>
         <if test="pd.keyMajor != null and pd.keyMajor != ''"><!-- 重大隐患 -->
-            and (lv.PARENT_ID = '5ff9daf78e9a4fb1b40d77980656799d' or
-            lv.DICTIONARIES_ID='5ff9daf78e9a4fb1b40d77980656799d' )
+            and (lv.PARENT_ID = '5ff9daf78e9a4fb1b40d77980656799d' or lv.DICTIONARIES_ID='5ff9daf78e9a4fb1b40d77980656799d' )
         </if>
         <if test="pd.keyHiddenSpecialType != null and pd.keyHiddenSpecialType != ''">
             and f.HIDDEN_ID in (select hex.HIDDEN_ID from bus_hiddenexamine hex
@@ -1708,7 +1663,7 @@
         group by f.HIDDEN_ID
         order by FIELD ( f.STATE, '1', '7','-2', '11', '12', '13', '14', '15', '101', '102' ) desc,
         f.STATE + 0 asc,
-        f.CREATTIME desc
+        f.CREATTIME  desc
     </select>
 
     <!-- 忽略隐患列表 -->
@@ -1716,27 +1671,24 @@
         select
         f.*
         ,lv.NAME HIDDENLEVELNAME
-        ,re.NAME as RECTIFICATIONORNAME
-        ,confirmUser.NAME as confirmUserName
+        ,re.NAME  as RECTIFICATIONORNAME
+        ,confirmUser.NAME  as confirmUserName
         ,hiddenType.NAME as hiddenTypeName
         ,hiddenType2.NAME as hiddenTypeName2
         ,hregion.HIDDENREGION as hregionName
         ,(select count(1) from BUS_HIDDENEXAMINE eax where eax.HIDDEN_ID = f.HIDDEN_ID and eax.STATE = '-1') as exaCount
         from
-        <include refid="tableName"></include>
-        f
+        <include refid="tableName"></include> f
         LEFT JOIN sys_user confirmUser on confirmUser.USER_ID = f.CONFIRM_USER  <!-- 隐患确认人 -->
         left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
         left join <include refid="dicTableName"></include> hiddenType on f.HIDDENTYPE = hiddenType.BIANMA  <!-- 隐患类型-->
-        left join <include refid="dicTableName"></include> hiddenType2 on f.HIDDENTYPE2 =
-        hiddenType2.BIANMA  <!-- 隐患类型-->
+        left join <include refid="dicTableName"></include> hiddenType2 on f.HIDDENTYPE2 = hiddenType2.BIANMA  <!-- 隐患类型-->
         left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
         left join bus_hiddenregion hregion on hregion.HIDDENREGION_ID = f.HIDDENPART
         left join bus_listmanager list on list.LISTMANAGER_ID = f.LISTMANAGER_ID
         left join bus_hidden_user bhu on bhu.HIDDEN_ID = f.HIDDEN_ID
         <if test='pd.ArrayDATA_IDS !=null and pd.ArrayDATA_IDS !=""'>
-            left JOIN (select USER_ID from sys_USER where DEPARTMENT_ID in(${pd.ArrayDATA_IDS})) userfind on
-            userfind.USER_ID = f.CREATOR
+            left JOIN (select USER_ID from sys_USER where DEPARTMENT_ID in(${pd.ArrayDATA_IDS})) userfind on userfind.USER_ID = f.CREATOR
         </if>
         LEFT JOIN bus_hiddencheck hch on hch.HIDDEN_ID = f.HIDDEN_ID
         where f.ISDELETE = '0'
@@ -1745,12 +1697,10 @@
                 <when test='pd.roleLevel == "0"'>
                 </when>
                 <when test='pd.roleLevel == "1"'>
-                    and (confirmUser.DEPARTMENT_ID in (${pd.supDeparIds}) or bhu.DEPARTMENT_ID in (${pd.supDeparIds}) or
-                    f.RECTIFICATIONDEPT in (${pd.supDeparIds}) or hch.DEPARTMENT_ID in (${pd.supDeparIds}))
+                    and (confirmUser.DEPARTMENT_ID in (${pd.supDeparIds}) or bhu.DEPARTMENT_ID in (${pd.supDeparIds}) or f.RECTIFICATIONDEPT in (${pd.supDeparIds})  or hch.DEPARTMENT_ID in (${pd.supDeparIds}))
                 </when>
                 <when test='pd.roleLevel == "2"'>
-                    and (bhu.USER_ID =#{pd.loginUserId} or f.CONFIRM_USER = #{pd.loginUserId} or f.RECTIFICATIONOR =
-                    #{pd.loginUserId} or f.CHECKOR = #{pd.loginUserId} )
+                    and (bhu.USER_ID =#{pd.loginUserId} or f.CONFIRM_USER = #{pd.loginUserId} or f.RECTIFICATIONOR = #{pd.loginUserId} or f.CHECKOR = #{pd.loginUserId} )
                 </when>
             </choose>
         </if>
@@ -1779,12 +1729,10 @@
             and (f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{pd.HIDDENDESCR}),'%'))
         </if>
         <if test="pd.keyFindUserName != null and pd.keyFindUserName != ''"><!-- 隐患发现人 -->
-            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID =
-            hfu.USER_ID where user.NAME LIKE CONCAT(CONCAT('%', #{pd.keyFindUserName}),'%') )
+            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.NAME  LIKE CONCAT(CONCAT('%', #{pd.keyFindUserName}),'%') )
         </if>
         <if test="pd.keyFindUserDept != null and pd.keyFindUserDept != ''"><!-- 隐患发现部门 -->
-            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID =
-            hfu.USER_ID where user.DEPARTMENT_ID = #{pd.keyFindUserDept} )
+            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.DEPARTMENT_ID  = #{pd.keyFindUserDept} )
         </if>
         <if test="pd.keyHiddenType != null and pd.keyHiddenType != ''"><!-- 隐患类型 -->
             and f.HIDDENTYPE = #{pd.keyHiddenType}
@@ -1799,8 +1747,7 @@
             and f.HIDDENLEVEL = #{pd.keyHiddenlevel}
         </if>
         <if test='pd.CONFIRM_USER != null and pd.CONFIRM_USER != "" and  pd.roleLevel != "1"'><!-- 隐患确认人 -->
-            and (f.CONFIRM_USER = #{pd.CONFIRM_USER} or f.CREATOR = #{pd.CONFIRM_USER} or bhu.USER_ID =
-            #{pd.CONFIRM_USER})
+            and (f.CONFIRM_USER = #{pd.CONFIRM_USER} or f.CREATOR = #{pd.CONFIRM_USER} or bhu.USER_ID = #{pd.CONFIRM_USER})
         </if>
 
         <if test="pd.STARTTIME != null and pd.STARTTIME != ''"><!-- 关键词检索 -->
@@ -1813,8 +1760,7 @@
             and (confirmUser.NAME LIKE CONCAT(CONCAT('%', #{pd.keyConfirmUser}),'%'))
         </if>
         <if test="pd.keyMajor != null and pd.keyMajor != ''"><!-- 重大隐患 -->
-            and (lv.PARENT_ID = '5ff9daf78e9a4fb1b40d77980656799d' or
-            lv.DICTIONARIES_ID='5ff9daf78e9a4fb1b40d77980656799d' )
+            and (lv.PARENT_ID = '5ff9daf78e9a4fb1b40d77980656799d' or lv.DICTIONARIES_ID='5ff9daf78e9a4fb1b40d77980656799d' )
         </if>
         <if test="pd.keyHiddenSpecialType != null and pd.keyHiddenSpecialType != ''">
             and f.HIDDEN_ID in (select hex.HIDDEN_ID from bus_hiddenexamine hex
@@ -1824,7 +1770,7 @@
             and f.RECTIFICATIONOR = #{pd.RECTIFICATIONOR}}
         </if>
         group by f.HIDDEN_ID
-        order by f.CREATTIME desc,f.STATE + 0 asc
+        order by  f.CREATTIME  desc,f.STATE + 0 asc
     </select>
 
 
@@ -1833,20 +1779,18 @@
         select
         f.*
         ,lv.NAME HIDDENLEVELNAME
-        ,re.NAME as RECTIFICATIONORNAME
-        ,confirmUser.NAME as confirmUserName
+        ,re.NAME  as RECTIFICATIONORNAME
+        ,confirmUser.NAME  as confirmUserName
         ,hiddenType.NAME as hiddenTypeName
         ,hiddenType2.NAME as hiddenTypeName2
         ,hregion.HIDDENREGION as hregionName
         ,(select count(1) from BUS_HIDDENEXAMINE eax where eax.HIDDEN_ID = f.HIDDEN_ID and eax.STATE = '-1') as exaCount
         from
-        <include refid="tableName"></include>
-        f
+        <include refid="tableName"></include> f
         LEFT JOIN sys_user confirmUser on confirmUser.USER_ID = f.CONFIRM_USER  <!-- 隐患确认人 -->
         left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
         left join <include refid="dicTableName"></include> hiddenType on f.HIDDENTYPE = hiddenType.BIANMA  <!-- 隐患类型-->
-        left join <include refid="dicTableName"></include> hiddenType2 on f.HIDDENTYPE2 =
-        hiddenType2.BIANMA  <!-- 隐患类型-->
+        left join <include refid="dicTableName"></include> hiddenType2 on f.HIDDENTYPE2 = hiddenType2.BIANMA  <!-- 隐患类型-->
         left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
         left join bus_hiddenregion hregion on hregion.HIDDENREGION_ID = f.HIDDENPART
         left join bus_listmanager list on list.LISTMANAGER_ID = f.LISTMANAGER_ID
@@ -1854,13 +1798,11 @@
         left join bus_hidden_user bhu on bhu.HIDDEN_ID = f.HIDDEN_ID
 
         <if test='pd.ArrayDATA_IDS !=null and pd.ArrayDATA_IDS !=""'>
-            left JOIN (select USER_ID from sys_USER where DEPARTMENT_ID in(${pd.ArrayDATA_IDS})) userfind on
-            userfind.USER_ID = f.CREATOR
+            left JOIN (select USER_ID from sys_USER where DEPARTMENT_ID in(${pd.ArrayDATA_IDS})) userfind on userfind.USER_ID = f.CREATOR
         </if>
         where f.ISDELETE = '0'
-        <if test="pd.supDeparIds != null and pd.supDeparIds != '' and pd.supDeparIds !='ALL' and pd.supDeparIds !='NOT'">
-            or (confirmUser.DEPARTMENT_ID in (${pd.supDeparIds}) or bhu.DEPARTMENT_ID in (${pd.supDeparIds}) or
-            f.RECTIFICATIONDEPT in (${pd.supDeparIds}) or hch.DEPARTMENT_ID in (${pd.supDeparIds}))
+        <if  test="pd.supDeparIds != null and pd.supDeparIds != '' and pd.supDeparIds !='ALL' and pd.supDeparIds !='NOT'">
+            or (confirmUser.DEPARTMENT_ID in (${pd.supDeparIds}) or bhu.DEPARTMENT_ID in (${pd.supDeparIds}) or f.RECTIFICATIONDEPT in (${pd.supDeparIds})  or hch.DEPARTMENT_ID in (${pd.supDeparIds}))
         </if>
         and f.state not in ('0')
         <if test='pd.VERIFYSTATE == 10'>
@@ -1896,12 +1838,10 @@
             and (f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{pd.HIDDENDESCR}),'%'))
         </if>
         <if test="pd.keyFindUserName != null and pd.keyFindUserName != ''"><!-- 隐患发现人 -->
-            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID =
-            hfu.USER_ID where user.NAME LIKE CONCAT(CONCAT('%', #{pd.keyFindUserName}),'%') )
+            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.NAME  LIKE CONCAT(CONCAT('%', #{pd.keyFindUserName}),'%') )
         </if>
         <if test="pd.keyFindUserDept != null and pd.keyFindUserDept != ''"><!-- 隐患发现部门 -->
-            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID =
-            hfu.USER_ID where user.DEPARTMENT_ID = #{pd.keyFindUserDept} )
+            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.DEPARTMENT_ID  = #{pd.keyFindUserDept} )
         </if>
         <if test="pd.keyHiddenType != null and pd.keyHiddenType != ''"><!-- 隐患类型 -->
             and f.HIDDENTYPE = #{pd.keyHiddenType}
@@ -1928,8 +1868,7 @@
             and (confirmUser.NAME LIKE CONCAT(CONCAT('%', #{pd.keyConfirmUser}),'%'))
         </if>
         <if test="pd.keyMajor != null and pd.keyMajor != ''"><!-- 重大隐患 -->
-            and (lv.PARENT_ID = '5ff9daf78e9a4fb1b40d77980656799d' or
-            lv.DICTIONARIES_ID='5ff9daf78e9a4fb1b40d77980656799d' )
+            and (lv.PARENT_ID = '5ff9daf78e9a4fb1b40d77980656799d' or lv.DICTIONARIES_ID='5ff9daf78e9a4fb1b40d77980656799d' )
         </if>
         <if test="pd.keyHiddenSpecialType != null and pd.keyHiddenSpecialType != ''">
             and f.HIDDEN_ID in (select hex.HIDDEN_ID from bus_hiddenexamine hex
@@ -1942,7 +1881,7 @@
 			or (list.DEPARTMENT_ID in (${pd.ArrayDATA_IDS})
 			)
 		</if>-->
-        order by f.CREATTIME desc,f.STATE + 0 asc
+        order by  f.CREATTIME  desc,f.STATE + 0 asc
     </select>
 
     <!-- 重大隐患核实列表 -->
@@ -1950,26 +1889,23 @@
         select
         f.*
         ,lv.NAME HIDDENLEVELNAME
-        ,re.NAME as RECTIFICATIONORNAME
-        ,confirmUser.NAME as confirmUserName
+        ,re.NAME  as RECTIFICATIONORNAME
+        ,confirmUser.NAME  as confirmUserName
         ,hiddenType.NAME as hiddenTypeName
         ,hiddenType2.NAME as hiddenTypeName2
         ,hregion.HIDDENREGION as hregionName
         ,(select count(1) from BUS_HIDDENEXAMINE eax where eax.HIDDEN_ID = f.HIDDEN_ID and eax.STATE = '-1') as exaCount
         from
-        <include refid="tableName"></include>
-        f
+        <include refid="tableName"></include> f
         LEFT JOIN sys_user confirmUser on confirmUser.USER_ID = f.CONFIRM_USER  <!-- 隐患确认人 -->
         left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
         left join <include refid="dicTableName"></include> hiddenType on f.HIDDENTYPE = hiddenType.BIANMA  <!-- 隐患类型-->
-        left join <include refid="dicTableName"></include> hiddenType2 on f.HIDDENTYPE2 =
-        hiddenType2.BIANMA  <!-- 隐患类型-->
+        left join <include refid="dicTableName"></include> hiddenType2 on f.HIDDENTYPE2 = hiddenType2.BIANMA  <!-- 隐患类型-->
         left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
         left join bus_hiddenregion hregion on hregion.HIDDENREGION_ID = f.HIDDENPART
         left join bus_listmanager list on list.LISTMANAGER_ID = f.LISTMANAGER_ID
         <if test='pd.ArrayDATA_IDS !=null and pd.ArrayDATA_IDS !=""'>
-            left JOIN (select USER_ID from sys_USER where DEPARTMENT_ID in(${pd.ArrayDATA_IDS})) userfind on
-            userfind.USER_ID = f.CREATOR
+            left JOIN (select USER_ID from sys_USER where DEPARTMENT_ID in(${pd.ArrayDATA_IDS})) userfind on userfind.USER_ID = f.CREATOR
         </if>
         where f.ISDELETE = '0'
         and f.state not in ('0')
@@ -2004,12 +1940,10 @@
             and (f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{pd.HIDDENDESCR}),'%'))
         </if>
         <if test="pd.keyFindUserName != null and pd.keyFindUserName != ''"><!-- 隐患发现人 -->
-            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID =
-            hfu.USER_ID where user.NAME LIKE CONCAT(CONCAT('%', #{pd.keyFindUserName}),'%') )
+            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.NAME  LIKE CONCAT(CONCAT('%', #{pd.keyFindUserName}),'%') )
         </if>
         <if test="pd.keyFindUserDept != null and pd.keyFindUserDept != ''"><!-- 隐患发现部门 -->
-            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID =
-            hfu.USER_ID where user.DEPARTMENT_ID = #{pd.keyFindUserDept} )
+            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.DEPARTMENT_ID  = #{pd.keyFindUserDept} )
         </if>
         <if test="pd.keyHiddenType != null and pd.keyHiddenType != ''"><!-- 隐患类型 -->
             and f.HIDDENTYPE = #{pd.keyHiddenType}
@@ -2036,8 +1970,7 @@
             and (confirmUser.NAME LIKE CONCAT(CONCAT('%', #{pd.keyConfirmUser}),'%'))
         </if>
         <if test="pd.keyMajor != null and pd.keyMajor != ''"><!-- 重大隐患 -->
-            and (lv.PARENT_ID = '5ff9daf78e9a4fb1b40d77980656799d' or
-            lv.DICTIONARIES_ID='5ff9daf78e9a4fb1b40d77980656799d' )
+            and (lv.PARENT_ID = '5ff9daf78e9a4fb1b40d77980656799d' or lv.DICTIONARIES_ID='5ff9daf78e9a4fb1b40d77980656799d' )
         </if>
         <if test="pd.keyHiddenSpecialType != null and pd.keyHiddenSpecialType != ''">
             and f.HIDDEN_ID in (select hex.HIDDEN_ID from bus_hiddenexamine hex
@@ -2050,7 +1983,7 @@
 			or (list.DEPARTMENT_ID in (${pd.ArrayDATA_IDS})
 			)
 		</if>-->
-        order by f.CREATTIME desc,f.STATE + 0 asc
+        order by  f.CREATTIME  desc,f.STATE + 0 asc
     </select>
 
     <!-- 重大隐患列表 -->
@@ -2058,26 +1991,23 @@
         select
         f.*
         ,lv.NAME HIDDENLEVELNAME
-        ,re.NAME as RECTIFICATIONORNAME
-        ,confirmUser.NAME as confirmUserName
+        ,re.NAME  as RECTIFICATIONORNAME
+        ,confirmUser.NAME  as confirmUserName
         ,hiddenType.NAME as hiddenTypeName
         ,hiddenType2.NAME as hiddenTypeName2
         ,hregion.HIDDENREGION as hregionName
         ,(select count(1) from BUS_HIDDENEXAMINE eax where eax.HIDDEN_ID = f.HIDDEN_ID and eax.STATE = '-1') as exaCount
         from
-        <include refid="tableName"></include>
-        f
+        <include refid="tableName"></include> f
         LEFT JOIN sys_user confirmUser on confirmUser.USER_ID = f.CONFIRM_USER  <!-- 隐患确认人 -->
         left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
         left join <include refid="dicTableName"></include> hiddenType on f.HIDDENTYPE = hiddenType.BIANMA  <!-- 隐患类型-->
-        left join <include refid="dicTableName"></include> hiddenType2 on f.HIDDENTYPE2 =
-        hiddenType2.BIANMA  <!-- 隐患类型-->
+        left join <include refid="dicTableName"></include> hiddenType2 on f.HIDDENTYPE2 = hiddenType2.BIANMA  <!-- 隐患类型-->
         left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
         left join bus_hiddenregion hregion on hregion.HIDDENREGION_ID = f.HIDDENPART
         left join bus_listmanager list on list.LISTMANAGER_ID = f.LISTMANAGER_ID
         <if test='pd.ArrayDATA_IDS !=null and pd.ArrayDATA_IDS !=""'>
-            left JOIN (select USER_ID from sys_USER where DEPARTMENT_ID in(${pd.ArrayDATA_IDS})) userfind on
-            userfind.USER_ID = f.CREATOR
+            left JOIN (select USER_ID from sys_USER where DEPARTMENT_ID in(${pd.ArrayDATA_IDS})) userfind on userfind.USER_ID = f.CREATOR
         </if>
         where f.ISDELETE = '0'
         and f.CORPINFO_ID = #{pd.CORPINFO_ID}
@@ -2108,12 +2038,10 @@
             and (f.HIDDENDESCR LIKE CONCAT(CONCAT('%', #{pd.HIDDENDESCR}),'%'))
         </if>
         <if test="pd.keyFindUserName != null and pd.keyFindUserName != ''"><!-- 隐患发现人 -->
-            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID =
-            hfu.USER_ID where user.NAME LIKE CONCAT(CONCAT('%', #{pd.keyFindUserName}),'%') )
+            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.NAME  LIKE CONCAT(CONCAT('%', #{pd.keyFindUserName}),'%') )
         </if>
         <if test="pd.keyFindUserDept != null and pd.keyFindUserDept != ''"><!-- 隐患发现部门 -->
-            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID =
-            hfu.USER_ID where user.DEPARTMENT_ID = #{pd.keyFindUserDept} )
+            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.DEPARTMENT_ID  = #{pd.keyFindUserDept} )
         </if>
         <if test="pd.keyHiddenType != null and pd.keyHiddenType != ''"><!-- 隐患类型 -->
             and f.HIDDENTYPE = #{pd.keyHiddenType}
@@ -2143,8 +2071,7 @@
             and (confirmUser.NAME LIKE CONCAT(CONCAT('%', #{pd.keyConfirmUser}),'%'))
         </if>
         <if test="pd.keyMajor != null and pd.keyMajor != ''"><!-- 重大隐患 -->
-            and (lv.PARENT_ID = '5ff9daf78e9a4fb1b40d77980656799d' or
-            lv.DICTIONARIES_ID='5ff9daf78e9a4fb1b40d77980656799d' )
+            and (lv.PARENT_ID = '5ff9daf78e9a4fb1b40d77980656799d' or lv.DICTIONARIES_ID='5ff9daf78e9a4fb1b40d77980656799d' )
         </if>
         <if test="pd.keyHiddenSpecialType != null and pd.keyHiddenSpecialType != ''">
             and f.HIDDEN_ID in (select hex.HIDDEN_ID from bus_hiddenexamine hex
@@ -2153,7 +2080,7 @@
         <!--		<if test="pd.RECTIFICATIONOR != null and pd.RECTIFICATIONOR != ''">&lt;!&ndash; 整改人 &ndash;&gt;-->
         <!--			and f.RECTIFICATIONOR = #{pd.RECTIFICATIONOR}-->
         <!--		</if>-->
-        order by f.CREATTIME desc,f.STATE + 0 asc
+        order by  f.CREATTIME  desc,f.STATE + 0 asc
     </select>
 
     <!-- 修改隐患整改期限 -->
@@ -2195,8 +2122,7 @@
                 </when>
             </choose>
         </if>
-        AND f.CREATTIME >= CONCAT_WS(" ", date_format(DATE_ADD(date_sub(curdate(),interval 5 month),interval
-        -day(date_sub(curdate(),interval 5 month))+1 DAY),'%Y-%m-%d'), '00:00:00')
+        AND f.CREATTIME >= CONCAT_WS(" ", date_format(DATE_ADD(date_sub(curdate(),interval 5 month),interval -day(date_sub(curdate(),interval 5 month))+1 DAY),'%Y-%m-%d'), '00:00:00')
         ) f GROUP BY f.CREATMONTH
     </select>
     <!-- 修改隐患状态，-->
@@ -2222,35 +2148,30 @@
         set
         RECTIFICATIONDEADLINE = #{RECTIFICATIONDEADLINE}
         <if test="RECTIFICATIONDEADLINE != null and RECTIFICATIONDEADLINE != ''">
-            , STATE = if(DATE_FORMAT( #{RECTIFICATIONDEADLINE},'%Y-%m-%d') &gt;= DATE_FORMAT(NOW(),'%Y-%m-%d'), '1',
-            STATE)
+            , STATE = if(DATE_FORMAT( #{RECTIFICATIONDEADLINE},'%Y-%m-%d') &gt;= DATE_FORMAT(NOW(),'%Y-%m-%d'), '1', STATE)
         </if>
         where
         HIDDEN_ID = #{HIDDEN_ID}
     </update>
     <!-- 通过ID获取数据 -->
     <select id="statisticsHiddenByState" parameterType="pd" resultType="pd">
-        SELECT COUNT(case
-                         when f.STATE not IN ('0', '5', '6', '3', '100', '101', '102') then f.hidden_id end) COUNTFOUND,
-               COUNT(case when f.STATE = '-2' then f.hidden_id end)                                          COUNTCONFIRM,
-               COUNT(case when f.STATE IN ('1', '2', '3', '4', '-1') then f.hidden_id end)                   COUNTCONFIRMED,
-               COUNT(case when f.STATE = '2' then f.hidden_id end)                                           COUNTACCEPT,
-               COUNT(case when f.STATE = '4' then f.hidden_id end)                                           COUNTACCEPTED,
-               COUNT(case when f.STATE = '-1' then f.hidden_id end)                                          COUNTDEFERRED
+        SELECT
+            COUNT(case when f.STATE not IN ('0','5','6','3','100','101','102') then f.hidden_id end) COUNTFOUND,
+            COUNT(case when f.STATE = '-2' then f.hidden_id end) COUNTCONFIRM,
+            COUNT(case when f.STATE IN ('1','2','3','4','-1') then f.hidden_id end) COUNTCONFIRMED,
+            COUNT(case when f.STATE = '2' then f.hidden_id end) COUNTACCEPT,
+            COUNT(case when f.STATE = '4' then f.hidden_id end) COUNTACCEPTED,
+            COUNT(case when f.STATE = '-1' then f.hidden_id end) COUNTDEFERRED
         FROM bus_hidden f
-        WHERE f.ISDELETE = '0'
-          AND f.CORPINFO_ID = #{CORPINFO_ID}
+        WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID}
     </select>
 
     <!-- 按照隐患级别级别分类统计各部位隐患数据 -->
     <select id="statisticsGroupLevelByRegion" parameterType="pd" resultType="pd">
-        SELECT f.DICTIONARIES_ID,
-               f.NAME,
-               f.BIANMA,
-               COUNT(h.HIDDEN_ID) COUNT
+        SELECT
+            f.DICTIONARIES_ID, f.NAME, f.BIANMA, COUNT(h.HIDDEN_ID) COUNT
         FROM sys_dictionaries f
-            LEFT JOIN sys_dictionaries p
-        ON p.DICTIONARIES_ID = f.PARENT_ID
+            LEFT JOIN sys_dictionaries p ON p.DICTIONARIES_ID = f.PARENT_ID
             LEFT JOIN bus_hidden h ON h.HIDDENLEVEL = f.BIANMA AND h.ISDELETE = '0'
             AND h.CORPINFO_ID = #{CORPINFO_ID} AND h.HIDDENPART = #{HIDDENPART}
         WHERE p.PARENT_ID = '5e7cf8620ba54ad89719d0be62133c7a'
@@ -2260,13 +2181,10 @@
 
     <!-- 按照隐患级别分类统计各安全类型隐患数据 -->
     <select id="statisticsGroupTypeByLevel" parameterType="pd" resultType="pd">
-        SELECT f.DICTIONARIES_ID,
-               f.NAME,
-               f.BIANMA,
-               COUNT(h.HIDDEN_ID) COUNT
+        SELECT
+            f.DICTIONARIES_ID, f.NAME, f.BIANMA, COUNT(h.HIDDEN_ID) COUNT
         FROM sys_dictionaries f
-            LEFT JOIN bus_hidden h
-        ON h.HIDDENTYPE = f.BIANMA AND h.ISDELETE = '0'
+            LEFT JOIN bus_hidden h ON h.HIDDENTYPE = f.BIANMA AND h.ISDELETE = '0'
             AND h.CORPINFO_ID = #{CORPINFO_ID} AND h.HIDDENLEVEL = #{HIDDENLEVEL}
         WHERE f.PARENT_ID = '3babc15144444bdc8d763d0af2bdfff6'
         GROUP BY f.DICTIONARIES_ID
@@ -2275,13 +2193,10 @@
 
     <!-- 分类统计各隐患类型2的隐患数据 -->
     <select id="statisticsGroupType2" parameterType="pd" resultType="pd">
-        SELECT f.DICTIONARIES_ID,
-               f.NAME,
-               f.BIANMA,
-               COUNT(h.HIDDEN_ID) COUNT
+        SELECT
+            f.DICTIONARIES_ID, f.NAME, f.BIANMA, COUNT(h.HIDDEN_ID) COUNT
         FROM sys_dictionaries f
-            LEFT JOIN bus_hidden h
-        ON h.HIDDENTYPE = f.BIANMA AND h.ISDELETE = '0'
+            LEFT JOIN bus_hidden h ON h.HIDDENTYPE = f.BIANMA AND h.ISDELETE = '0'
             AND h.CORPINFO_ID = #{CORPINFO_ID}
         WHERE f.PARENT_ID = '3babc15144444bdc8d763d0af2bdfff6'
         GROUP BY f.DICTIONARIES_ID
@@ -2290,16 +2205,16 @@
 
     <!-- 隐患来源分类统计 -->
     <select id="findHiddenSourceChartData" parameterType="pd" resultType="pd">
-        SELECT case
-                   when f.SOURCE = '1' then '隐患快报'
-                   when f.SOURCE = '2' OR f.SOURCE = '3' then '清单排查'
-                   when f.SOURCE = '4' then '安全环保检查(监管端)'
-                   when f.SOURCE = '5' then '安全环保检查(企业端)'
-                   END SOURCE_NAME,
-               COUNT(f.HIDDEN_ID) COUNT
+        SELECT
+            case
+                when f.SOURCE ='1' then '隐患快报'
+                when f.SOURCE ='2' OR f.SOURCE ='3' then '清单排查'
+                when f.SOURCE ='4' then '安全环保检查(监管端)'
+                when f.SOURCE ='5' then '安全环保检查(企业端)'
+                END SOURCE_NAME,
+            COUNT(f.HIDDEN_ID) COUNT
         FROM bus_hidden f
-        WHERE f.ISDELETE = '0'
-          AND f.SOURCE IS NOT NULL
+        WHERE f.ISDELETE = '0' AND f.SOURCE IS NOT NULL
           AND f.CORPINFO_ID = #{CORPINFO_ID}
         GROUP BY f.SOURCE
         ORDER BY f.SOURCE ASC
@@ -2307,22 +2222,17 @@
 
     <!-- 获取所有隐患的位置坐标（有坐标数据） -->
     <select id="listAllHiddenLocation" parameterType="pd" resultType="pd">
-        SELECT f.HIDDEN_ID                id,
-               IFNULL(r.HIDDENREGION, '') NAME,
-               f.HIDDENLEVEL,
-               CASE f.STATE
-                   WHEN '-2' THEN './bi/images/map/hd_dqr.png'
-                   WHEN '2' THEN './bi/images/map/hd_dys.png'
-                   ELSE './bi/images/map/hd_dzg.png'
-                   END                    IMAGE_FILE,
-               f.STATE,
-               f.LONGITUDE,
-               f.LATITUDE
+        SELECT
+            f.HIDDEN_ID id, IFNULL(r.HIDDENREGION, '') NAME, f.HIDDENLEVEL,
+            CASE f.STATE
+                WHEN '-2' THEN './bi/images/map/hd_dqr.png'
+                WHEN '2' THEN './bi/images/map/hd_dys.png'
+                ELSE './bi/images/map/hd_dzg.png'
+                END IMAGE_FILE,
+            f.STATE, f.LONGITUDE, f.LATITUDE
         FROM bus_hidden f
                  LEFT JOIN bus_hiddenregion r ON r.HIDDENREGION_ID = f.HIDDENPART
-        WHERE f.ISDELETE = '0'
-          AND f.LONGITUDE IS NOT NULL
-          AND f.LATITUDE IS NOT NULL
+        WHERE f.ISDELETE = '0' AND f.LONGITUDE IS NOT NULL AND f.LATITUDE IS NOT NULL
           AND f.STATE not in ('0', '4', '5', '8', '100')
           AND f.HIDDEN_ID not in (SELECT he.HIDDEN_ID from bus_hiddenexamine he where he.TYPE = '2' AND he.STATE = '2')
           AND f.CORPINFO_ID = #{CORPINFO_ID}
@@ -2352,17 +2262,15 @@
         f.ISRELEVANT,
         f.POSITIONDESC
         from
-        <include refid="tableName"></include>
-        f
+        <include refid="tableName"></include> f
         left join bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART
         left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
         left join <include refid="dicTableName"></include> ht on f.HIDDENTYPE = ht.BIANMA
-        left join <include refid="dicTableName"></include> ht2 on f.HIDDENTYPE2 = ht2.BIANMA and ht2.PARENT_ID =
-        '18c0a9aea6e54feab9f4ab3f46e0bc86'
+        left join <include refid="dicTableName"></include> ht2 on f.HIDDENTYPE2 = ht2.BIANMA and ht2.PARENT_ID = '18c0a9aea6e54feab9f4ab3f46e0bc86'
         left join oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
         left join vi_user_all cr on cr.USER_ID = f.CREATOR
         where f.ISDELETE = '0'
-        <if test="FOREIGN_ID != null and FOREIGN_ID !=''">
+        <if test="FOREIGN_ID != null and FOREIGN_ID !=''" >
             and f.FOREIGN_ID = #{FOREIGN_ID}
         </if>
         <if test="KEYWORDS != null and KEYWORDS != ''"><!-- 关键词检索 -->
@@ -2393,8 +2301,7 @@
             and c.VILLAGE = #{DEPT_VILLAGE}
         </if>
         <if test="DEPARTMENT_ID != null and DEPARTMENT_ID != ''">
-            and c.CORP_OF_TYPE in (select CORPTYPE_ID from BUS_CORPTYPETODEPT ctod where
-            ctod.DEPARTMENT_ID=#{DEPARTMENT_ID})
+            and c.CORP_OF_TYPE in (select CORPTYPE_ID from BUS_CORPTYPETODEPT ctod where ctod.DEPARTMENT_ID=#{DEPARTMENT_ID})
         </if>
 
         <if test="COUNTRY != null and COUNTRY != ''">
@@ -2413,11 +2320,11 @@
         <if test="ENDTIME != null and ENDTIME != ''">
             and f.RECTIFICATIONDEADLINE &lt;= #{ENDTIME}
         </if>
-        <if test="STATE != null and STATE !='' and STATE != 0">
+        <if test="STATE != null and STATE !='' and STATE != 0" >
             and f.STATE = #{STATE}
         </if>
 
-        <if test="HIDDENLEVEL != null and HIDDENLEVEL !=''">
+        <if test="HIDDENLEVEL != null and HIDDENLEVEL !=''" >
             and f.HIDDENLEVEL = #{HIDDENLEVEL}
         </if>
         order by f.CREATTIME ASC
@@ -2463,8 +2370,7 @@
         isa.ASSESS_PENALTY_AMOUNT,
         f.HIDDEN_ID
         from
-        <include refid="tableName"></include>
-        f
+        <include refid="tableName"></include> f
         LEFT JOIN BUS_INSPECTION_SAFETYENVIRONMENTAL se ON se.INSPECTION_ID = f.FOREIGN_ID
         LEFT JOIN VI_USER_ALL iou ON iou.USER_ID = se.INSPECTION_ORIGINATOR_ID
         LEFT JOIN VI_DEPARTMENT_ALL iod ON iod.DEPARTMENT_ID = iou.DEPARTMENT_ID
@@ -2484,12 +2390,10 @@
                 <when test='pd.roleLevel == "0"'>
                 </when>
                 <when test='pd.roleLevel == "1"'>
-                    and (confirmUser.DEPARTMENT_ID in (${pd.supDeparIds}) or bhu.DEPARTMENT_ID in (${pd.supDeparIds}) or
-                    f.RECTIFICATIONDEPT in (${pd.supDeparIds}) or hch.DEPARTMENT_ID in (${pd.supDeparIds}))
+                    and (confirmUser.DEPARTMENT_ID in (${pd.supDeparIds}) or bhu.DEPARTMENT_ID in (${pd.supDeparIds}) or f.RECTIFICATIONDEPT in (${pd.supDeparIds})  or hch.DEPARTMENT_ID in (${pd.supDeparIds}))
                 </when>
                 <when test='pd.roleLevel == "2"'>
-                    and (bhu.USER_ID =#{pd.loginUserId} or f.CONFIRM_USER = #{pd.loginUserId} or f.RECTIFICATIONOR =
-                    #{pd.loginUserId} or f.CHECKOR = #{pd.loginUserId} )
+                    and (bhu.USER_ID =#{pd.loginUserId} or f.CONFIRM_USER = #{pd.loginUserId} or f.RECTIFICATIONOR = #{pd.loginUserId} or f.CHECKOR = #{pd.loginUserId} )
                 </when>
             </choose>
         </if>
@@ -2617,8 +2521,7 @@
         select
         f.HIDDEN_ID
         from
-        <include refid="tableName"></include>
-        f
+        <include refid="tableName"></include> f
         where f.ISDELETE = '0' and f.STATE in ('101','102')
         and f.FOREIGN_ID = #{INSPECTION_ID} and f.HIDDEN_ID != #{HIDDEN_ID}
     </select>
@@ -2628,8 +2531,7 @@
         select
         f.HIDDEN_ID
         from
-        <include refid="tableName"></include>
-        f
+        <include refid="tableName"></include> f
         where f.ISDELETE = '0'
         <if test="ACCEPTSTEP == 6">
             and f.STATE != '4' and f.STATE != '8'
@@ -2638,7 +2540,7 @@
             and (f.STATE != '4' OR (f.STATE = '4' AND f.FINAL_CHECK IS NULL))
         </if>
         <if test="ACCEPTSTEP == 7">
-            and (f.STATE != '4' OR (f.STATE = '4' AND f.FINAL_CHECK IS NULL)) and f.STATE != '8'
+            and (f.STATE != '4' OR (f.STATE = '4' AND f.FINAL_CHECK IS NULL))  and f.STATE != '8'
         </if>
         and f.FOREIGN_ID = #{INSPECTION_ID} and f.HIDDEN_ID != #{HIDDEN_ID}
     </select>
@@ -2648,8 +2550,7 @@
         select
         f.HIDDEN_ID
         from
-        <include refid="tableName"></include>
-        f
+        <include refid="tableName"></include> f
         where f.ISDELETE = '0'
         AND ( f.FINAL_CHECK != '1' OR f.FINAL_CHECK IS NULL )
         and f.FOREIGN_ID = #{INSPECTION_ID} and f.HIDDEN_ID != #{HIDDEN_ID}
@@ -2672,8 +2573,7 @@
         select
         f.HIDDEN_ID
         from
-        <include refid="tableName"></include>
-        f
+        <include refid="tableName"></include> f
         where
         f.CHECKRECORD_ID = #{CHECKRECORD_ID}
         and f.STATE = '-2'
@@ -2684,8 +2584,7 @@
         select
         f.HIDDEN_ID
         from
-        <include refid="tableName"></include>
-        f
+        <include refid="tableName"></include> f
         where
         f.FOREIGN_ID = #{INSPECTION_ID}
     </select>
@@ -2705,8 +2604,7 @@
         select
         a.NAME as HIDDEN_CREATOR_NAME, f.*
         from
-        <include refid="tableName"></include>
-        f
+        <include refid="tableName"></include> f
         left join vi_user_all a on a.USER_ID = f.CREATOR
         where f.ISDELETE = '0'and f.FOREIGN_ID = #{FOREIGN_ID}
     </select>
@@ -2714,8 +2612,7 @@
         select
         re.NAME as RECTIFICATIONORNAME, f.*
         from
-        <include refid="tableName"></include>
-        f
+        <include refid="tableName"></include> f
         left join sys_user re on re.USER_ID = f.RECTIFICATIONOR
         where f.ISDELETE = '0'and f.HIDDEN_ID = #{HIDDEN_ID}
     </select>
@@ -2724,8 +2621,7 @@
         select
         conUser.NAME as conUserName,f.*
         from
-        <include refid="tableName"></include>
-        f
+        <include refid="tableName"></include> f
         left join VI_USER_ALL conUser on conUser.USER_ID = f.CONFIRM_USER
         where f.ISDELETE = '0'and f.HIDDEN_ID = #{HIDDEN_ID}
     </select>
@@ -2737,8 +2633,7 @@
         ts.TYPE as TSTYPE,
         conUser.name as tsname
         from
-        <include refid="tableName"></include>
-        f
+        <include refid="tableName"></include> f
         left join bus_hiddenexamine ts on ts.HIDDEN_ID = f.HIDDEN_ID
         left join VI_USER_ALL conUser on conUser.USER_ID = f.CONFIRM_USER
         where f.STATE in ('7','8') and f.ISDELETE = '0'and f.HIDDEN_ID = #{HIDDEN_ID}
@@ -2747,21 +2642,16 @@
 
     <!-- 按照隐患级别分类统计各安全类型隐患数据 -->
     <select id="statisticsHiddenCountByLevel" parameterType="pd" resultType="pd">
-        SELECT count(*) count ,
+        SELECT
+            count(*) count ,
 			HIDDENLEVEL,HIDDENTYPE
         FROM
             bus_hidden f
         WHERE
-            f.ISDELETE = '0'
-          and (HIDDENLEVEL is not null
-           or HIDDENLEVEL !='')
-          and CORPINFO_ID = #{CORPINFO_ID}
-          and f.STATE not in ('0'
-            , '100'
-            , '101'
-            , '102')
+            f.ISDELETE = '0' and (HIDDENLEVEL is not null or HIDDENLEVEL !='') and CORPINFO_ID = #{CORPINFO_ID}
+          and f.STATE not in('0','100','101','102')
         GROUP BY
-            HIDDENLEVEL, HIDDENTYPE
+            HIDDENLEVEL,HIDDENTYPE
     </select>
     <select id="excelonly" parameterType="pd" resultType="pd">
         select
@@ -2792,8 +2682,7 @@
         zg.name RECTIFICATIONORNAME,
         confirmUser.name confirmUserName,
         f.CHECKTIME,
-        (select group_concat(chr.NAME) from BUS_HIDDENCHECK bh left join sys_user chr on chr.USER_ID=bh.USER_ID where
-        bh.HIDDEN_ID=f.HIDDEN_ID ) CHECKNAME
+        (select group_concat(chr.NAME) from BUS_HIDDENCHECK bh left join sys_user chr on chr.USER_ID=bh.USER_ID where bh.HIDDEN_ID=f.HIDDEN_ID ) CHECKNAME
         FROM
         bus_hidden f
         LEFT JOIN bus_hiddenregion hcdic on hcdic.HIDDENREGION_ID = f.HIDDENPART
@@ -2812,14 +2701,10 @@
                 <when test='pd.roleLevel == "0"'>
                 </when>
                 <when test='pd.roleLevel == "1"'>
-                    and (confirmUser.DEPARTMENT_ID in (${pd.supDeparIds}) or bhuUser.DEPARTMENT_ID in
-                    (${pd.supDeparIds}) or f.RECTIFICATIONDEPT in (${pd.supDeparIds}) or hch.DEPARTMENT_ID in
-                    (${pd.supDeparIds}))
+                    and (confirmUser.DEPARTMENT_ID in (${pd.supDeparIds}) or bhuUser.DEPARTMENT_ID in (${pd.supDeparIds}) or f.RECTIFICATIONDEPT in (${pd.supDeparIds})  or hch.DEPARTMENT_ID in (${pd.supDeparIds}))
                 </when>
                 <when test='pd.roleLevel == "2"'>
-                    and (f.CREATOR = #{pd.loginUserId} or f.RECTIFICATIONOR = #{pd.loginUserId} or f.CONFIRM_USER=
-                    #{pd.loginUserId} or bhu.USER_ID =#{pd.loginUserId} or f.CHECKOR = #{pd.loginUserId} or hch.USER_ID
-                    = #{pd.loginUserId})
+                    and (f.CREATOR = #{pd.loginUserId} or f.RECTIFICATIONOR = #{pd.loginUserId} or f.CONFIRM_USER= #{pd.loginUserId} or bhu.USER_ID =#{pd.loginUserId} or f.CHECKOR = #{pd.loginUserId} or hch.USER_ID = #{pd.loginUserId})
                 </when>
             </choose>
         </if>
@@ -2830,7 +2715,7 @@
             f.HIDDEN_ID in(select fh.HIDDEN_ID from bus_hidden_user fh where fh.USER_ID = #{pd.queryUserId})
             or f.CONFIRM_USER = #{pd.queryUserId}
             or f.RECTIFICATIONOR = #{pd.queryUserId}
-            or f.HIDDEN_ID in(select ch.HIDDEN_ID from bus_hiddencheck ch where ch.USER_ID = #{pd.queryUserId})
+            or  f.HIDDEN_ID in(select ch.HIDDEN_ID from bus_hiddencheck ch where ch.USER_ID = #{pd.queryUserId})
             )
         </if>
         <if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 企业ID -->
@@ -2851,8 +2736,7 @@
             </if>
         </if>
         <if test="pd.HIDDENFIND_NAME != null and pd.HIDDENFIND_NAME != ''"><!-- 隐患发现人 -->
-            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID =
-            hfu.USER_ID where user.NAME LIKE CONCAT(CONCAT('%', #{pd.HIDDENFIND_NAME}),'%') )
+            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.NAME  LIKE CONCAT(CONCAT('%', #{pd.HIDDENFIND_NAME}),'%') )
         </if>
         <if test="pd.STARTTIME != null and pd.STARTTIME != ''"><!-- 隐患发现时间 -->
             and f.DISCOVERYTIME <![CDATA[ >= ]]> CONCAT_WS(' ', #{pd.STARTTIME}, '00:00')
@@ -2870,7 +2754,7 @@
             or
             cu.PHONE LIKE CONCAT(CONCAT('%', #{pd.confirmUserName}),'%')
             )
-            and cu.CORPINFO_ID = #{pd.CORPINFO_ID}
+            and  cu.CORPINFO_ID = #{pd.CORPINFO_ID}
             )
         </if>
 
@@ -2880,7 +2764,7 @@
             yhc.HIDDEN_ID
             FROM
             bus_hiddencheck yhc
-            LEFT JOIN sys_user yuser ON yuser.USER_ID = yhc.USER_ID AND yuser.CORPINFO_ID = #{pd.CORPINFO_ID}
+            LEFT JOIN sys_user yuser ON yuser.USER_ID = yhc.USER_ID	AND yuser.CORPINFO_ID = #{pd.CORPINFO_ID}
             where (
             yuser.USERNAME LIKE CONCAT(CONCAT('%',#{ pd.CHECKNAME}),'%')
             or
@@ -2904,12 +2788,10 @@
             and f.HIDDENPART = #{pd.keyHiddenPart}
         </if>
         <if test="pd.keyFindUserName != null and pd.keyFindUserName != ''"><!-- 隐患发现人 -->
-            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID =
-            hfu.USER_ID where user.NAME LIKE CONCAT(CONCAT('%', #{pd.keyFindUserName}),'%') )
+            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.NAME  LIKE CONCAT(CONCAT('%', #{pd.keyFindUserName}),'%') )
         </if>
         <if test="pd.keyFindUserDept != null and pd.keyFindUserDept != ''"><!-- 隐患发现部门 -->
-            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID =
-            hfu.USER_ID where user.DEPARTMENT_ID = #{pd.keyFindUserDept} )
+            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.DEPARTMENT_ID  = #{pd.keyFindUserDept} )
         </if>
         <if test="pd.keyHiddenType != null and pd.keyHiddenType != ''"><!-- 隐患类型 -->
             and f.HIDDENTYPE = #{pd.keyHiddenType}
@@ -2918,7 +2800,7 @@
             and f.HIDDENTYPE2 = #{pd.keyHiddenType2}
         </if>
         group by f.HIDDEN_ID
-        order by f.CREATTIME desc,f.STATE + 0 asc
+        order by  f.CREATTIME  desc,f.STATE + 0 asc
     </select>
     <!-- 列表 -->
     <select id="getListForemisdatalistPage" parameterType="page" resultType="pd">
@@ -2939,8 +2821,7 @@
         f.STATE,
         f.CREATOR,
         ch.NAME CHECKORNAME,
-        (select group_concat(chr.NAME) from BUS_HIDDENCHECK bh left join sys_user chr on chr.USER_ID=bh.USER_ID where
-        bh.HIDDEN_ID=f.HIDDEN_ID ) CHECKNAME
+        (select group_concat(chr.NAME) from BUS_HIDDENCHECK bh left join sys_user chr on chr.USER_ID=bh.USER_ID where bh.HIDDEN_ID=f.HIDDEN_ID ) CHECKNAME
         FROM
         bus_hidden_emis f
         LEFT JOIN bus_hiddenregion hcdic on hcdic.HIDDENREGION_ID = f.HIDDENPART
@@ -2958,13 +2839,10 @@
                 <when test='pd.roleLevel == "0"'>
                 </when>
                 <when test='pd.roleLevel == "1"'>
-                    and (confirmUser.DEPARTMENT_ID in (${pd.supDeparIds}) or bhuUser.DEPARTMENT_ID in
-                    (${pd.supDeparIds}) or f.RECTIFICATIONDEPT in (${pd.supDeparIds}) or hch.DEPARTMENT_ID in
-                    (${pd.supDeparIds}))
+                    and (confirmUser.DEPARTMENT_ID in (${pd.supDeparIds}) or bhuUser.DEPARTMENT_ID in (${pd.supDeparIds}) or f.RECTIFICATIONDEPT in (${pd.supDeparIds})  or hch.DEPARTMENT_ID in (${pd.supDeparIds}))
                 </when>
                 <when test='pd.roleLevel == "2"'>
-                    and (f.CREATOR = #{pd.loginUserId} or f.RECTIFICATIONOR = #{pd.loginUserId} or f.CONFIRM_USER=
-                    #{pd.loginUserId} or bhu.USER_ID =#{pd.loginUserId})
+                    and (f.CREATOR = #{pd.loginUserId} or f.RECTIFICATIONOR = #{pd.loginUserId} or f.CONFIRM_USER= #{pd.loginUserId} or bhu.USER_ID =#{pd.loginUserId})
                 </when>
             </choose>
         </if>
@@ -2975,7 +2853,7 @@
             f.HIDDEN_ID in(select fh.HIDDEN_ID from bus_hidden_user fh where fh.USER_ID = #{pd.queryUserId}
             or f.CONFIRM_USER = #{pd.queryUserId}
             or f.RECTIFICATIONOR = #{pd.queryUserId}
-            or f.HIDDEN_ID in(select ch.HIDDEN_ID from bus_hiddencheck ch where ch.USER_ID = #{pd.queryUserId})
+            or  f.HIDDEN_ID in(select ch.HIDDEN_ID from bus_hiddencheck ch where ch.USER_ID = #{pd.queryUserId})
             ))
         </if>
         <if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 企业ID -->
@@ -2993,8 +2871,7 @@
             </if>
         </if>
         <if test="pd.HIDDENFIND_NAME != null and pd.HIDDENFIND_NAME != ''"><!-- 隐患发现人 -->
-            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID =
-            hfu.USER_ID where user.NAME LIKE CONCAT(CONCAT('%', #{pd.HIDDENFIND_NAME}),'%') )
+            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.NAME  LIKE CONCAT(CONCAT('%', #{pd.HIDDENFIND_NAME}),'%') )
         </if>
         <if test="pd.STARTTIME != null and pd.STARTTIME != ''"><!-- 隐患发现时间 -->
             and f.DISCOVERYTIME <![CDATA[ >= ]]> CONCAT_WS(' ', #{pd.STARTTIME}, '00:00')
@@ -3012,7 +2889,7 @@
             or
             cu.PHONE LIKE CONCAT(CONCAT('%', #{pd.confirmUserName}),'%')
             )
-            and cu.CORPINFO_ID = #{pd.CORPINFO_ID}
+            and  cu.CORPINFO_ID = #{pd.CORPINFO_ID}
             )
         </if>
 
@@ -3022,7 +2899,7 @@
             yhc.HIDDEN_ID
             FROM
             bus_hiddencheck yhc
-            LEFT JOIN sys_user yuser ON yuser.USER_ID = yhc.USER_ID AND yuser.CORPINFO_ID = #{pd.CORPINFO_ID}
+            LEFT JOIN sys_user yuser ON yuser.USER_ID = yhc.USER_ID	AND yuser.CORPINFO_ID = #{pd.CORPINFO_ID}
             where (
             yuser.USERNAME LIKE CONCAT(CONCAT('%',#{ pd.CHECKNAME}),'%')
             or
@@ -3046,12 +2923,10 @@
             and f.HIDDENPART = #{pd.keyHiddenPart}
         </if>
         <if test="pd.keyFindUserName != null and pd.keyFindUserName != ''"><!-- 隐患发现人 -->
-            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID =
-            hfu.USER_ID where user.NAME LIKE CONCAT(CONCAT('%', #{pd.keyFindUserName}),'%') )
+            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.NAME  LIKE CONCAT(CONCAT('%', #{pd.keyFindUserName}),'%') )
         </if>
         <if test="pd.keyFindUserDept != null and pd.keyFindUserDept != ''"><!-- 隐患发现部门 -->
-            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID =
-            hfu.USER_ID where user.DEPARTMENT_ID = #{pd.keyFindUserDept} )
+            and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER  hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID where user.DEPARTMENT_ID  = #{pd.keyFindUserDept} )
         </if>
         <if test="pd.keyHiddenType != null and pd.keyHiddenType != ''"><!-- 隐患类型 -->
             and f.HIDDENTYPE = #{pd.keyHiddenType}
@@ -3060,84 +2935,41 @@
             and f.HIDDENTYPE2 = #{pd.keyHiddenType2}
         </if>
         group by f.HIDDEN_ID
-        order by f.CREATTIME desc,f.STATE + 0 asc
+        order by  f.CREATTIME  desc,f.STATE + 0 asc
     </select>
     <select id="findBySource" resultType="com.zcloud.entity.PageData">
-        SELECT *
-        FROM bus_hidden
-        WHERE ISDELETE = 0
-          and SOURCE = #{sourceNumber}
+        SELECT
+            *
+        FROM
+            bus_hidden
+        WHERE
+            ISDELETE = 0
+          and
+            SOURCE = #{sourceNumber}
     </select>
     <insert id="saveForEmis" parameterType="pd">
-        INSERT INTO bus_hidden_emis(HIDDEN_ID, SOURCE, RISK_UNIT, IDENTIFICATION, RISK_DESCR, RISK_POSITION, LEVEL,
-                                    CHECK_CONTENT, HIDDENDESCR, HIDDENPART, CREATOR,
-                                    CREATTIME, RECTIFYDESCR, RECTIFICATIONTYPE, RECTIFICATIONDEPT, RECTIFICATIONOR,
-                                    RECTIFICATIONDEADLINE,
-                                    RECTIFICATIONTIME, HIDDENLEVEL, STATE, CHECKDEPT, CHECKOR, CHECKTIME, CHECKDESCR,
-                                    ISQUALIFIED, ISDELETE, CORPINFO_ID,
-                                    HIDDENFINDDEPT, CHECKRECORD_ID, RECORDITEM_ID, RISKITEM_ID, REJECTREASON, REVIEWOR,
-                                    REVIEWTIME, REVIEWDEPT, HAVESCHEME,
-                                    LONGITUDE, LATITUDE, LISTMANAGER_ID, HIDDENTYPE, ISCONFIRM, CONFIRM_USER,
-                                    CONFIRM_TIME, DISCOVERYTIME, INVESTMENT_FUNDS,
-                                    HIDDENTYPE2, POSITIONDESC, ISRELEVANT, EMIS_RES)
-        SELECT HIDDEN_ID,
-               SOURCE,
-               RISK_UNIT,
-               IDENTIFICATION,
-               RISK_DESCR,
-               RISK_POSITION,
-               LEVEL,
-               CHECK_CONTENT,
-               HIDDENDESCR,
-               HIDDENPART,
-               CREATOR,
-               CREATTIME,
-               RECTIFYDESCR,
-               RECTIFICATIONTYPE,
-               RECTIFICATIONDEPT,
-               RECTIFICATIONOR,
-               RECTIFICATIONDEADLINE,
-               RECTIFICATIONTIME,
-               HIDDENLEVEL,
-               STATE,
-               CHECKDEPT,
-               CHECKOR,
-               CHECKTIME,
-               CHECKDESCR,
-               ISQUALIFIED,
-               ISDELETE,
-               CORPINFO_ID,
-               HIDDENFINDDEPT,
-               CHECKRECORD_ID,
-               RECORDITEM_ID,
-               RISKITEM_ID,
-               REJECTREASON,
-               REVIEWOR,
-               REVIEWTIME,
-               REVIEWDEPT,
-               HAVESCHEME,
-               LONGITUDE,
-               LATITUDE,
-               LISTMANAGER_ID,
-               HIDDENTYPE,
-               ISCONFIRM,
-               CONFIRM_USER,
-               CONFIRM_TIME,
-               DISCOVERYTIME,
-               INVESTMENT_FUNDS,
-               HIDDENTYPE2,
-               POSITIONDESC,
-               ISRELEVANT,
-               #{resXML}
-        FROM bus_hidden
-        where HIDDEN_ID = #{HIDDEN_ID}
+        INSERT INTO bus_hidden_emis(
+            HIDDEN_ID,SOURCE,RISK_UNIT,IDENTIFICATION,RISK_DESCR,RISK_POSITION,LEVEL,CHECK_CONTENT,HIDDENDESCR,HIDDENPART,CREATOR,
+            CREATTIME,RECTIFYDESCR,RECTIFICATIONTYPE,RECTIFICATIONDEPT,RECTIFICATIONOR,RECTIFICATIONDEADLINE,
+            RECTIFICATIONTIME,HIDDENLEVEL,STATE,CHECKDEPT,CHECKOR,CHECKTIME,CHECKDESCR,ISQUALIFIED,ISDELETE,CORPINFO_ID,
+            HIDDENFINDDEPT,CHECKRECORD_ID,RECORDITEM_ID,RISKITEM_ID,REJECTREASON,REVIEWOR,REVIEWTIME,REVIEWDEPT,HAVESCHEME,
+            LONGITUDE,LATITUDE,LISTMANAGER_ID,HIDDENTYPE,ISCONFIRM,CONFIRM_USER,CONFIRM_TIME,DISCOVERYTIME,INVESTMENT_FUNDS,
+            HIDDENTYPE2,POSITIONDESC,ISRELEVANT,EMIS_RES
+        ) SELECT
+              HIDDEN_ID,SOURCE,RISK_UNIT,IDENTIFICATION,RISK_DESCR,RISK_POSITION,LEVEL,CHECK_CONTENT,HIDDENDESCR,HIDDENPART,CREATOR,CREATTIME,RECTIFYDESCR,
+              RECTIFICATIONTYPE,RECTIFICATIONDEPT,RECTIFICATIONOR,RECTIFICATIONDEADLINE,RECTIFICATIONTIME,HIDDENLEVEL,STATE,CHECKDEPT,CHECKOR,CHECKTIME,
+              CHECKDESCR,ISQUALIFIED,ISDELETE,CORPINFO_ID,HIDDENFINDDEPT,CHECKRECORD_ID,RECORDITEM_ID,RISKITEM_ID,REJECTREASON,REVIEWOR,REVIEWTIME,REVIEWDEPT,
+              HAVESCHEME,LONGITUDE,LATITUDE,LISTMANAGER_ID,HIDDENTYPE,ISCONFIRM,CONFIRM_USER,CONFIRM_TIME,DISCOVERYTIME,INVESTMENT_FUNDS,HIDDENTYPE2,
+              POSITIONDESC,ISRELEVANT,#{resXML}
+        FROM bus_hidden where
+            HIDDEN_ID  = #{HIDDEN_ID}
     </insert>
 
     <delete id="deleteForEmis" parameterType="pd">
         delete from
         <include refid="tableName"></include>
         where
-        HIDDEN_ID = #{HIDDEN_ID}
+        HIDDEN_ID  = #{HIDDEN_ID}
     </delete>
 
 
@@ -3230,6 +3062,75 @@
         </foreach>
         and h.CREATTIME <![CDATA[ >= ]]>  #{startTime}
         and h.CREATTIME <![CDATA[ <= ]]>  #{endTime}
+        UNION ALL
+        SELECT
+        h.HIDDEN_ID,
+        h.STATE,
+        IFNULL(h.INVESTMENT_FUNDS,0) INVESTMENT_FUNDS,
+        'mechanical' type
+        FROM
+        bus_hidden h
+        LEFT JOIN sys_user u ON h.CREATOR = u.USER_ID
+        LEFT JOIN sys_user uu ON h.RECTIFICATIONOR = uu.USER_ID
+        WHERE
+        h.SOURCE != '4'
+        AND h.ISDELETE = '0'
+        AND uu.DEPARTMENT_ID IN
+        <foreach item="item" index="index" collection="mechanicalDepartmentIds" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        AND u.DEPARTMENT_ID IN
+        <foreach item="item" index="index" collection="mechanicalDepartmentIds" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        and h.CREATTIME <![CDATA[ >= ]]>  #{startTime}
+        and h.CREATTIME <![CDATA[ <= ]]>  #{endTime}
+        UNION ALL
+        SELECT
+        h.HIDDEN_ID,
+        h.STATE,
+        IFNULL(h.INVESTMENT_FUNDS,0) INVESTMENT_FUNDS,
+        'business' type
+        FROM
+        bus_hidden h
+        LEFT JOIN sys_user u ON h.CREATOR = u.USER_ID
+        LEFT JOIN sys_user uu ON h.RECTIFICATIONOR = uu.USER_ID
+        WHERE
+        h.SOURCE != '4'
+        AND h.ISDELETE = '0'
+        AND uu.DEPARTMENT_ID IN
+        <foreach item="item" index="index" collection="businessDepartmentIds" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        AND u.DEPARTMENT_ID IN
+        <foreach item="item" index="index" collection="businessDepartmentIds" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        and h.CREATTIME <![CDATA[ >= ]]>  #{startTime}
+        and h.CREATTIME <![CDATA[ <= ]]>  #{endTime}
+        UNION ALL
+        SELECT
+        h.HIDDEN_ID,
+        h.STATE,
+        IFNULL(h.INVESTMENT_FUNDS,0) INVESTMENT_FUNDS,
+        'generalOffice' type
+        FROM
+        bus_hidden h
+        LEFT JOIN sys_user u ON h.CREATOR = u.USER_ID
+        LEFT JOIN sys_user uu ON h.RECTIFICATIONOR = uu.USER_ID
+        WHERE
+        h.SOURCE != '4'
+        AND h.ISDELETE = '0'
+        AND uu.DEPARTMENT_ID IN
+        <foreach item="item" index="index" collection="generalOfficeDepartmentIds" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        AND u.DEPARTMENT_ID IN
+        <foreach item="item" index="index" collection="generalOfficeDepartmentIds" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        and h.CREATTIME <![CDATA[ >= ]]>  #{startTime}
+        and h.CREATTIME <![CDATA[ <= ]]>  #{endTime}
     </select>
 
 
@@ -3305,682 +3206,675 @@
     </select>
 
     <select id="findForBi" parameterType="pd" resultType="pd">
-        SELECT CAST(count1.CONFIRM_COUNT AS SIGNED) CONFIRM_COUNT,
-        CAST(count2.RECTIFICATION_COUNT AS SIGNED) RECTIFICATION_COUNT,
-        CAST(count3.DELAY_COUNT AS SIGNED) DELAY_COUNT,
-        CAST(count4.CHECK_COUNT AS SIGNED) CHECK_COUNT,
-        CAST(count5.SPECIAL_COUNT AS SIGNED) SPECIAL_COUNT,
-        CAST(count6.INSPECTION_COUNT AS SIGNED) INSPECTION_COUNT,
-        CAST(count7.INSPECTIONED_COUNT AS SIGNED) INSPECTIONED_COUNT,
-        CAST(count8.ASSIGN_COUNT AS SIGNED) ASSIGN_COUNT,
-        CAST(count8.ASSIGN_HIDDEN_COUNT AS SIGNED) ASSIGN_HIDDEN_COUNT,
-        CAST(count9.ACCEPT_COUNT AS SIGNED) ACCEPT_COUNT,
-        CAST(count9.ACCEPT_HIDDEN_COUNT AS SIGNED) ACCEPT_HIDDEN_COUNT,
-        CAST(count10.FIRECHECK_COUNT AS SIGNED) FIRECHECK_COUNT,
-        CAST(count11.PUNISH_COUNT AS SIGNED) PUNISH_COUNT,
-        CAST(count12.OUTSOURCED_COUNT AS SIGNED) OUTSOURCED_COUNT,
-        CAST(count13.PROMISE_SINGED AS SIGNED) PROMISE_SINGED,
-        CAST(count14.RESPONSOBILITY_SINGED AS SIGNED) RESPONSOBILITY_SINGED,
-        CAST(count15.CONFINEDSPACE_COUNT AS SIGNED) CONFINEDSPACE_COUNT,
-        CAST(count15.BLINDBOARD_COUNT AS SIGNED) BLINDBOARD_COUNT,
-        CAST(count15.BREAKGROUND_COUNT AS SIGNED) BREAKGROUND_COUNT,
-        CAST(count15.HIGHWORK_COUNT AS SIGNED) HIGHWORK_COUNT,
-        CAST(count15.HOSTING_COUNT AS SIGNED) HOSTING_COUNT,
-        CAST(count15.ELECTRICITY_COUNT AS SIGNED) ELECTRICITY_COUNT,
-        CAST(count15.CUTROAD_COUNT AS SIGNED) CUTROAD_COUNT,
-        CAST(count15.HOTWORK_COUNT AS SIGNED) HOTWORK_COUNT
-        FROM (SELECT COUNT(DISTINCT h.HIDDEN_ID) CONFIRM_COUNT
-        FROM SYS_USER f
-        LEFT JOIN bus_hidden h ON h.CONFIRM_USER = f.USER_ID
-        AND h.STATE = '-2'
-        AND h.ISDELETE = '0'
-        AND h.CORPINFO_ID = #{CORPINFO_ID}
-        WHERE f.USER_ID = #{USER_ID}
-        GROUP BY f.USER_ID
-        ORDER BY h.CREATTIME DESC) count1,
-        (SELECT COUNT(DISTINCT h.HIDDEN_ID) RECTIFICATION_COUNT
-        FROM SYS_USER f
-        LEFT JOIN bus_hidden h ON h.RECTIFICATIONOR = f.USER_ID
-        AND h.STATE = '1'
-        AND h.ISDELETE = '0'
-        AND h.CORPINFO_ID = #{CORPINFO_ID}
-        WHERE f.USER_ID = #{USER_ID}
-        GROUP BY f.USER_ID
-        ORDER BY h.CREATTIME DESC) count2,
-        (SELECT COUNT(DISTINCT he.HIDDENEXAMINE_ID) DELAY_COUNT
-        FROM SYS_USER f
-        LEFT JOIN bus_hidden h ON h.CONFIRM_USER = f.USER_ID
-        AND h.state = '1'
-        AND h.ISDELETE = '0'
-        AND h.CORPINFO_ID = #{CORPINFO_ID}
-        LEFT JOIN BUS_HIDDENEXAMINE he ON he.HIDDEN_ID = h.HIDDEN_ID
-        AND he.TYPE = '2'
-        WHERE f.USER_ID = #{USER_ID}
-        GROUP BY f.USER_ID
-        ORDER BY h.CREATTIME DESC) count3,
-        (SELECT IFNULL(COUNT(DISTINCT h.HIDDEN_ID), 0) CHECK_COUNT
-        FROM SYS_USER f
-        LEFT JOIN bus_hiddencheck hc ON hc.USER_ID = f.USER_ID
-        LEFT JOIN bus_hidden h ON h.HIDDEN_ID = hc.HIDDEN_ID
-        AND h.STATE = '2'
-        AND h.ISDELETE = '0'
-        AND h.STATE NOT IN ('0', '7', '8', '100', '101', '102')
-        AND h.HIDDENLEVEL
-        != 'hiddenLevel2002'
-        AND h.HIDDENLEVEL != 'hiddenLevel1001'
-        AND h.HIDDENLEVEL != 'jdyh001'
-        AND h.HIDDENLEVEL NOT IN ( 'hiddenLevel2002', 'hiddenLevel1001', 'jdyh001' )
-        AND h.CORPINFO_ID = #{CORPINFO_ID}
-        AND ( SELECT count ( 1 ) FROM BUS_HIDDENCHECK bh WHERE bh.HIDDEN_ID = h.HIDDEN_ID AND bh.USER_ID = #{USER_ID} )
-        > 0
-        WHERE
-        f.USER_ID = #{USER_ID}
-        GROUP BY
-        f.USER_ID
-        ORDER BY
-        h.CREATTIME DESC) count4,
-        (SELECT COUNT(DISTINCT he.HIDDENEXAMINE_ID) SPECIAL_COUNT
-        FROM SYS_USER f
-        LEFT JOIN bus_hidden h ON h.CONFIRM_USER = f.USER_ID
-        AND h.state = '7'
-        AND h.ISDELETE = '0'
-        AND h.CORPINFO_ID = #{CORPINFO_ID}
-        LEFT JOIN BUS_HIDDENEXAMINE he ON he.HIDDEN_ID = h.HIDDEN_ID
-        AND he.TYPE = '1'
-        WHERE f.USER_ID = #{USER_ID}
-        GROUP BY f.USER_ID
-        ORDER BY h.CREATTIME DESC) count5,
-        (SELECT COUNT(DISTINCT bi.INSPECTION_ID) as INSPECTION_COUNT
-        FROM sys_user f
-        LEFT JOIN bus_inspection_safetyenvironmental_inspector si ON si.INSPECTION_USER_ID = f.USER_ID
-        AND si.ISDELETE = '0' AND si.INSPECTION_USER_SIGN_TIME is null
-        LEFT JOIN bus_inspection_safetyenvironmental bi ON bi.INSPECTION_ID = si.INSPECTION_ID AND
-        (bi.INSPECTION_STATUS = '0' or bi.INSPECTION_STATUS = '1')
-        WHERE f.ISDELETE = '0'
-        AND f.USER_ID = #{USER_ID}
-        GROUP BY f.USER_ID) count6,
-        (SELECT COUNT(DISTINCT se.INSPECTION_ID) INSPECTIONED_COUNT
-        FROM sys_user f
-        LEFT JOIN bus_inspection_safetyenvironmental_inspector si ON si.INSPECTION_USER_ID = f.USER_ID
-        AND si.ISDELETE = '0'
-        LEFT JOIN BUS_INSPECTION_SAFETYENVIRONMENTAL se ON (se.INSPECTION_ID = si.INSPECTION_ID or
-        se.INSPECTED_DEPARTMENT_ID IN
-        (f.DEPARTMENT_ID)) AND
-        se.INSPECTION_STATUS = '2' AND
-        se.ISDELETE = '0' AND
-        se.CORPINFO_ID = #{CORPINFO_ID} AND
-        SE.INSPECTED_SITEUSER_ID = #{USER_ID}
-        WHERE f.ISDELETE = '0'
-        AND f.USER_ID = #{USER_ID}
-        GROUP BY f.USER_ID) count7,
-        (SELECT COUNT(DISTINCT bi.INSPECTION_ID) ASSIGN_COUNT,
-        COUNT(DISTINCT h.HIDDEN_ID) ASSIGN_HIDDEN_COUNT
-        FROM sys_user f
-        LEFT JOIN bus_inspection_safetyenvironmental bi ON (
-        bi.INSPECTION_ORIGINATOR_ID = f.USER_ID
-        OR
-        bi.INSPECTED_SITEUSER_ID = f.USER_ID
-        OR EXISTS (SELECT 1
-        FROM bus_inspection_safetyenvironmental_inspector sii
-        WHERE sii.INSPECTION_USER_ID = f.USER_ID
-        AND sii.INSPECTION_ID = bi.INSPECTION_ID)
-        )
-        AND bi.INSPECTION_STATUS = '3'
-        AND bi.ISDELETE = '0'
-        LEFT JOIN bus_hidden h ON h.FOREIGN_ID = bi.INSPECTION_ID AND h.STATE = '101' AND
-        (h.FINAL_CHECK IS NULL or h.FINAL_CHECK = '2')
-        WHERE f.ISDELETE = '0'
-        AND f.USER_ID = #{USER_ID}
-        GROUP BY f.USER_ID) count8,
-        (SELECT COUNT(DISTINCT bi.INSPECTION_ID) ACCEPT_COUNT,
-        COUNT(DISTINCT h.HIDDEN_ID) ACCEPT_HIDDEN_COUNT
-        FROM sys_user f
-        LEFT JOIN bus_inspection_safetyenvironmental bi ON (
-        bi.INSPECTION_ORIGINATOR_ID = f.USER_ID
-        OR
-        bi.INSPECTED_SITEUSER_ID = f.USER_ID
-        OR EXISTS (SELECT 1
-        FROM bus_inspection_safetyenvironmental_inspector sii
-        WHERE sii.INSPECTION_USER_ID = f.USER_ID
-        AND sii.INSPECTION_ID = bi.INSPECTION_ID)
-        )
-        AND bi.INSPECTION_STATUS = '6'
-        AND bi.ISDELETE = '0'
-        LEFT JOIN bus_hidden h
-        ON h.FOREIGN_ID = bi.INSPECTION_ID AND (h.STATE = '4' OR h.STATE = '8') AND
-        (h.FINAL_CHECK IS NULL or h.FINAL_CHECK = '2')
-        WHERE f.ISDELETE = '0'
-        AND f.USER_ID = #{USER_ID}
-        GROUP BY f.USER_ID) count9,
-        (SELECT IFNULL(COUNT(DISTINCT bf.FIRE_CHECK_ID), 0) FIRECHECK_COUNT
-        FROM sys_user f
-        LEFT JOIN bus_fire_checklist bf ON bf.DEPARTMENT_ID IN (f.DEPARTMENT_ID)
-        AND bf.ISDELETE = 0
-        AND bf.STATE = 0
-        AND bf.FIRE_CHECK_ID NOT IN (SELECT FIRE_CHECK_ID
-        FROM bus_fire_checklist
-        LEFT JOIN (SELECT GROUP_CONCAT(DISTINCT FIRE_CHECK_ID SEPARATOR ',' ) ids
-        FROM bus_fire_record
-        WHERE CREATOR = #{USER_ID}
-        AND PHONE_REPEAT = '0') bfr ON 1 = 1
-        WHERE FIND_IN_SET(FIRE_CHECK_ID, bfr.ids))
-        WHERE f.ISDELETE = '0'
-        AND f.USER_ID = #{USER_ID}
-        GROUP BY f.USER_ID) count10,
-        (SELECT ifnull(sum(cfsl.co), 0) AS PUNISH_COUNT
-        FROM `qa-cmt-regulatory`.BUS_OUTSOURCED f
-        LEFT JOIN (SELECT PUN.OUTSOURCED_ID,
-        COUNT(DISTINCT PUN.HIDDEN_ID) co
-        FROM (SELECT f.HIDDEN_ID,
-        ifnull(bo.OUTSOURCED_ID, boai.OUTSOURCED_ID) OUTSOURCED_ID
-        FROM `qa-cmt-prevention`.BUS_KEYPROJECT_HIDDEN f
-        LEFT JOIN `qa-cmt-prevention`.bus_keyprojectcheck keycheck
-        ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
-        LEFT JOIN `qa-cmt-regulatory`.BUS_OUTSOURCED bo
-        ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
-        LEFT JOIN `qa-cmt-regulatory`.BUS_OUTSOURCED boai
-        ON f.FOREIGN_ID = boai.OUTSOURCED_ID
-        WHERE f.ISDELETE = '0'
-        AND f.SOURCE IN ('4', '5', '1')
-        AND ifnull(bo.OUTSOURCED_ID, boai.OUTSOURCED_ID) IS NOT NULL
-        AND f.ISPUNISH IS NULL) PUN
-        GROUP BY PUN.OUTSOURCED_ID) cfsl ON cfsl.OUTSOURCED_ID = f.OUTSOURCED_ID
-        WHERE f.ISDELETE = '0'
-        AND f.PUNISH_THE_PERSON LIKE CONCAT(CONCAT('%', #{USER_ID}), '%')
-        AND f.STATE = '1') count11,
-        (SELECT COUNT(DISTINCT o.OUTSOURCED_ID) OUTSOURCED_COUNT
-        FROM SYS_USER f
-        LEFT JOIN `qa-cmt-regulatory`.bus_outsourced o ON o.CREATOR = f.USER_ID AND o.STATE = '-1'
-        WHERE f.ISDELETE = '0'
-        AND f.USER_ID = #{USER_ID}
-        GROUP BY f.USER_ID) count12,
-        (SELECT count(DISTINCT e.PROMISE_ID) PROMISE_SINGED
-        FROM sys_user f
-        LEFT JOIN bus_corppromise_people c ON c.USER_ID = f.USER_ID
-        AND c.ISSIGN = 0
-        AND c.ISPROMISE_PEOPLE = '0'
-        AND c.ISDELETE = '0'
-        LEFT JOIN bus_corppromise e
-        ON e.PROMISE_ID = c.PROMISE_ID AND (e.PROMISE_ID IS NULL OR e.STATE != '1')
-        WHERE f.USER_ID = #{USER_ID}
-        AND f.CORPINFO_ID = #{CORPINFO_ID}
-        GROUP BY f.USER_ID) count13,
-        (SELECT count(DISTINCT e.RESPONSIBILITY_ID) RESPONSOBILITY_SINGED
-        FROM sys_user f
-        LEFT JOIN bus_corpresponsibility_people c ON c.USER_ID = f.USER_ID
-        AND c.ISSIGN = 0
-        AND c.ISRESPONSIBILITY_PEOPLE = '0'
-        AND c.ISDELETE = '0'
-        LEFT JOIN bus_corpresponsibility e ON e.RESPONSIBILITY_ID = c.RESPONSIBILITY_ID
-        AND (e.RESPONSIBILITY_ID IS NULL OR e.STATE != '1')
-        WHERE f.USER_ID = #{USER_ID}
-        AND f.CORPINFO_ID = #{CORPINFO_ID}
-        GROUP BY f.USER_ID) count14,
-        (SELECT (
-        a.COUNTBACK + a.COUNTCONFIRM + a.COUNTGUARDIAN + a.COUNTAUDIT + a.COUNTAPPROVE +
-        a.COUNTACCEPT + a.COUNTANALYZE + a.COUNTCONFESS + a.COUNTACCEPTCONFESS
-        ) CONFINEDSPACE_COUNT,
-        (
-        b.COUNTBACK + b.COUNTCONSTRUCTION + b.COUNTPRODUCTION + b.COUNTSAFETY + b.COUNTLEADER +
-        b.COUNTACCEPT + b.COUNTGUARDIAN + b.COUNTCONFESS + b.COUNTACCEPTCONFESS
-        ) BLINDBOARD_COUNT,
-        (
-        c.COUNTBACK + c.COUNTCONSTRUCTION + c.COUNTPRODUCTION + c.COUNTSAFETY + c.COUNTLEADER +
-        c.COUNTACCEPT + c.COUNTGUARDIAN + c.COUNTCONFESS + c.COUNTACCEPTCONFESS
-        ) BREAKGROUND_COUNT,
-        (
-        d.COUNTBACK + d.COUNTCONSTRUCTION + d.COUNTLEADER + d.COUNTAUDIT + d.COUNTAPPROVE +
-        d.COUNTACCEPT + d.COUNTGUARDIAN + d.COUNTCONFESS + d.COUNTACCEPTCONFESS
-        ) HIGHWORK_COUNT,
-        (
-        e.COUNTBACK + e.COUNTLEADER + e.COUNTCONSTRUCTION + e.COUNTAUDIT + e.COUNTAPPROVE +
-        e.COUNTACCEPT + e.COUNTGUARDIAN + e.COUNTCONFESS + e.COUNTACCEPTCONFESS
-        ) HOSTING_COUNT,
-        (
-        f.COUNTBACK + f.COUNTCONFIRM + f.COUNTAUDIT + f.COUNTAPPROVE + f.COUNTACCEPT + f.COUNTANALYZE +
-        f.COUNTGUARDIAN + f.COUNTCONFESS + f.COUNTACCEPTCONFESS
-        ) ELECTRICITY_COUNT,
-        (
-        g.COUNTBACK + g.COUNTCONSTRUCTION + g.COUNTPRODUCTION + g.COUNTSAFETY + g.COUNTLEADER +
-        g.COUNTACCEPT + g.COUNTGUARDIAN + g.COUNTCONFESS + g.COUNTACCEPTCONFESS
-        ) CUTROAD_COUNT,
-        h.HOTWORK_COUNT HOTWORK_COUNT
-        FROM (SELECT COUNT(CASE
-        WHEN (f.APPLY_STATUS + 0)
-        <
-        1 AND f.CREATOR = #{USER_ID}
-        THEN f.CONFINEDSPACE_ID END) COUNTBACK,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '1' AND f.CONFIRM_USER_ID = #{USER_ID}
-        THEN f.CONFINEDSPACE_ID END) COUNTCONFIRM,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '5' AND f.GUARDIAN_USER_ID = #{USER_ID} AND
-        f.GUARDIAN_USER_SIGNER_TIME IS NULL
-        THEN f.CONFINEDSPACE_ID END) COUNTGUARDIAN,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '3' AND f.AUDIT_USER_ID = #{USER_ID}
-        THEN f.CONFINEDSPACE_ID END) COUNTAUDIT,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '4' AND f.APPROVE_USER_ID = #{USER_ID}
-        THEN f.CONFINEDSPACE_ID END) COUNTAPPROVE,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID}
-        THEN f.CONFINEDSPACE_ID END) COUNTACCEPT,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS
-        <
-        '6' AND f.APPLY_STATUS > 0 AND f.ANALYZE_USER_ID = #{USER_ID}
-        THEN f.CONFINEDSPACE_ID END) COUNTANALYZE,
-        COUNT(
-        CASE
+        SELECT
+            CAST(count1.CONFIRM_COUNT AS SIGNED) CONFIRM_COUNT,
+            CAST(count2.RECTIFICATION_COUNT AS SIGNED) RECTIFICATION_COUNT,
+            CAST(count3.DELAY_COUNT AS SIGNED) DELAY_COUNT,
+            CAST(count4.CHECK_COUNT AS SIGNED) CHECK_COUNT,
+            CAST(count5.SPECIAL_COUNT AS SIGNED) SPECIAL_COUNT,
+            CAST(count6.INSPECTION_COUNT AS SIGNED) INSPECTION_COUNT,
+            CAST(count7.INSPECTIONED_COUNT AS SIGNED) INSPECTIONED_COUNT,
+            CAST(count8.ASSIGN_COUNT AS SIGNED) ASSIGN_COUNT,
+            CAST(count8.ASSIGN_HIDDEN_COUNT AS SIGNED) ASSIGN_HIDDEN_COUNT,
+            CAST(count9.ACCEPT_COUNT AS SIGNED) ACCEPT_COUNT,
+            CAST(count9.ACCEPT_HIDDEN_COUNT AS SIGNED) ACCEPT_HIDDEN_COUNT,
+            CAST(count10.FIRECHECK_COUNT AS SIGNED) FIRECHECK_COUNT,
+            CAST(count11.PUNISH_COUNT AS SIGNED) PUNISH_COUNT,
+            CAST(count12.OUTSOURCED_COUNT AS SIGNED) OUTSOURCED_COUNT,
+            CAST(count13.PROMISE_SINGED AS SIGNED) PROMISE_SINGED,
+            CAST(count14.RESPONSOBILITY_SINGED AS SIGNED) RESPONSOBILITY_SINGED,
+            CAST(count15.CONFINEDSPACE_COUNT AS SIGNED) CONFINEDSPACE_COUNT,
+            CAST(count15.BLINDBOARD_COUNT AS SIGNED) BLINDBOARD_COUNT,
+            CAST(count15.BREAKGROUND_COUNT AS SIGNED) BREAKGROUND_COUNT,
+            CAST(count15.HIGHWORK_COUNT AS SIGNED) HIGHWORK_COUNT,
+            CAST(count15.HOSTING_COUNT AS SIGNED) HOSTING_COUNT,
+            CAST(count15.ELECTRICITY_COUNT AS SIGNED) ELECTRICITY_COUNT,
+            CAST(count15.CUTROAD_COUNT AS SIGNED) CUTROAD_COUNT,
+            CAST(count15.HOTWORK_COUNT AS SIGNED) HOTWORK_COUNT
+        FROM
+            (
+                SELECT
+                    COUNT( DISTINCT h.HIDDEN_ID ) CONFIRM_COUNT
+                FROM
+                    SYS_USER f
+                        LEFT JOIN bus_hidden h ON h.CONFIRM_USER = f.USER_ID
+                        AND h.STATE = '-2'
+                        AND h.ISDELETE = '0'
+                        AND h.CORPINFO_ID = #{CORPINFO_ID}
+                WHERE
+                    f.USER_ID = #{USER_ID}
+                GROUP BY
+                    f.USER_ID
+                ORDER BY
+                    h.CREATTIME DESC
+            ) count1,
+            (
+                SELECT
+                    COUNT( DISTINCT h.HIDDEN_ID ) RECTIFICATION_COUNT
+                FROM
+                    SYS_USER f
+                        LEFT JOIN bus_hidden h ON h.RECTIFICATIONOR = f.USER_ID
+                        AND h.STATE = '1'
+                        AND h.ISDELETE = '0'
+                        AND h.CORPINFO_ID = #{CORPINFO_ID}
+                WHERE
+                    f.USER_ID = #{USER_ID}
+                GROUP BY
+                    f.USER_ID
+                ORDER BY
+                    h.CREATTIME DESC
+            ) count2,
+            (
+                SELECT
+                    COUNT( DISTINCT he.HIDDENEXAMINE_ID ) DELAY_COUNT
+                FROM
+                    SYS_USER f
+                        LEFT JOIN bus_hidden h ON h.CONFIRM_USER = f.USER_ID
+                        AND h.state = '1'
+                        AND h.ISDELETE = '0'
+                        AND h.CORPINFO_ID = #{CORPINFO_ID}
+                        LEFT JOIN BUS_HIDDENEXAMINE he ON he.HIDDEN_ID = h.HIDDEN_ID
+                        AND he.TYPE = '2'
+                WHERE
+                    f.USER_ID = #{USER_ID}
+                GROUP BY
+                    f.USER_ID
+                ORDER BY
+                    h.CREATTIME DESC
+            ) count3,
+            (
+                SELECT
+                    IFNULL(COUNT(DISTINCT h.HIDDEN_ID),0) CHECK_COUNT
+                FROM
+                    SYS_USER f
+                        LEFT JOIN bus_hiddencheck hc ON hc.USER_ID = f.USER_ID
+                        LEFT JOIN bus_hidden h ON h.HIDDEN_ID = hc.HIDDEN_ID
+                        AND h.STATE = '2'
+                        AND h.ISDELETE = '0'
+                        AND h.STATE NOT IN ( '0', '7', '8', '100', '101', '102' )
+                        AND h.HIDDENLEVEL != 'hiddenLevel2002'
+			AND h.HIDDENLEVEL != 'hiddenLevel1001'
+			AND h.HIDDENLEVEL != 'jdyh001'
+			AND h.HIDDENLEVEL NOT IN ( 'hiddenLevel2002', 'hiddenLevel1001', 'jdyh001' )
+			AND h.CORPINFO_ID = #{CORPINFO_ID}
+                    AND ( SELECT count( 1 ) FROM BUS_HIDDENCHECK bh WHERE bh.HIDDEN_ID = h.HIDDEN_ID AND bh.USER_ID = #{USER_ID} ) > 0
+                WHERE
+                    f.USER_ID = #{USER_ID}
+                GROUP BY
+                    f.USER_ID
+                ORDER BY
+                    h.CREATTIME DESC
+            ) count4,
+            (
+                SELECT
+                    COUNT( DISTINCT he.HIDDENEXAMINE_ID ) SPECIAL_COUNT
+                FROM
+                    SYS_USER f
+                        LEFT JOIN bus_hidden h ON h.CONFIRM_USER = f.USER_ID
+                        AND h.state = '7'
+                        AND h.ISDELETE = '0'
+                        AND h.CORPINFO_ID = #{CORPINFO_ID}
+                        LEFT JOIN BUS_HIDDENEXAMINE he ON he.HIDDEN_ID = h.HIDDEN_ID
+                        AND he.TYPE = '1'
+                WHERE
+                    f.USER_ID = #{USER_ID}
+                GROUP BY
+                    f.USER_ID
+                ORDER BY
+                    h.CREATTIME DESC
+            ) count5,
+            (
+                SELECT
+                    COUNT(DISTINCT bi.INSPECTION_ID) as INSPECTION_COUNT
+                FROM
+                    sys_user f
+                        LEFT JOIN bus_inspection_safetyenvironmental_inspector si ON si.INSPECTION_USER_ID = f.USER_ID
+                        AND si.ISDELETE = '0' AND si.INSPECTION_USER_SIGN_TIME is null
+                        LEFT JOIN bus_inspection_safetyenvironmental bi ON bi.INSPECTION_ID = si.INSPECTION_ID AND (bi.INSPECTION_STATUS = '0' or bi.INSPECTION_STATUS = '1' )
+                WHERE
+                    f.ISDELETE = '0'
+                  AND f.USER_ID = #{USER_ID}
+                GROUP BY
+                    f.USER_ID
+            ) count6,
+            (
+                SELECT
+                    COUNT(DISTINCT se.INSPECTION_ID) INSPECTIONED_COUNT
+                FROM
+                    sys_user f
+                        LEFT JOIN bus_inspection_safetyenvironmental_inspector si ON si.INSPECTION_USER_ID = f.USER_ID
+                        AND si.ISDELETE = '0'
+                        LEFT JOIN BUS_INSPECTION_SAFETYENVIRONMENTAL se ON (se.INSPECTION_ID = si.INSPECTION_ID or se.INSPECTED_DEPARTMENT_ID IN ( f.DEPARTMENT_ID ) ) AND se.INSPECTION_STATUS = '2' AND se.ISDELETE = '0' 	AND se.CORPINFO_ID = #{CORPINFO_ID} AND
+                                                                           SE.INSPECTED_SITEUSER_ID = #{USER_ID}
+                WHERE
+                    f.ISDELETE = '0'
+                  AND
+                    f.USER_ID = #{USER_ID}
+                GROUP BY
+                    f.USER_ID
+            ) count7,
+            (
+                SELECT
+                    COUNT(DISTINCT bi.INSPECTION_ID) ASSIGN_COUNT, COUNT(DISTINCT h.HIDDEN_ID) ASSIGN_HIDDEN_COUNT
+                FROM
+                    sys_user f
+                        LEFT JOIN bus_inspection_safetyenvironmental bi ON (
+                                                                               bi.INSPECTION_ORIGINATOR_ID = f.USER_ID
+                                                                                   OR bi.INSPECTED_SITEUSER_ID = f.USER_ID
+                                                                                   OR EXISTS ( SELECT 1 FROM bus_inspection_safetyenvironmental_inspector sii WHERE sii.INSPECTION_USER_ID = f.USER_ID AND sii.INSPECTION_ID = bi.INSPECTION_ID )
+                                                                               )
+                        AND bi.INSPECTION_STATUS = '3'
+                        AND bi.ISDELETE = '0'
+                        LEFT JOIN bus_hidden h ON h.FOREIGN_ID = bi.INSPECTION_ID AND h.STATE = '101' AND (h.FINAL_CHECK IS NULL or h.FINAL_CHECK = '2')
+                WHERE
+                    f.ISDELETE = '0'
+                  AND
+                    f.USER_ID = #{USER_ID}
+                GROUP BY
+                    f.USER_ID
+            ) count8,
+            (
+                SELECT
+                    COUNT(DISTINCT bi.INSPECTION_ID) ACCEPT_COUNT, COUNT(DISTINCT h.HIDDEN_ID) ACCEPT_HIDDEN_COUNT
+                FROM
+                    sys_user f
+                        LEFT JOIN bus_inspection_safetyenvironmental bi ON (
+                                                                               bi.INSPECTION_ORIGINATOR_ID = f.USER_ID
+                                                                                   OR bi.INSPECTED_SITEUSER_ID = f.USER_ID
+                                                                                   OR EXISTS ( SELECT 1 FROM bus_inspection_safetyenvironmental_inspector sii WHERE sii.INSPECTION_USER_ID = f.USER_ID AND sii.INSPECTION_ID = bi.INSPECTION_ID )
+                                                                               )
+                        AND bi.INSPECTION_STATUS = '6'
+                        AND bi.ISDELETE = '0'
+                        LEFT JOIN bus_hidden h ON h.FOREIGN_ID = bi.INSPECTION_ID AND (h.STATE = '4' OR h.STATE = '8') AND (h.FINAL_CHECK IS NULL or h.FINAL_CHECK = '2')
+                WHERE
+                    f.ISDELETE = '0'
+                  AND
+                    f.USER_ID = #{USER_ID}
+                GROUP BY
+                    f.USER_ID
+            ) count9,
+            (
+                SELECT
+                    IFNULL( COUNT( DISTINCT bf.FIRE_CHECK_ID ), 0 ) FIRECHECK_COUNT
+                FROM
+                    sys_user f
+                        LEFT JOIN bus_fire_checklist bf ON bf.DEPARTMENT_ID IN ( f.DEPARTMENT_ID )
+                        AND bf.ISDELETE = 0
+                        AND bf.STATE = 0
+                        AND bf.FIRE_CHECK_ID NOT IN ( SELECT FIRE_CHECK_ID FROM bus_fire_checklist
+                                                                                    LEFT JOIN (SELECT GROUP_CONCAT( DISTINCT FIRE_CHECK_ID SEPARATOR ',' ) ids FROM bus_fire_record WHERE CREATOR = #{USER_ID} AND PHONE_REPEAT = '0') bfr ON 1= 1
+                                                      WHERE FIND_IN_SET( FIRE_CHECK_ID, bfr.ids ))
+                WHERE
+                    f.ISDELETE = '0'
+                  AND
+                    f.USER_ID = #{USER_ID}
+                GROUP BY
+                    f.USER_ID
+            ) count10,
+            (
+                SELECT
+                    ifnull( sum(cfsl.co), 0 ) AS PUNISH_COUNT
+                FROM
+                    `qa-cmt-regulatory`.BUS_OUTSOURCED f
+                        LEFT JOIN (
+                        SELECT
+                            PUN.OUTSOURCED_ID,
+                            COUNT( DISTINCT PUN.HIDDEN_ID ) co
+                        FROM
+                            (
+                                SELECT
+                                    f.HIDDEN_ID,
+                                    ifnull( bo.OUTSOURCED_ID, boai.OUTSOURCED_ID ) OUTSOURCED_ID
+                                FROM
+                                    `qa-cmt-prevention`.BUS_KEYPROJECT_HIDDEN f
+                                        LEFT JOIN `qa-cmt-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID
+                                        LEFT JOIN `qa-cmt-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
+                                        LEFT JOIN `qa-cmt-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID
+                                WHERE
+                                    f.ISDELETE = '0'
+                                  AND f.SOURCE IN ( '4', '5', '1' )
+                                  AND ifnull( bo.OUTSOURCED_ID, boai.OUTSOURCED_ID ) IS NOT NULL
+                                  AND f.ISPUNISH IS NULL
+                            ) PUN
+                        GROUP BY
+                            PUN.OUTSOURCED_ID
+                    ) cfsl ON cfsl.OUTSOURCED_ID = f.OUTSOURCED_ID
+                WHERE
+                    f.ISDELETE = '0'
+                  AND f.PUNISH_THE_PERSON LIKE CONCAT( CONCAT( '%', #{USER_ID} ), '%' )
+                  AND f.STATE = '1'
+            ) count11,
+            (
+                SELECT
+                    COUNT(DISTINCT o.OUTSOURCED_ID) OUTSOURCED_COUNT
+                FROM
+                    SYS_USER f
+                        LEFT JOIN `qa-cmt-regulatory`.bus_outsourced o ON o.CREATOR = f.USER_ID AND o.STATE = '-1'
+                WHERE
+                    f.ISDELETE = '0'
+                  AND
+                    f.USER_ID = #{USER_ID}
+                GROUP BY
+                    f.USER_ID
+            ) count12,
+            (
+                SELECT
+                    count( DISTINCT e.PROMISE_ID ) PROMISE_SINGED
+                FROM
+                    sys_user f
+                        LEFT JOIN bus_corppromise_people c ON c.USER_ID = f.USER_ID
+                        AND c.ISSIGN = 0
+                        AND c.ISPROMISE_PEOPLE = '0'
+                        AND c.ISDELETE = '0'
+                        LEFT JOIN bus_corppromise e ON e.PROMISE_ID = c.PROMISE_ID AND ( e.PROMISE_ID IS NULL OR e.STATE != '1' )
+                WHERE
+                    f.USER_ID = #{USER_ID}
+                  AND f.CORPINFO_ID = #{CORPINFO_ID}
+                GROUP BY
+                    f.USER_ID
+            ) count13,
+            (
+                SELECT
+                    count( DISTINCT e.RESPONSIBILITY_ID ) RESPONSOBILITY_SINGED
+                FROM
+                    sys_user f
+                        LEFT JOIN bus_corpresponsibility_people c ON c.USER_ID = f.USER_ID
+                        AND c.ISSIGN = 0
+                        AND c.ISRESPONSIBILITY_PEOPLE = '0'
+                        AND c.ISDELETE = '0'
+                        LEFT JOIN bus_corpresponsibility e ON e.RESPONSIBILITY_ID = c.RESPONSIBILITY_ID
+                        AND ( e.RESPONSIBILITY_ID IS NULL OR e.STATE != '1' )
+                WHERE
+                    f.USER_ID = #{USER_ID}
+                  AND f.CORPINFO_ID = #{CORPINFO_ID}
+                GROUP BY
+                    f.USER_ID
+            ) count14,
+            (
+                SELECT
+                    (
+                        a.COUNTBACK + a.COUNTCONFIRM + a.COUNTGUARDIAN + a.COUNTAUDIT + a.COUNTAPPROVE + a.COUNTACCEPT + a.COUNTANALYZE + a.COUNTCONFESS + a.COUNTACCEPTCONFESS
+                        ) CONFINEDSPACE_COUNT,
+                    (
+                        b.COUNTBACK + b.COUNTCONSTRUCTION + b.COUNTPRODUCTION + b.COUNTSAFETY + b.COUNTLEADER + b.COUNTACCEPT + b.COUNTGUARDIAN + b.COUNTCONFESS + b.COUNTACCEPTCONFESS
+                        ) BLINDBOARD_COUNT,
+                    (
+                        c.COUNTBACK + c.COUNTCONSTRUCTION + c.COUNTPRODUCTION + c.COUNTSAFETY + c.COUNTLEADER + c.COUNTACCEPT + c.COUNTGUARDIAN + c.COUNTCONFESS + c.COUNTACCEPTCONFESS
+                        ) BREAKGROUND_COUNT,
+                    (
+                        d.COUNTBACK + d.COUNTCONSTRUCTION + d.COUNTLEADER + d.COUNTAUDIT + d.COUNTAPPROVE + d.COUNTACCEPT + d.COUNTGUARDIAN + d.COUNTCONFESS + d.COUNTACCEPTCONFESS
+                        ) HIGHWORK_COUNT,
+                    (
+                        e.COUNTBACK + e.COUNTLEADER + e.COUNTCONSTRUCTION + e.COUNTAUDIT + e.COUNTAPPROVE + e.COUNTACCEPT + e.COUNTGUARDIAN + e.COUNTCONFESS + e.COUNTACCEPTCONFESS
+                        ) HOSTING_COUNT,
+                    (
+                        f.COUNTBACK + f.COUNTCONFIRM + f.COUNTAUDIT + f.COUNTAPPROVE + f.COUNTACCEPT + f.COUNTANALYZE + f.COUNTGUARDIAN + f.COUNTCONFESS + f.COUNTACCEPTCONFESS
+                        ) ELECTRICITY_COUNT,
+                    (
+                        g.COUNTBACK + g.COUNTCONSTRUCTION + g.COUNTPRODUCTION + g.COUNTSAFETY + g.COUNTLEADER + g.COUNTACCEPT + g.COUNTGUARDIAN + g.COUNTCONFESS + g.COUNTACCEPTCONFESS
+                        ) CUTROAD_COUNT,
+                    h.HOTWORK_COUNT HOTWORK_COUNT
+                FROM
+                    (
+                        SELECT
+                            COUNT( CASE WHEN ( f.APPLY_STATUS + 0 ) <![CDATA[ < ]]> 1 AND f.CREATOR = #{USER_ID} THEN f.CONFINEDSPACE_ID END ) COUNTBACK,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '1' AND f.CONFIRM_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END ) COUNTCONFIRM,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '5' AND f.GUARDIAN_USER_ID = #{USER_ID} AND f.GUARDIAN_USER_SIGNER_TIME IS NULL THEN f.CONFINEDSPACE_ID END ) COUNTGUARDIAN,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '3' AND f.AUDIT_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END ) COUNTAUDIT,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '4' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END ) COUNTAPPROVE,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END ) COUNTACCEPT,
+                            COUNT( CASE WHEN f.APPLY_STATUS <![CDATA[ < ]]> '6' AND f.APPLY_STATUS > 0 AND f.ANALYZE_USER_ID = #{USER_ID} THEN f.CONFINEDSPACE_ID END ) COUNTANALYZE,
+                            COUNT(
+                                    CASE
 
-        WHEN f.APPLY_STATUS
-        <
-        '6' AND f.APPLY_STATUS > 0
-        AND f.CONFESS_USER_ID = #{USER_ID}
-        AND f.CONFESS_USER_SIGNER_TIME IS NULL THEN
-        f.CONFINEDSPACE_ID
-        END
-        ) COUNTCONFESS,
-        COUNT(
-        CASE
+                                        WHEN f.APPLY_STATUS <![CDATA[ < ]]> '6' AND f.APPLY_STATUS > 0
+                                            AND f.CONFESS_USER_ID = #{USER_ID}
+                                            AND f.CONFESS_USER_SIGNER_TIME IS NULL THEN
+                                            f.CONFINEDSPACE_ID
+                                        END
+                            ) COUNTCONFESS,
+                            COUNT(
+                                    CASE
 
-        WHEN f.APPLY_STATUS
-        <
-        '6' AND f.APPLY_STATUS > 0
-        AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID}
-        AND NOT EXISTS (SELECT 1
-        FROM GF_CONFINEDSPACE_ACCEPTUSER m
-        WHERE m.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID
-        AND m.CORPINFO_ID = f.CORPINFO_ID
-        AND f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID)
-        THEN
-        f.CONFINEDSPACE_ID
-        END
-        ) COUNTACCEPTCONFESS
-        FROM GF_CONFINEDSPACE f
-        WHERE f.ISDELETE = '0'
-        AND f.CORPINFO_ID = #{CORPINFO_ID}) a,
-        (SELECT COUNT(CASE
-        WHEN (f.APPLY_STATUS + 0)
-        <
-        1 AND f.CREATOR = #{USER_ID}
-        THEN f.BLINDBOARD_ID END) COUNTBACK,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '1' AND f.CONSTRUCTION_USER_ID = #{USER_ID}
-        THEN f.BLINDBOARD_ID END) COUNTCONSTRUCTION,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '2' AND f.PRODUCTION_USER_ID = #{USER_ID}
-        THEN f.BLINDBOARD_ID END) COUNTPRODUCTION,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '3' AND f.SAFETY_USER_ID = #{USER_ID}
-        THEN f.BLINDBOARD_ID END) COUNTSAFETY,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '4' AND f.LEADER_USER_ID = #{USER_ID}
-        THEN f.BLINDBOARD_ID END) COUNTLEADER,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID}
-        THEN f.BLINDBOARD_ID END) COUNTACCEPT,
-        COUNT(
-        CASE
+                                        WHEN f.APPLY_STATUS <![CDATA[ < ]]> '6' AND f.APPLY_STATUS > 0
+                                            AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID}
+                                            AND NOT EXISTS (
+                                                SELECT
+                                                    1
+                                                FROM
+                                                    GF_CONFINEDSPACE_ACCEPTUSER m
+                                                WHERE
+                                                    m.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID
+                                                  AND m.CORPINFO_ID = f.CORPINFO_ID
+                                                  AND f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID
+                                            ) THEN
+                                            f.CONFINEDSPACE_ID
+                                        END
+                            ) COUNTACCEPTCONFESS
+                        FROM
+                            GF_CONFINEDSPACE f
+                        WHERE
+                            f.ISDELETE = '0'
+                          AND f.CORPINFO_ID = #{CORPINFO_ID}
+                    ) a,
+                    (
+                        SELECT
+                            COUNT( CASE WHEN ( f.APPLY_STATUS + 0 ) <![CDATA[ < ]]> 1 AND f.CREATOR = #{USER_ID} THEN f.BLINDBOARD_ID END ) COUNTBACK,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '1' AND f.CONSTRUCTION_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END ) COUNTCONSTRUCTION,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '2' AND f.PRODUCTION_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END ) COUNTPRODUCTION,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '3' AND f.SAFETY_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END ) COUNTSAFETY,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '4' AND f.LEADER_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END ) COUNTLEADER,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.BLINDBOARD_ID END ) COUNTACCEPT,
+                            COUNT(
+                                    CASE
 
-        WHEN f.APPLY_STATUS
-        <
-        '6' AND f.APPLY_STATUS > 0
-        AND f.GUARDIAN_USER_ID = #{USER_ID}
-        AND f.GUARDIAN_USER_SIGNER_TIME IS NULL THEN
-        f.BLINDBOARD_ID
-        END
-        ) COUNTGUARDIAN,
-        COUNT(
-        CASE
+                                        WHEN f.APPLY_STATUS <![CDATA[ < ]]> '6' AND f.APPLY_STATUS > 0
+                                            AND f.GUARDIAN_USER_ID = #{USER_ID}
+                                            AND f.GUARDIAN_USER_SIGNER_TIME IS NULL THEN
+                                            f.BLINDBOARD_ID
+                                        END
+                            ) COUNTGUARDIAN,
+                            COUNT(
+                                    CASE
 
-        WHEN f.APPLY_STATUS
-        <
-        '6' AND f.APPLY_STATUS > 0
-        AND f.CONFESS_USER_ID = #{USER_ID}
-        AND f.CONFESS_USER_SIGNER_TIME IS NULL THEN
-        f.BLINDBOARD_ID
-        END
-        ) COUNTCONFESS,
-        COUNT(
-        CASE
+                                        WHEN f.APPLY_STATUS <![CDATA[ < ]]> '6' AND f.APPLY_STATUS > 0
+                                            AND f.CONFESS_USER_ID = #{USER_ID}
+                                            AND f.CONFESS_USER_SIGNER_TIME IS NULL THEN
+                                            f.BLINDBOARD_ID
+                                        END
+                            ) COUNTCONFESS,
+                            COUNT(
+                                    CASE
 
-        WHEN f.APPLY_STATUS
-        <
-        '6' AND f.APPLY_STATUS > 0
-        AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID}
-        AND NOT EXISTS (SELECT 1
-        FROM GF_BLINDBOARD_ACCEPTUSER m
-        WHERE m.BLINDBOARD_ID = f.BLINDBOARD_ID
-        AND m.CORPINFO_ID = f.CORPINFO_ID
-        AND f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID)
-        THEN
-        f.BLINDBOARD_ID
-        END
-        ) COUNTACCEPTCONFESS
-        FROM GF_BLINDBOARD f
-        WHERE f.ISDELETE = '0'
-        AND f.CORPINFO_ID = #{CORPINFO_ID}) b,
-        (SELECT COUNT(CASE
-        WHEN (f.APPLY_STATUS + 0)
-        <
-        1 AND f.CREATOR = #{USER_ID}
-        THEN f.BREAKGROUND_ID END) COUNTBACK,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '1' AND f.CONSTRUCTION_USER_ID = #{USER_ID}
-        THEN f.BREAKGROUND_ID END) COUNTCONSTRUCTION,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '2' AND f.PRODUCTION_USER_ID = #{USER_ID}
-        THEN f.BREAKGROUND_ID END) COUNTPRODUCTION,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '3' AND f.SAFETY_USER_ID = #{USER_ID}
-        THEN f.BREAKGROUND_ID END) COUNTSAFETY,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '4' AND f.LEADER_USER_ID = #{USER_ID}
-        THEN f.BREAKGROUND_ID END) COUNTLEADER,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID}
-        THEN f.BREAKGROUND_ID END) COUNTACCEPT,
-        COUNT(
-        CASE
+                                        WHEN f.APPLY_STATUS <![CDATA[ < ]]> '6' AND f.APPLY_STATUS > 0
+                                            AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID}
+                                            AND NOT EXISTS (
+                                                SELECT
+                                                    1
+                                                FROM
+                                                    GF_BLINDBOARD_ACCEPTUSER m
+                                                WHERE
+                                                    m.BLINDBOARD_ID = f.BLINDBOARD_ID
+                                                  AND m.CORPINFO_ID = f.CORPINFO_ID
+                                                  AND f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID
+                                            ) THEN
+                                            f.BLINDBOARD_ID
+                                        END
+                            ) COUNTACCEPTCONFESS
+                        FROM
+                            GF_BLINDBOARD f
+                        WHERE
+                            f.ISDELETE = '0'
+                          AND f.CORPINFO_ID = #{CORPINFO_ID}
+                    ) b,
+                    (
+                        SELECT
+                            COUNT( CASE WHEN ( f.APPLY_STATUS + 0 ) <![CDATA[ < ]]> 1 AND f.CREATOR = #{USER_ID} THEN f.BREAKGROUND_ID END ) COUNTBACK,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '1' AND f.CONSTRUCTION_USER_ID = #{USER_ID} THEN f.BREAKGROUND_ID END ) COUNTCONSTRUCTION,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '2' AND f.PRODUCTION_USER_ID = #{USER_ID} THEN f.BREAKGROUND_ID END ) COUNTPRODUCTION,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '3' AND f.SAFETY_USER_ID = #{USER_ID} THEN f.BREAKGROUND_ID END ) COUNTSAFETY,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '4' AND f.LEADER_USER_ID = #{USER_ID} THEN f.BREAKGROUND_ID END ) COUNTLEADER,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.BREAKGROUND_ID END ) COUNTACCEPT,
+                            COUNT(
+                                    CASE
 
-        WHEN f.APPLY_STATUS
-        <
-        '6' AND f.APPLY_STATUS > 0
-        AND f.GUARDIAN_USER_ID = #{USER_ID}
-        AND f.GUARDIAN_USER_SIGNER_TIME IS NULL THEN
-        f.BREAKGROUND_ID
-        END
-        ) COUNTGUARDIAN,
-        COUNT(
-        CASE
+                                        WHEN f.APPLY_STATUS <![CDATA[ < ]]> '6' AND f.APPLY_STATUS > 0
+                                            AND f.GUARDIAN_USER_ID = #{USER_ID}
+                                            AND f.GUARDIAN_USER_SIGNER_TIME IS NULL THEN
+                                            f.BREAKGROUND_ID
+                                        END
+                            ) COUNTGUARDIAN,
+                            COUNT(
+                                    CASE
 
-        WHEN f.APPLY_STATUS
-        <
-        '6' AND f.APPLY_STATUS > 0
-        AND f.CONFESS_USER_ID = #{USER_ID}
-        AND f.CONFESS_USER_SIGNER_TIME IS NULL THEN
-        f.BREAKGROUND_ID
-        END
-        ) COUNTCONFESS,
-        COUNT(
-        CASE
+                                        WHEN f.APPLY_STATUS <![CDATA[ < ]]> '6' AND f.APPLY_STATUS > 0
+                                            AND f.CONFESS_USER_ID = #{USER_ID}
+                                            AND f.CONFESS_USER_SIGNER_TIME IS NULL THEN
+                                            f.BREAKGROUND_ID
+                                        END
+                            ) COUNTCONFESS,
+                            COUNT(
+                                    CASE
 
-        WHEN f.APPLY_STATUS
-        <
-        '6' AND f.APPLY_STATUS > 0
-        AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID}
-        AND NOT EXISTS (SELECT 1
-        FROM GF_BREAKGROUND_ACCEPTUSER m
-        WHERE m.BREAKGROUND_ID = f.BREAKGROUND_ID
-        AND m.CORPINFO_ID = f.CORPINFO_ID
-        AND f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID)
-        THEN
-        f.BREAKGROUND_ID
-        END
-        ) COUNTACCEPTCONFESS
-        FROM GF_BREAKGROUND f
-        WHERE f.ISDELETE = '0'
-        AND f.CORPINFO_ID = #{CORPINFO_ID}) c,
-        (SELECT COUNT(CASE
-        WHEN (f.APPLY_STATUS + 0)
-        <
-        1 AND f.CREATOR = #{USER_ID}
-        THEN f.HIGHWORK_ID END) COUNTBACK,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '1' AND f.CONSTRUCTION_USER_ID = #{USER_ID}
-        THEN f.HIGHWORK_ID END) COUNTCONSTRUCTION,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '2' AND f.LEADER_USER_ID = #{USER_ID}
-        THEN f.HIGHWORK_ID END) COUNTLEADER,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '3' AND f.AUDIT_USER_ID = #{USER_ID}
-        THEN f.HIGHWORK_ID END) COUNTAUDIT,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '4' AND f.APPROVE_USER_ID = #{USER_ID}
-        THEN f.HIGHWORK_ID END) COUNTAPPROVE,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID}
-        THEN f.HIGHWORK_ID END) COUNTACCEPT,
-        COUNT(
-        CASE
+                                        WHEN f.APPLY_STATUS <![CDATA[ < ]]> '6' AND f.APPLY_STATUS > 0
+                                            AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID}
+                                            AND NOT EXISTS (
+                                                SELECT
+                                                    1
+                                                FROM
+                                                    GF_BREAKGROUND_ACCEPTUSER m
+                                                WHERE
+                                                    m.BREAKGROUND_ID = f.BREAKGROUND_ID
+                                                  AND m.CORPINFO_ID = f.CORPINFO_ID
+                                                  AND f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID
+                                            ) THEN
+                                            f.BREAKGROUND_ID
+                                        END
+                            ) COUNTACCEPTCONFESS
+                        FROM
+                            GF_BREAKGROUND f
+                        WHERE
+                            f.ISDELETE = '0'
+                          AND f.CORPINFO_ID = #{CORPINFO_ID}
+                    ) c,
+                    (
+                        SELECT
+                            COUNT( CASE WHEN ( f.APPLY_STATUS + 0 ) <![CDATA[ < ]]> 1 AND f.CREATOR = #{USER_ID} THEN f.HIGHWORK_ID END ) COUNTBACK,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '1' AND f.CONSTRUCTION_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END ) COUNTCONSTRUCTION,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '2' AND f.LEADER_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END ) COUNTLEADER,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '3' AND f.AUDIT_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END ) COUNTAUDIT,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '4' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END ) COUNTAPPROVE,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END ) COUNTACCEPT,
+                            COUNT(
+                                    CASE
 
-        WHEN f.APPLY_STATUS
-        <
-        '6' AND f.APPLY_STATUS > 0
-        AND f.GUARDIAN_USER_ID = #{USER_ID}
-        AND f.GUARDIAN_USER_SIGNER_TIME IS NULL THEN
-        f.HIGHWORK_ID
-        END
-        ) COUNTGUARDIAN,
-        COUNT(
-        CASE
+                                        WHEN f.APPLY_STATUS <![CDATA[ < ]]> '6' AND f.APPLY_STATUS > 0
+                                            AND f.GUARDIAN_USER_ID = #{USER_ID}
+                                            AND f.GUARDIAN_USER_SIGNER_TIME IS NULL THEN
+                                            f.HIGHWORK_ID
+                                        END
+                            ) COUNTGUARDIAN,
+                            COUNT(
+                                    CASE
 
-        WHEN f.APPLY_STATUS
-        <
-        '6' AND f.APPLY_STATUS > 0
-        AND f.CONFESS_USER_ID = #{USER_ID}
-        AND f.CONFESS_USER_SIGNER_TIME IS NULL THEN
-        f.HIGHWORK_ID
-        END
-        ) COUNTCONFESS,
-        COUNT(
-        CASE
+                                        WHEN f.APPLY_STATUS <![CDATA[ < ]]> '6' AND f.APPLY_STATUS > 0
+                                            AND f.CONFESS_USER_ID = #{USER_ID}
+                                            AND f.CONFESS_USER_SIGNER_TIME IS NULL THEN
+                                            f.HIGHWORK_ID
+                                        END
+                            ) COUNTCONFESS,
+                            COUNT(
+                                    CASE
 
-        WHEN f.APPLY_STATUS
-        <
-        '6' AND f.APPLY_STATUS > 0
-        AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID}
-        AND NOT EXISTS (SELECT 1
-        FROM GF_HIGHWORK_ACCEPTUSER m
-        WHERE m.HIGHWORK_ID = f.HIGHWORK_ID
-        AND m.CORPINFO_ID = f.CORPINFO_ID
-        AND f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID)
-        THEN
-        f.HIGHWORK_ID
-        END
-        ) COUNTACCEPTCONFESS
-        FROM GF_HIGHWORK f
-        WHERE f.ISDELETE = '0'
-        AND f.CORPINFO_ID = #{CORPINFO_ID}) d,
-        (SELECT COUNT(CASE
-        WHEN (f.APPLY_STATUS + 0)
-        <
-        1 AND f.CREATOR = #{USER_ID}
-        THEN f.HOISTING_ID END) COUNTBACK,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '1' AND f.LEADER_USER_ID = #{USER_ID}
-        THEN f.HOISTING_ID END) COUNTLEADER,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '2' AND f.CONSTRUCTION_USER_ID = #{USER_ID}
-        THEN f.HOISTING_ID END) COUNTCONSTRUCTION,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '3' AND f.AUDIT_USER_ID = #{USER_ID}
-        THEN f.HOISTING_ID END) COUNTAUDIT,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '4' AND f.APPROVE_USER_ID = #{USER_ID}
-        THEN f.HOISTING_ID END) COUNTAPPROVE,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID}
-        THEN f.HOISTING_ID END) COUNTACCEPT,
-        COUNT(
-        CASE
+                                        WHEN f.APPLY_STATUS <![CDATA[ < ]]> '6' AND f.APPLY_STATUS > 0
+                                            AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID}
+                                            AND NOT EXISTS (
+                                                SELECT
+                                                    1
+                                                FROM
+                                                    GF_HIGHWORK_ACCEPTUSER m
+                                                WHERE
+                                                    m.HIGHWORK_ID = f.HIGHWORK_ID
+                                                  AND m.CORPINFO_ID = f.CORPINFO_ID
+                                                  AND f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID
+                                            ) THEN
+                                            f.HIGHWORK_ID
+                                        END
+                            ) COUNTACCEPTCONFESS
+                        FROM
+                            GF_HIGHWORK f
+                        WHERE
+                            f.ISDELETE = '0'
+                          AND f.CORPINFO_ID = #{CORPINFO_ID}
+                    ) d,
+                    (
+                        SELECT
+                            COUNT( CASE WHEN ( f.APPLY_STATUS + 0 ) <![CDATA[ < ]]> 1 AND f.CREATOR = #{USER_ID} THEN f.HOISTING_ID END ) COUNTBACK,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '1' AND f.LEADER_USER_ID = #{USER_ID} THEN f.HOISTING_ID END ) COUNTLEADER,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '2' AND f.CONSTRUCTION_USER_ID = #{USER_ID} THEN f.HOISTING_ID END ) COUNTCONSTRUCTION,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '3' AND f.AUDIT_USER_ID = #{USER_ID} THEN f.HOISTING_ID END ) COUNTAUDIT,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '4' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.HOISTING_ID END ) COUNTAPPROVE,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.HOISTING_ID END ) COUNTACCEPT,
+                            COUNT(
+                                    CASE
 
-        WHEN f.APPLY_STATUS
-        <
-        '6' AND f.APPLY_STATUS > 0
-        AND f.GUARDIAN_USER_ID = #{USER_ID}
-        AND f.GUARDIAN_USER_SIGNER_TIME IS NULL THEN
-        f.HOISTING_ID
-        END
-        ) COUNTGUARDIAN,
-        COUNT(
-        CASE
+                                        WHEN f.APPLY_STATUS <![CDATA[ < ]]> '6' AND f.APPLY_STATUS > 0
+                                            AND f.GUARDIAN_USER_ID = #{USER_ID}
+                                            AND f.GUARDIAN_USER_SIGNER_TIME IS NULL THEN
+                                            f.HOISTING_ID
+                                        END
+                            ) COUNTGUARDIAN,
+                            COUNT(
+                                    CASE
 
-        WHEN f.APPLY_STATUS
-        <
-        '6' AND f.APPLY_STATUS > 0
-        AND f.CONFESS_USER_ID = #{USER_ID}
-        AND f.CONFESS_USER_SIGNER_TIME IS NULL THEN
-        f.HOISTING_ID
-        END
-        ) COUNTCONFESS,
-        COUNT(
-        CASE
+                                        WHEN f.APPLY_STATUS <![CDATA[ < ]]> '6' AND f.APPLY_STATUS > 0
+                                            AND f.CONFESS_USER_ID = #{USER_ID}
+                                            AND f.CONFESS_USER_SIGNER_TIME IS NULL THEN
+                                            f.HOISTING_ID
+                                        END
+                            ) COUNTCONFESS,
+                            COUNT(
+                                    CASE
 
-        WHEN f.APPLY_STATUS
-        <
-        '6' AND f.APPLY_STATUS > 0
-        AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID}
-        AND NOT EXISTS (SELECT 1
-        FROM GF_HOISTING_ACCEPTUSER m
-        WHERE m.HOISTING_ID = f.HOISTING_ID
-        AND m.CORPINFO_ID = f.CORPINFO_ID
-        AND f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID)
-        THEN
-        f.HOISTING_ID
-        END
-        ) COUNTACCEPTCONFESS
-        FROM GF_HOISTING f
-        WHERE f.ISDELETE = '0'
-        AND f.CORPINFO_ID = #{CORPINFO_ID}) e,
-        (SELECT COUNT(CASE
-        WHEN (f.APPLY_STATUS + 0)
-        <
-        1 AND f.CREATOR = #{USER_ID}
-        THEN f.ELECTRICITY_ID END) COUNTBACK,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '1' AND f.CONFIRM_USER_ID = #{USER_ID}
-        THEN f.ELECTRICITY_ID END) COUNTCONFIRM,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '2' AND f.AUDIT_USER_ID = #{USER_ID}
-        THEN f.ELECTRICITY_ID END) COUNTAUDIT,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '3' AND f.APPROVE_USER_ID = #{USER_ID}
-        THEN f.ELECTRICITY_ID END) COUNTAPPROVE,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '4' AND f.ACCEPT_USER_ID = #{USER_ID}
-        THEN f.ELECTRICITY_ID END) COUNTACCEPT,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '1' AND f.ANALYZE_USER_ID = #{USER_ID}
-        THEN f.ELECTRICITY_ID END) COUNTANALYZE,
-        COUNT(
-        CASE
+                                        WHEN f.APPLY_STATUS <![CDATA[ < ]]> '6' AND f.APPLY_STATUS > 0
+                                            AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID}
+                                            AND NOT EXISTS (
+                                                SELECT
+                                                    1
+                                                FROM
+                                                    GF_HOISTING_ACCEPTUSER m
+                                                WHERE
+                                                    m.HOISTING_ID = f.HOISTING_ID
+                                                  AND m.CORPINFO_ID = f.CORPINFO_ID
+                                                  AND f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID
+                                            ) THEN
+                                            f.HOISTING_ID
+                                        END
+                            ) COUNTACCEPTCONFESS
+                        FROM
+                            GF_HOISTING f
+                        WHERE
+                            f.ISDELETE = '0'
+                          AND f.CORPINFO_ID = #{CORPINFO_ID}
+                    ) e,
+                    (
+                        SELECT
+                            COUNT( CASE WHEN ( f.APPLY_STATUS + 0 ) <![CDATA[ < ]]> 1 AND f.CREATOR = #{USER_ID} THEN f.ELECTRICITY_ID END ) COUNTBACK,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '1' AND f.CONFIRM_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END ) COUNTCONFIRM,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '2' AND f.AUDIT_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END ) COUNTAUDIT,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '3' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END ) COUNTAPPROVE,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '4' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END ) COUNTACCEPT,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '1' AND f.ANALYZE_USER_ID = #{USER_ID} THEN f.ELECTRICITY_ID END ) COUNTANALYZE,
+                            COUNT(
+                                    CASE
 
-        WHEN f.APPLY_STATUS
-        <
-        '5' AND f.APPLY_STATUS > 0
-        AND f.GUARDIAN_USER_ID = #{USER_ID}
-        AND f.GUARDIAN_USER_SIGNER_TIME IS NULL THEN
-        f.ELECTRICITY_ID
-        END
-        ) COUNTGUARDIAN,
-        COUNT(
-        CASE
+                                        WHEN f.APPLY_STATUS <![CDATA[ < ]]> '5' AND f.APPLY_STATUS > 0
+                                            AND f.GUARDIAN_USER_ID = #{USER_ID}
+                                            AND f.GUARDIAN_USER_SIGNER_TIME IS NULL THEN
+                                            f.ELECTRICITY_ID
+                                        END
+                            ) COUNTGUARDIAN,
+                            COUNT(
+                                    CASE
 
-        WHEN f.APPLY_STATUS
-        <
-        '5' AND f.APPLY_STATUS > 0
-        AND f.CONFESS_USER_ID = #{USER_ID}
-        AND f.CONFESS_USER_SIGNER_TIME IS NULL THEN
-        f.ELECTRICITY_ID
-        END
-        ) COUNTCONFESS,
-        COUNT(
-        CASE
+                                        WHEN f.APPLY_STATUS <![CDATA[ < ]]> '5' AND f.APPLY_STATUS > 0
+                                            AND f.CONFESS_USER_ID = #{USER_ID}
+                                            AND f.CONFESS_USER_SIGNER_TIME IS NULL THEN
+                                            f.ELECTRICITY_ID
+                                        END
+                            ) COUNTCONFESS,
+                            COUNT(
+                                    CASE
 
-        WHEN f.APPLY_STATUS
-        <
-        '5' AND f.APPLY_STATUS > 0
-        AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID}
-        AND NOT EXISTS (SELECT 1
-        FROM GF_ELECTRICITY_ACCEPTUSER m
-        WHERE m.ELECTRICITY_ID = f.ELECTRICITY_ID
-        AND m.CORPINFO_ID = f.CORPINFO_ID
-        AND f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID)
-        THEN
-        f.ELECTRICITY_ID
-        END
-        ) COUNTACCEPTCONFESS
-        FROM GF_ELECTRICITY f
-        WHERE f.ISDELETE = '0'
-        AND f.CORPINFO_ID = #{CORPINFO_ID}) f,
-        (SELECT COUNT(CASE
-        WHEN (f.APPLY_STATUS + 0)
-        <
-        1 AND f.CREATOR = #{USER_ID}
-        THEN f.CUTROAD_ID END) COUNTBACK,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '1' AND f.CONSTRUCTION_USER_ID = #{USER_ID}
-        THEN f.CUTROAD_ID END) COUNTCONSTRUCTION,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '2' AND f.PRODUCTION_USER_ID = #{USER_ID}
-        THEN f.CUTROAD_ID END) COUNTPRODUCTION,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '3' AND f.SAFETY_USER_ID = #{USER_ID}
-        THEN f.CUTROAD_ID END) COUNTSAFETY,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '4' AND f.LEADER_USER_ID = #{USER_ID}
-        THEN f.CUTROAD_ID END) COUNTLEADER,
-        COUNT(CASE
-        WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID}
-        THEN f.CUTROAD_ID END) COUNTACCEPT,
-        COUNT(
-        CASE
+                                        WHEN f.APPLY_STATUS <![CDATA[ < ]]> '5' AND f.APPLY_STATUS > 0
+                                            AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID}
+                                            AND NOT EXISTS (
+                                                SELECT
+                                                    1
+                                                FROM
+                                                    GF_ELECTRICITY_ACCEPTUSER m
+                                                WHERE
+                                                    m.ELECTRICITY_ID = f.ELECTRICITY_ID
+                                                  AND m.CORPINFO_ID = f.CORPINFO_ID
+                                                  AND f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID
+                                            ) THEN
+                                            f.ELECTRICITY_ID
+                                        END
+                            ) COUNTACCEPTCONFESS
+                        FROM
+                            GF_ELECTRICITY f
+                        WHERE
+                            f.ISDELETE = '0'
+                          AND f.CORPINFO_ID = #{CORPINFO_ID}
+                    ) f,
+                    (
+                        SELECT
+                            COUNT( CASE WHEN ( f.APPLY_STATUS + 0 ) <![CDATA[ < ]]> 1 AND f.CREATOR = #{USER_ID} THEN f.CUTROAD_ID END ) COUNTBACK,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '1' AND f.CONSTRUCTION_USER_ID = #{USER_ID} THEN f.CUTROAD_ID END ) COUNTCONSTRUCTION,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '2' AND f.PRODUCTION_USER_ID = #{USER_ID} THEN f.CUTROAD_ID END ) COUNTPRODUCTION,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '3' AND f.SAFETY_USER_ID = #{USER_ID} THEN f.CUTROAD_ID END ) COUNTSAFETY,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '4' AND f.LEADER_USER_ID = #{USER_ID} THEN f.CUTROAD_ID END ) COUNTLEADER,
+                            COUNT( CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.CUTROAD_ID END ) COUNTACCEPT,
+                            COUNT(
+                                    CASE
 
-        WHEN f.APPLY_STATUS
-        <
-        '6' AND f.APPLY_STATUS > 0
-        AND f.GUARDIAN_USER_ID = #{USER_ID}
-        AND f.GUARDIAN_USER_SIGNER_TIME IS NULL THEN
-        f.CUTROAD_ID
-        END
-        ) COUNTGUARDIAN,
-        COUNT(
-        CASE
+                                        WHEN f.APPLY_STATUS <![CDATA[ < ]]> '6' AND f.APPLY_STATUS > 0
+                                            AND f.GUARDIAN_USER_ID = #{USER_ID}
+                                            AND f.GUARDIAN_USER_SIGNER_TIME IS NULL THEN
+                                            f.CUTROAD_ID
+                                        END
+                            ) COUNTGUARDIAN,
+                            COUNT(
+                                    CASE
 
-        WHEN f.APPLY_STATUS
-        <
-        '6' AND f.APPLY_STATUS > 0
-        AND f.CONFESS_USER_ID = #{USER_ID}
-        AND f.CONFESS_USER_SIGNER_TIME IS NULL THEN
-        f.CUTROAD_ID
-        END
-        ) COUNTCONFESS,
-        COUNT(
-        CASE
+                                        WHEN f.APPLY_STATUS <![CDATA[ < ]]> '6' AND f.APPLY_STATUS > 0
+                                            AND f.CONFESS_USER_ID = #{USER_ID}
+                                            AND f.CONFESS_USER_SIGNER_TIME IS NULL THEN
+                                            f.CUTROAD_ID
+                                        END
+                            ) COUNTCONFESS,
+                            COUNT(
+                                    CASE
 
-        WHEN f.APPLY_STATUS
-        <
-        '6' AND f.APPLY_STATUS > 0
-        AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID}
-        AND NOT EXISTS (SELECT 1
-        FROM GF_CUTROAD_ACCEPTUSER m
-        WHERE m.CUTROAD_ID = f.CUTROAD_ID
-        AND m.CORPINFO_ID = f.CORPINFO_ID
-        AND f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID)
-        THEN
-        f.CUTROAD_ID
-        END
-        ) COUNTACCEPTCONFESS
-        FROM GF_CUTROAD f
-        WHERE f.ISDELETE = '0'
-        AND f.CORPINFO_ID = #{CORPINFO_ID}) g,
-        (SELECT ifnull(count(DISTINCT h.HOTWORKAPPLICATION_ID), 0) AS HOTWORK_COUNT
-        FROM sys_user f
-        LEFT JOIN bus_hotworkapplicationuser hu ON f.USER_ID = hu.USER_ID
-        LEFT JOIN bus_hotworkapplication h
-        ON hu.FOREIGN_KEY = h.HOTWORKAPPLICATION_ID AND h.ISDELETE = '0'
-        AND h.STATE >= 0
-        AND h.STATE != 11
-        AND hu.STATE = h.STATE
-        WHERE
-        f.CORPINFO_ID = #{CORPINFO_ID}
-        AND
-        f.USER_ID = #{USER_ID}
-        GROUP BY
-        f.USER_ID) h) count15
+                                        WHEN f.APPLY_STATUS <![CDATA[ < ]]> '6' AND f.APPLY_STATUS > 0
+                                            AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID}
+                                            AND NOT EXISTS (
+                                                SELECT
+                                                    1
+                                                FROM
+                                                    GF_CUTROAD_ACCEPTUSER m
+                                                WHERE
+                                                    m.CUTROAD_ID = f.CUTROAD_ID
+                                                  AND m.CORPINFO_ID = f.CORPINFO_ID
+                                                  AND f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID
+                                            ) THEN
+                                            f.CUTROAD_ID
+                                        END
+                            ) COUNTACCEPTCONFESS
+                        FROM
+                            GF_CUTROAD f
+                        WHERE
+                            f.ISDELETE = '0'
+                          AND f.CORPINFO_ID = #{CORPINFO_ID}
+                    ) g,
+                    (
+                        SELECT
+                            ifnull( count( DISTINCT h.HOTWORKAPPLICATION_ID ), 0 ) AS HOTWORK_COUNT
+                        FROM
+                            sys_user f
+                                LEFT JOIN bus_hotworkapplicationuser hu ON f.USER_ID = hu.USER_ID
+                                LEFT JOIN bus_hotworkapplication h ON hu.FOREIGN_KEY = h.HOTWORKAPPLICATION_ID  AND h.ISDELETE = '0'
+                                AND h.STATE >= 0
+                                AND h.STATE != 11
+					AND hu.STATE = h.STATE
+                        WHERE
+                            f.CORPINFO_ID = #{CORPINFO_ID}
+                          AND
+                            f.USER_ID = #{USER_ID}
+                        GROUP BY
+                            f.USER_ID
+                    ) h
+            ) count15
     </select>
 </mapper>