企业端一公司动火作业列表流程图验收时间不显示
parent
d06fcb8ee6
commit
1604612f98
|
@ -651,7 +651,7 @@
|
|||
f.ACCEPT_DEPARTMENT_ID,
|
||||
f.ACCEPT_USER_ID,
|
||||
f.ACCEPT_USER_SIGNER_PATH,
|
||||
f.ACCEPT_USER_SIGNER_TIME,
|
||||
<!--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
|
||||
<include refid="tableName"></include> 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'
|
||||
<if test="pd.APPLY_STATUS != null and pd.APPLY_STATUS != ''">
|
||||
and f.APPLY_STATUS = #{pd.APPLY_STATUS}
|
||||
|
|
Loading…
Reference in New Issue