From 4d0953876cef841637d396d52886abc0084b41cb Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Mon, 29 Apr 2024 19:06:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E7=94=A8=E6=9B=B4=E6=94=B9=E4=BB=BB=E4=BD=95?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/highriskwork/impl/HotworkCfdServiceImpl.java       | 1 +
 .../datasource/highriskwork/BusHotworkCfdExamineMapper.xml     | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java
index 27565950..c95cdb52 100644
--- a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java
+++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java
@@ -410,6 +410,7 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
 		condition.put("TYPE", "0");
 		condition.put("USER_ID", pd.get("USER_ID"));
 		condition.put("APPROVAL_STATUS", "0");
+		condition.put("isValid","1");
 		//动火交底人需处理数
 		info.put("confessNum", busHotworkCfdExamineMapper.findByCondition(condition).size());
 		condition.put("TYPE", "1");
diff --git a/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml
index 820319df..de8b0c81 100644
--- a/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml
+++ b/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml
@@ -150,6 +150,9 @@
 		<if test="APPROVAL_STATUS != null and APPROVAL_STATUS != ''">
 			and f.APPROVAL_STATUS = #{APPROVAL_STATUS}
 		</if>
+		<if test="isValid != '' and isValid != null">
+			and not exists(select 1 from bus_hotwork_cfd a where a.HOTWORK_ID = f.HOTWORK_ID and (a.APPLY_STATUS = '-98' or a.APPLY_STATUS = '-99') )
+		</if>
 	</select>
 	<select id="safetylistPage" resultType="com.zcloud.entity.PageData">
 		select