From eb9be8ce5f3936f4e082b1a7e579e448b52b2ce6 Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Thu, 13 Jun 2024 18:07:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=95=B0=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=20=E5=AE=89=E5=85=A8=E6=A3=80=E6=9F=A5=E9=A1=B9=E6=84=8F?= =?UTF-8?q?=E8=A7=81=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 From 4c9929452ead46c9bf405f30d853a8800b7a66e4 Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Fri, 14 Jun 2024 17:52:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=98=AF=E6=9A=82?= =?UTF-8?q?=E5=AD=98=E6=95=B0=E6=8D=AE=E5=9C=A8=E5=85=B6=E4=BB=96=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E4=B8=8D=E6=98=BE=E7=A4=BA=20=E5=AE=8C=E5=B7=A5?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=E5=A6=82=E6=9E=9C=E4=B8=8D=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E9=BB=98=E8=AE=A4=E5=90=8C=E6=84=8F=20?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E9=A1=B9=E7=9B=AE=E8=B4=A3=E4=BB=BB=E8=B4=9F?= =?UTF-8?q?=E8=B4=A3=E4=BA=BA=E7=AD=BE=E5=AD=97=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/HotworkCfdServiceImpl.java | 1 + .../BusHotworkCfdExamineMapper.xml | 46 +++++++++++++++++-- .../highriskwork/HotworkCfdMapper.xml | 41 +++++------------ 3 files changed, 55 insertions(+), 33 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 9f40dd7c..ee005f46 100644 --- a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java @@ -550,6 +550,7 @@ public class HotworkCfdServiceImpl implements HotworkCfdService { .collect(Collectors.toList()); for (PageData x : safetyList) { x.put("APPROVAL_STATUS", x.get("APPROVAL_STATUS")); + x.put("APPROVAL_SIGNATURE", x.get("APPROVAL_SIGNATURE")); } pd.put("safetyList", safetyList); // 项目责任负责人 diff --git a/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml index 42dfee46..9dcf8563 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml @@ -134,8 +134,40 @@ select * from bus_hotwork_cfd_examine f where f.IS_DELETE = '0' and f.HOTWORK_ID = #{HOTWORK_ID} + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml index c73ab389..95b4e14d 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml @@ -506,9 +506,9 @@ f.OTHER_PROTECTIVE_MEASURES, f.ACCEPT_DEPARTMENT_ID, f.ACCEPT_USER_ID, - f.ACCEPT_USER_SIGNER_PATH, - f.ACCEPT_USER_SIGNER_TIME, - IFNULL(f.ACCEPT_CONTENT,'无') as ACCEPT_CONTENT, + bhac.ACCEPT_USER_SIGNER_PATH, + bhac.ACCEPT_USER_SIGNER_TIME, + IFNULL(f.ACCEPT_CONTENT,'同意') as ACCEPT_CONTENT, f.APPLY_DEPARTMENT_ID, f.APPLY_USER_ID, f.WORK_PLACE, @@ -554,83 +554,64 @@ f.CONFIRM_OTHER_CONTENT, ad.NAME as APPLY_DEPARTMENT_NAME, au.NAME as APPLY_USER_NAME, - cd.NAME as CONFIRM_DEPARTMENT_NAME, cu.NAME as CONFIRM_USER_NAME, - gd.NAME as GUARDIAN_DEPARTMENT_NAME, gu.NAME as GUARDIAN_USER_NAME, - ld.NAME as LEADER_DEPARTMENT_NAME, lu.NAME as LEADER_USER_NAME, - aud.NAME as AUDIT_DEPARTMENT_NAME, auu.NAME as AUDIT_USER_NAME, - apd.NAME as APPROVE_DEPARTMENT_NAME, apu.NAME as APPROVE_USER_NAME, - md.NAME as MONITOR_DEPARTMENT_NAME, mu.NAME as MONITOR_USER_NAME, - acd.NAME as ACCEPT_DEPARTMENT_NAME, acu.NAME as ACCEPT_USER_NAME, - ac.NAME as CONFESS_DEPARTMENT_NAME, accu.NAME as CONFESS_USER_NAME, - aac.NAME as ACCEPT_CONFESS_DEPARTMENT_NAME, aacu.NAME as ACCEPT_CONFESS_USER_NAME, - anad.NAME as ANALYZE_DEPARTMENT_NAME, anau.NAME as ANALYZE_USER_NAME, - bhe.USER_NAME as EXAMINE_USER_NAME, bhe.APPROVAL_OPINIONS as EXAMINE_APPROVAL_OPINIONS, bhe.APPROVAL_SIGNATURE as EXAMINE_APPROVAL_SIGNATURE, bhe.CREATE_TIME as EXAMINE_APPROVAL_CREATE_TIME - from f left join OA_DEPARTMENT ad on ad.DEPARTMENT_ID = f.APPLY_DEPARTMENT_ID left join SYS_USER au on au.USER_ID = f.APPLY_USER_ID - left join OA_DEPARTMENT aac on aac.DEPARTMENT_ID = f.ACCEPT_CONFESS_DEPARTMENT_ID left join SYS_USER aacu on aacu.USER_ID = f.ACCEPT_CONFESS_USER_ID - left join OA_DEPARTMENT ac on ac.DEPARTMENT_ID = f.CONFESS_DEPARTMENT_ID left join SYS_USER accu on accu.USER_ID = f.CONFESS_USER_ID - left join OA_DEPARTMENT cd on cd.DEPARTMENT_ID = f.CONFIRM_DEPARTMENT_ID left join SYS_USER cu on cu.USER_ID = f.CONFIRM_USER_ID - left join OA_DEPARTMENT gd on gd.DEPARTMENT_ID = f.GUARDIAN_DEPARTMENT_ID left join SYS_USER gu on gu.USER_ID = f.GUARDIAN_USER_ID - left join OA_DEPARTMENT ld on ld.DEPARTMENT_ID = f.LEADER_DEPARTMENT_ID left join SYS_USER lu on lu.USER_ID = f.LEADER_USER_ID - left join OA_DEPARTMENT aud on aud.DEPARTMENT_ID = f.AUDIT_DEPARTMENT_ID left join SYS_USER auu on auu.USER_ID = f.AUDIT_USER_ID - left join OA_DEPARTMENT apd on apd.DEPARTMENT_ID = f.APPROVE_DEPARTMENT_ID left join SYS_USER apu on apu.USER_ID = f.APPROVE_USER_ID - left join OA_DEPARTMENT md on md.DEPARTMENT_ID = f.MONITOR_DEPARTMENT_ID left join SYS_USER mu on mu.USER_ID = f.MONITOR_USER_ID - left join OA_DEPARTMENT acd on acd.DEPARTMENT_ID = f.ACCEPT_DEPARTMENT_ID left join SYS_USER acu on acu.USER_ID = f.ACCEPT_USER_ID - left join OA_DEPARTMENT anad on anad.DEPARTMENT_ID = f.ANALYZE_DEPARTMENT_ID left join SYS_USER anau on anau.USER_ID = f.ANALYZE_USER_ID - - left join bus_hotwork_cfd_examine bhe on bhe.HOTWORK_ID = f.HOTWORK_ID and bhe.TYPE = 1 - + left join bus_hotwork_cfd_examine bhe on + bhe.HOTWORK_ID = f.HOTWORK_ID + and bhe.TYPE = 1 + and bhe.IS_DELETE = '0' + left join bus_hotwork_acceptuser_cfd bhac on bhac.HOTWORK_ID = f.HOTWORK_ID where f.HOTWORK_ID = #{HOTWORK_ID} +