From 56d43e7ebdd1607e22f04dccd8d6e380a3b0b30b Mon Sep 17 00:00:00 2001
From: chenxinying <1039655633@qq.com>
Date: Thu, 25 Jan 2024 17:40:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=98=AF=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=8E=AA=E6=96=BD=E7=A1=AE=E8=AE=A4=E4=BA=BA?=
 =?UTF-8?q?=EF=BC=8C=E6=9F=90=E4=B8=AA=E4=BA=BA=E6=89=93=E5=9B=9E=EF=BC=8C?=
 =?UTF-8?q?=E5=88=99=E5=85=B6=E4=BB=96=E7=A1=AE=E8=AE=A4=E4=BA=BA=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=89=93=E5=9B=9E=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/datasource/eightwork/EightWorkTaskMapper.xml | 4 +++-
 .../mybatis/datasource/eightwork/HotWorkMapper.xml       | 5 +++++
 .../mybatis/datasource/eightwork/HotworkSignMapper.xml   | 9 ++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mybatis/datasource/eightwork/EightWorkTaskMapper.xml b/src/main/resources/mybatis/datasource/eightwork/EightWorkTaskMapper.xml
index a204f38..3f3ce9f 100644
--- a/src/main/resources/mybatis/datasource/eightwork/EightWorkTaskMapper.xml
+++ b/src/main/resources/mybatis/datasource/eightwork/EightWorkTaskMapper.xml
@@ -42,7 +42,9 @@
 	</insert>
 
 	<select id="checkWorkCount" parameterType="pd" resultType="pd" >
-		select (select count(1) COUNT from bus_hotwork_sign sign where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID}) HOTWORK_COUNT
+		select (select count(1) COUNT from bus_hotwork_sign sign
+		 left join bus_hotwork a on a.HOTWORK_ID = sign.HOTWORK_ID
+		 where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and a.STEP_ID != '-1') HOTWORK_COUNT
 	</select>
 
 </mapper>
diff --git a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml
index 456258e..5f6f782 100644
--- a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml
+++ b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml
@@ -476,6 +476,9 @@
                 and sign.SIGN_TIME is null
                 and sign.SIGN_USER_ID = #{pd.USER_ID}
                 and step.STEP_NAME = #{pd.STEP_NAME}
+                <if test="pd.measures != null and pd.measures != ''"><!-- 如果是多个安全措施确认人，某个人打回，则其他确认人不显示打回作业 -->
+                    and f.STEP_ID != -1
+                </if>
             )
         </if>
         <if test="pd.STEP_ID != null and pd.STEP_ID != ''"><!-- 关键词检索 -->
@@ -511,8 +514,10 @@
         from
             bus_hotwork_sign sign
         left join bus_eightwork_step step on step.STEP_ID = sign.STEP_ID
+        left join bus_hotwork a on a.HOTWORK_ID = sign.HOTWORK_ID
         where
             sign.SIGN_TIME is null
+            and a.STEP_ID != '-1'
         and
             sign.SIGN_USER_ID = #{USER_ID}
         group by step.CODE
diff --git a/src/main/resources/mybatis/datasource/eightwork/HotworkSignMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HotworkSignMapper.xml
index d534afc..b0d3f0f 100644
--- a/src/main/resources/mybatis/datasource/eightwork/HotworkSignMapper.xml
+++ b/src/main/resources/mybatis/datasource/eightwork/HotworkSignMapper.xml
@@ -102,7 +102,14 @@
 
 	<select id="listAll" parameterType="pd" resultType="pd">
 		select
-		<include refid="Field"></include>,
+		f.HOTWORK_SIGN_ID,
+		f.HOTWORK_ID,
+		f.CORPINFO_ID,
+		f.SIGN_USER_ID,
+		f.SIGN_PATH,
+		f.SIGN_TIME,
+		f.STEP_ID,
+		IFNULL(f.DESCR,'无') as DESCR,
 		step.CODE
 		from
 		<include refid="tableName"></include> f