From 0921161d64722ca0eeb3215bc30876bf415531d4 Mon Sep 17 00:00:00 2001
From: shanao <wangpeng@zcloudchina.com>
Date: Wed, 23 Oct 2024 19:31:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8=E7=8E=AF?=
 =?UTF-8?q?=E4=BF=9D=E6=A3=80=E6=9F=A5loginUserId=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4mybatis=20=E9=94=99=E8=AF=AF=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SafetyEnvironmentalExplainMapper.xml      |   7 +-
 .../SafetyEnvironmentalInspectorMapper.xml    | 171 ++++++++++--------
 .../inspection/SafetyEnvironmentalMapper.xml  |  19 +-
 3 files changed, 111 insertions(+), 86 deletions(-)

diff --git a/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalExplainMapper.xml b/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalExplainMapper.xml
index 20b7571e..7793d128 100644
--- a/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalExplainMapper.xml
+++ b/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalExplainMapper.xml
@@ -207,8 +207,11 @@
         </if>
         GROUP BY se.INSPECTION_ID
         ORDER BY FIELD(se.INSPECTION_STATUS, '2', '1', '0', '3', '4', '5', '6', '7', '8', '-1', '-2'),
-                 FIELD(if(se.INSPECTED_SITEUSER_ID = #{pd.loginUserId},se.INSPECTED_SITEUSER_ID,'1'), se.INSPECTED_SITEUSER_ID, '1'),
-                 se.INSPECTION_TIME_START DESC
+        <if test="pd.loginUserId != null and pd.loginUserId != ''">
+            FIELD(if(se.INSPECTED_SITEUSER_ID = #{pd.loginUserId}, se.INSPECTED_SITEUSER_ID, '1'),
+                  se.INSPECTED_SITEUSER_ID, '1'),
+        </if>
+        se.INSPECTION_TIME_START DESC
     </select>
 
 	<!-- 列表(全部) -->
diff --git a/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalInspectorMapper.xml b/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalInspectorMapper.xml
index f786f694..a005570b 100644
--- a/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalInspectorMapper.xml
+++ b/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalInspectorMapper.xml
@@ -122,84 +122,101 @@
 
 	<!-- 列表 -->
 	<select id="datalistPage" parameterType="page" resultType="pd">
-		select
-		iou.NAME INSPECTION_ORIGINATOR_NAME,
-		iod.NAME INSPECTION_DEPARTMENT_NAME,
-		isd.NAME INSPECTED_DEPARTMENT_NAME,
-		isu.NAME INSPECTED_SITEUSER_NAME,
-		IFNULL(GROUP_CONCAT(REPLACE(siu.NAME,'/',',')),'') AS INSPECTION_USER_NAME,
-		CASE WHEN IFNULL(se.INSPECTION_TYPE_OTHER, '') = '' THEN d.NAME ELSE se.INSPECTION_TYPE_OTHER END INSPECTION_TYPE_NAME,
-		se.INSPECTION_TIME_START,
-		se.INSPECTION_TIME_END,
-		se.INSPECTION_STATUS,
-		se.INSPECTION_SUBJECT,
-		se.INSPECTED_DEPARTMENT_ID,
-		<include refid="Field"></include>
-		from
-		<include refid="tableName"></include> f
-		 INNER JOIN BUS_INSPECTION_SAFETYENVIRONMENTAL se ON se.INSPECTION_ID = f.INSPECTION_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
-		 LEFT JOIN OA_DEPARTMENT isd ON isd.DEPARTMENT_ID = se.INSPECTED_DEPARTMENT_ID
-		 LEFT JOIN SYS_USER isu ON isu.USER_ID = se.INSPECTED_SITEUSER_ID
-		LEFT JOIN bus_inspection_safetyenvironmental_inspector si ON si.INSPECTION_ID = se.INSPECTION_ID
-		AND si.ISDELETE = '0'
-		LEFT JOIN vi_user_all siu ON siu.USER_ID = si.INSPECTION_USER_ID
-		 LEFT JOIN sys_dictionaries d ON d.BIANMA = se.INSPECTION_TYPE
-		where f.ISDELETE = '0' and se.ISDELETE = '0'
-		<if test="pd.supDeparIds != null and pd.supDeparIds != ''"><!-- 权限显示 -->
-			<choose>
-				<when test="pd.roleLevel == '0'">
-				</when>
-				<when test="pd.roleLevel == '1'">
-					and siu.DEPARTMENT_ID in (${pd.supDeparIds})
-				</when>
-				<when test="pd.roleLevel == '3'">
---  					siu.USER_ID in ( #{pd.loginUserId} )
-				</when>
-			</choose>
-		</if>
-		<if test="pd.INSPECTION_USER_ID != null and pd.INSPECTION_USER_ID != ''"><!-- 检查人 -->
-			and f.INSPECTION_USER_ID = #{pd.INSPECTION_USER_ID}
-		</if>
-		<if test="pd.INSPECTION_SUBJECT != null and pd.INSPECTION_SUBJECT != ''"><!-- 检查题目 -->
-			and se.INSPECTION_SUBJECT = #{pd.INSPECTION_SUBJECT,jdbcType=VARCHAR}
-		</if>
-		<if test="pd.INSPECTED_DEPARTMENT_NAME != null and pd.INSPECTED_DEPARTMENT_NAME != ''"><!-- 被检查单位 -->
-			and isd.NAME LIKE CONCAT(CONCAT('%', #{pd.INSPECTED_DEPARTMENT_NAME}),'%')
-		</if>
-		<if test="pd.INSPECTION_DEPARTMENT_NAME != null and pd.INSPECTION_DEPARTMENT_NAME != ''"><!-- 检查部门 -->
-			and iod.NAME LIKE CONCAT(CONCAT('%', #{pd.INSPECTION_DEPARTMENT_NAME}),'%')
-		</if>
-		<if test="pd.INSPECTION_ORIGINATOR_NAME != null and pd.INSPECTION_ORIGINATOR_NAME != ''"><!-- 检查发起人 -->
-			and iou.NAME LIKE CONCAT(CONCAT('%', #{pd.INSPECTION_ORIGINATOR_NAME}),'%')
-		</if>
-		<if test="pd.INSPECTION_TYPE != null and pd.INSPECTION_TYPE != ''"><!-- 检查类型 -->
-			and se.INSPECTION_TYPE = #{pd.INSPECTION_TYPE}
-		</if>
-		<if test="pd.INSPECTION_TIME_START != null and pd.INSPECTION_TIME_START != ''"><!-- 检查时间 -->
-			and se.INSPECTION_TIME_START &gt;= CONCAT(#{pd.INSPECTION_TIME_START}, ' 00:00')
-		</if>
-		<if test="pd.INSPECTION_TIME_END != null and pd.INSPECTION_TIME_END != ''"><!-- 检查时间 -->
-			and se.INSPECTION_TIME_END &lt;= CONCAT(#{pd.INSPECTION_TIME_END}, ' 23:59')
-		</if>
-		<if test="pd.INSPECTION_STATUS != null and pd.INSPECTION_STATUS != ''"><!-- 检查状态 -->
-			and se.INSPECTION_STATUS = #{pd.INSPECTION_STATUS}
-		</if>
+        select iou.NAME                                                 INSPECTION_ORIGINATOR_NAME,
+               iod.NAME                                                 INSPECTION_DEPARTMENT_NAME,
+               isd.NAME                                                 INSPECTED_DEPARTMENT_NAME,
+               isu.NAME                                                 INSPECTED_SITEUSER_NAME,
+               IFNULL(GROUP_CONCAT(REPLACE(siu.NAME, '/', ',')), '') AS INSPECTION_USER_NAME,
+               CASE
+                   WHEN IFNULL(se.INSPECTION_TYPE_OTHER, '') = '' THEN d.NAME
+                   ELSE se.INSPECTION_TYPE_OTHER END                    INSPECTION_TYPE_NAME,
+               se.INSPECTION_TIME_START,
+               se.INSPECTION_TIME_END,
+               se.INSPECTION_STATUS,
+               se.INSPECTION_SUBJECT,
+               se.INSPECTED_DEPARTMENT_ID,
+        <include refid="Field">
+        </include>
+        from
+        <include refid="tableName">
+        </include>
+        f
+            INNER JOIN BUS_INSPECTION_SAFETYENVIRONMENTAL se ON se.INSPECTION_ID = f.INSPECTION_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
+            LEFT JOIN OA_DEPARTMENT isd ON isd.DEPARTMENT_ID = se.INSPECTED_DEPARTMENT_ID
+            LEFT JOIN SYS_USER isu ON isu.USER_ID = se.INSPECTED_SITEUSER_ID
+            LEFT JOIN bus_inspection_safetyenvironmental_inspector si ON si.INSPECTION_ID = se.INSPECTION_ID
+            AND si.ISDELETE = '0'
+            LEFT JOIN vi_user_all siu ON siu.USER_ID = si.INSPECTION_USER_ID
+            LEFT JOIN sys_dictionaries d ON d.BIANMA = se.INSPECTION_TYPE
+        where f.ISDELETE = '0'
+          and se.ISDELETE = '0'
+        <if test="pd.supDeparIds != null and pd.supDeparIds != ''">
+            <!-- 权限显示 -->
+            <choose>
+                <when test="pd.roleLevel == '0'">
+                </when>
+                <when test="pd.roleLevel == '1'">
+                    and siu.DEPARTMENT_ID in (${pd.supDeparIds})
+                </when>
+                <when test="pd.roleLevel == '3'">
+                    --  					siu.USER_ID in ( #{pd.loginUserId} )
+                </when>
+            </choose>
+        </if>
+        <if test="pd.INSPECTION_USER_ID != null and pd.INSPECTION_USER_ID != ''">
+            <!-- 检查人 -->
+            and f.INSPECTION_USER_ID = #{pd.INSPECTION_USER_ID}
+        </if>
+        <if test="pd.INSPECTION_SUBJECT != null and pd.INSPECTION_SUBJECT != ''">
+            <!-- 检查题目 -->
+            and se.INSPECTION_SUBJECT = #{pd.INSPECTION_SUBJECT,jdbcType=VARCHAR}
+        </if>
+        <if test="pd.INSPECTED_DEPARTMENT_NAME != null and pd.INSPECTED_DEPARTMENT_NAME != ''">
+            <!-- 被检查单位 -->
+            and isd.NAME LIKE CONCAT(CONCAT('%', #{pd.INSPECTED_DEPARTMENT_NAME}), '%')
+        </if>
+        <if test="pd.INSPECTION_DEPARTMENT_NAME != null and pd.INSPECTION_DEPARTMENT_NAME != ''">
+            <!-- 检查部门 -->
+            and iod.NAME LIKE CONCAT(CONCAT('%', #{pd.INSPECTION_DEPARTMENT_NAME}), '%')
+        </if>
+        <if test="pd.INSPECTION_ORIGINATOR_NAME != null and pd.INSPECTION_ORIGINATOR_NAME != ''">
+            <!-- 检查发起人 -->
+            and iou.NAME LIKE CONCAT(CONCAT('%', #{pd.INSPECTION_ORIGINATOR_NAME}), '%')
+        </if>
+        <if test="pd.INSPECTION_TYPE != null and pd.INSPECTION_TYPE != ''">
+            <!-- 检查类型 -->
+            and se.INSPECTION_TYPE = #{pd.INSPECTION_TYPE}
+        </if>
+        <if test="pd.INSPECTION_TIME_START != null and pd.INSPECTION_TIME_START != ''">
+            <!-- 检查时间 -->
+            and se.INSPECTION_TIME_START &gt;= CONCAT(#{pd.INSPECTION_TIME_START}, ' 00:00')
+        </if>
+        <if test="pd.INSPECTION_TIME_END != null and pd.INSPECTION_TIME_END != ''">
+            <!-- 检查时间 -->
+            and se.INSPECTION_TIME_END &lt;= CONCAT(#{pd.INSPECTION_TIME_END}, ' 23:59')
+        </if>
+        <if test="pd.INSPECTION_STATUS != null and pd.INSPECTION_STATUS != ''">
+            <!-- 检查状态 -->
+            and se.INSPECTION_STATUS = #{pd.INSPECTION_STATUS}
+        </if>
 
-		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 被检查单位 -->
-			and (
-			isd.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
-			OR iod.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
-			)
-		</if>
-		GROUP BY f.INSPECTION_ID
-		ORDER BY
-		FIELD(if(f.INSPECTION_USER_SIGN_TIME is not null,'2','1'), '1','2'),
-		FIELD(if(se.INSPECTED_SITEUSER_ID = #{pd.loginUserId},#{pd.loginUserId},'1'), #{pd.loginUserId}, '1'),
-		FIELD (se.INSPECTION_STATUS , '0','1','2','3','4','5','6','7','8','-1','-2') ,
-		se.INSPECTION_TIME_START DESC , se.INSPECTION_TIME_END DESC
-	</select>
+        <if test="pd.KEYWORDS != null and pd.KEYWORDS != ''">
+            <!-- 被检查单位 -->
+            and (
+                isd.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}), '%')
+                    OR iod.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}), '%')
+                )
+        </if>
+        GROUP BY f.INSPECTION_ID
+        ORDER BY FIELD(if(f.INSPECTION_USER_SIGN_TIME is not null, '2', '1'), '1', '2'),
+        <if test="pd.loginUserId != null and pd.loginUserId != ''">
+            FIELD(if(se.INSPECTED_SITEUSER_ID = #{pd.loginUserId}, #{pd.loginUserId}, '1'), #{pd.loginUserId}, '1'),
+        </if>
+        FIELD(se.INSPECTION_STATUS, '0', '1', '2', '3', '4', '5', '6', '7', '8', '-1', '-2'),
+        se.INSPECTION_TIME_START DESC, se.INSPECTION_TIME_END DESC
+    </select>
 
 	<!-- 列表(全部) -->
 	<select id="listAll" parameterType="pd" resultType="pd">
diff --git a/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalMapper.xml b/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalMapper.xml
index e4d6ebe9..8ddbc7ce 100644
--- a/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalMapper.xml
+++ b/src/main/resources/mybatis/datasource/inspection/SafetyEnvironmentalMapper.xml
@@ -665,6 +665,7 @@
                       ON si.INSPECTION_ID = f.INSPECTION_ID and si.ISDELETE = '0'
             LEFT JOIN vi_user_all siu ON siu.USER_ID = si.INSPECTION_USER_ID
             LEFT JOIN sys_dictionaries d ON d.BIANMA = f.INSPECTION_TYPE
+        <if test="pd.loginUserId != null and pd.loginUserId != ''">
             LEFT JOIN (select h.FOREIGN_ID, count(h.HIDDEN_ID) as `count`
                        from BUS_HIDDEN h
                        where h.ISDELETE = 0
@@ -672,6 +673,7 @@
                          and h.STATE in ('4', '8')
                          and (h.FINAL_CHECK is null or h.FINAL_CHECK = '2')
                        group by h.FOREIGN_ID) h on h.FOREIGN_ID = f.INSPECTION_ID AND f.INSPECTION_STATUS in ('5', '6')
+        </if>
         where f.ISDELETE = '0'
         <if test="pd.INSPECTION_ORIGINATOR_ID != null and pd.INSPECTION_ORIGINATOR_ID != ''">
             <!-- 检查发起人 -->
@@ -736,13 +738,16 @@
                 )
         </if>
         GROUP BY f.INSPECTION_ID
-        ORDER BY CASE
-                     WHEN f.INSPECTION_STATUS IN ('3', '4') AND f.INSPECTED_SITEUSER_ID = #{pd.loginUserId} THEN 1
-                     WHEN f.INSPECTION_STATUS IN ('5', '6', '7') AND checkout = 1 THEN 2
-                     ELSE 3
-                     END,
-                 field(f.INSPECTION_STATUS, '3', '6', '4', '7', '5', '0', '1', '2', '8', '-1', '-2'),
-                 f.INSPECTION_TIME_END DESC
+        ORDER BY
+        <if test="pd.loginUserId != null and pd.loginUserId != ''">
+            CASE
+                WHEN f.INSPECTION_STATUS IN ('3', '4') AND f.INSPECTED_SITEUSER_ID = #{pd.loginUserId} THEN 1
+                WHEN f.INSPECTION_STATUS IN ('5', '6', '7') AND checkout = 1 THEN 2
+                ELSE 3
+                END,
+        </if>
+        field(f.INSPECTION_STATUS, '3', '6', '4', '7', '5', '0', '1', '2', '8', '-1', '-2'),
+        f.INSPECTION_TIME_END DESC
     </select>
 
 	<select id="statisticsBranchGroupDept" parameterType="pd" resultType="pd">