动火页面统计数逻辑修改

安全检查项意见逻辑修改
liujun0703-新项目开发^2^2
WenShiJun 2024-06-13 18:07:27 +08:00
parent c361f8f794
commit eb9be8ce5f
2 changed files with 2 additions and 2 deletions

View File

@ -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"));

View File

@ -307,7 +307,7 @@
</if>
<if test="pd.USER_ID != null and pd.USER_ID != ''">
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)
</if>
ORDER BY f.APPLY_STATUS,f.CREATTIME DESC