parent
c361f8f794
commit
eb9be8ce5f
|
@ -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"));
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue