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 @@ and f.APPROVAL_STATUS = #{APPROVAL_STATUS} + + 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') ) +