From 1604612f989f909cce331d853b5257c6c6eca9a5 Mon Sep 17 00:00:00 2001 From: limingyu Date: Thu, 25 Apr 2024 14:42:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E4=B8=80=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E5=8A=A8=E7=81=AB=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=9B=BE=E9=AA=8C=E6=94=B6=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/highriskwork/HotworkCfdMapper.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml index a4f28db3..51087606 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml @@ -651,7 +651,7 @@ f.ACCEPT_DEPARTMENT_ID, f.ACCEPT_USER_ID, f.ACCEPT_USER_SIGNER_PATH, - f.ACCEPT_USER_SIGNER_TIME, + f.ACCEPT_CONTENT, f.APPLY_DEPARTMENT_ID, f.APPLY_USER_ID, @@ -738,7 +738,9 @@ aacu.NAME as ACCEPT_CONFESS_USER_NAME, anad.NAME as ANALYZE_DEPARTMENT_NAME, - anau.NAME as ANALYZE_USER_NAME + anau.NAME as ANALYZE_USER_NAME, + + bhac.ACCEPT_USER_SIGNER_TIME as ACCEPT_USER_SIGNER_TIME from f left join OA_DEPARTMENT ad on ad.DEPARTMENT_ID = f.APPLY_DEPARTMENT_ID @@ -773,6 +775,10 @@ 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_ACCEPTUSER_CFD bhac on bhac.HOTWORK_ID = f.HOTWORK_ID + and bhac.ACCEPT_USER_ID = f.ACCEPT_USER_ID and bhac.CORPINFO_ID = f.CORPINFO_ID + and bhac.ISDELETE = '0' and bhac.ACCEPT_USER_ID is not null and trim(bhac.ACCEPT_USER_ID) != '' where f.ISDELETE = '0' and f.APPLY_STATUS = #{pd.APPLY_STATUS}