代码格式化,没用更改任何代码
parent
a4a85c5171
commit
4d0953876c
|
@ -410,6 +410,7 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
|
||||||
condition.put("TYPE", "0");
|
condition.put("TYPE", "0");
|
||||||
condition.put("USER_ID", pd.get("USER_ID"));
|
condition.put("USER_ID", pd.get("USER_ID"));
|
||||||
condition.put("APPROVAL_STATUS", "0");
|
condition.put("APPROVAL_STATUS", "0");
|
||||||
|
condition.put("isValid","1");
|
||||||
//动火交底人需处理数
|
//动火交底人需处理数
|
||||||
info.put("confessNum", busHotworkCfdExamineMapper.findByCondition(condition).size());
|
info.put("confessNum", busHotworkCfdExamineMapper.findByCondition(condition).size());
|
||||||
condition.put("TYPE", "1");
|
condition.put("TYPE", "1");
|
||||||
|
|
|
@ -150,6 +150,9 @@
|
||||||
<if test="APPROVAL_STATUS != null and APPROVAL_STATUS != ''">
|
<if test="APPROVAL_STATUS != null and APPROVAL_STATUS != ''">
|
||||||
and f.APPROVAL_STATUS = #{APPROVAL_STATUS}
|
and f.APPROVAL_STATUS = #{APPROVAL_STATUS}
|
||||||
</if>
|
</if>
|
||||||
|
<if test="isValid != '' and isValid != null">
|
||||||
|
and not exists(select 1 from bus_hotwork_cfd a where a.HOTWORK_ID = f.HOTWORK_ID and (a.APPLY_STATUS = '-98' or a.APPLY_STATUS = '-99') )
|
||||||
|
</if>
|
||||||
</select>
|
</select>
|
||||||
<select id="safetylistPage" resultType="com.zcloud.entity.PageData">
|
<select id="safetylistPage" resultType="com.zcloud.entity.PageData">
|
||||||
select
|
select
|
||||||
|
|
Loading…
Reference in New Issue