wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

动火作业

pull/4/head
chenxinying 2024-01-26 11:02:46 +08:00
parent bf34c02c3c
commit 3403a1c0e8
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/mybatis/datasource/eightwork/EightWorkTaskMapper.xml
View File

@ -43,8 +43,8 @@
<select id="checkWorkCount" parameterType="pd" resultType="pd" >
select (select count(1) COUNT from bus_hotwork_sign sign
left join bus_hotwork a on a.HOTWORK_ID = sign.HOTWORK_ID
where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and a.STEP_ID != '-1') HOTWORK_COUNT
left join bus_hotwork work on work.HOTWORK_ID = sign.HOTWORK_ID
where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and work.STEP_ID != '-1') HOTWORK_COUNT
</select>
</mapper>

8
src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml
View File

@ -476,9 +476,7 @@
and sign.SIGN_TIME is null
and sign.SIGN_USER_ID = #{pd.USER_ID}
and step.STEP_NAME = #{pd.STEP_NAME}
<if test="pd.measures != null and pd.measures != ''"><!-- 如果是多个安全措施确认人，某个人打回，则其他确认人不显示打回作业 -->
and f.STEP_ID != -1
</if>
and f.STEP_ID != -1
)
</if>
<if test="pd.STEP_ID != null and pd.STEP_ID != ''"><!-- 关键词检索 -->
@ -514,10 +512,10 @@
from
bus_hotwork_sign sign
left join bus_eightwork_step step on step.STEP_ID = sign.STEP_ID
left join bus_hotwork a on a.HOTWORK_ID = sign.HOTWORK_ID
left join bus_hotwork work on work.HOTWORK_ID = sign.HOTWORK_ID
where
sign.SIGN_TIME is null
and a.STEP_ID != '-1'
and work.STEP_ID != '-1'
and
sign.SIGN_USER_ID = #{USER_ID}
group by step.CODE