From eb9be8ce5f3936f4e082b1a7e579e448b52b2ce6 Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Thu, 13 Jun 2024 18:07:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E9=A1=B5=E9=9D=A2=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=95=B0=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=20?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=A3=80=E6=9F=A5=E9=A1=B9=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java | 2 +- .../datasource/highriskwork/BusHotworkCfdExamineMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 7d860a5c..9f40dd7c 100644 --- a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java @@ -485,7 +485,7 @@ public class HotworkCfdServiceImpl implements HotworkCfdService { sumCount += Integer.parseInt(info.getString("belongingNum", "0")); sumCount += Integer.parseInt(info.getString("COUNTGUARDIAN", "0")); sumCount += Integer.parseInt(info.getString("confessNum", "0")); - sumCount += Integer.parseInt(info.getString("COUNTACCEPTCONFESS", "0")); +// sumCount += Integer.parseInt(info.getString("COUNTACCEPTCONFESS", "0")); sumCount += Integer.parseInt(info.getString("COUNTCONFIRM", "0")); sumCount += Integer.parseInt(info.getString("COUNTCONFESS", "0")); sumCount += Integer.parseInt(info.getString("COUNTAUDIT", "0")); diff --git a/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml index b92b0544..42dfee46 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml @@ -307,7 +307,7 @@ and exists (select 1 from bus_hotwork_cfd_examine bhce where bhce.USER_ID = #{pd.USER_ID} and bhce.IS_DELETE = - '0' and bhce.VALID_FLAG = '1' and bhce.APPROVAL_STATUS = '0' and bhce.TYPE = #{pd.TYPE} and bhce.HOTWORK_ID = f.HOTWORK_ID) + '0' and bhce.VALID_FLAG = '1' and bhce.APPROVAL_STATUS = '0' or bhce.APPROVAL_STATUS = '1' and bhce.TYPE = #{pd.TYPE} and bhce.HOTWORK_ID = f.HOTWORK_ID) ORDER BY f.APPLY_STATUS,f.CREATTIME DESC