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

手机隐患清单排查

pull/4/head
wangpeng 2024-02-01 17:07:32 +08:00
parent cd97e0916a
commit 3c6e5fb59d
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomItemMapper.xml
View File

@ -247,14 +247,11 @@
d.DICTIONARY_NAMES d.DICTIONARY_NAMES
from from
<include refid="tableName"></include> f <include refid="tableName"></include> f
left join BUS_HIDDENDANGERCHECKSTANDARD_DICTIONARY d on d.DICTIONARY_ID = t.CHECK_ITEM left join BUS_HIDDENDANGERCHECKSTANDARD_DICTIONARY d on d.DICTIONARY_ID = f.CHECK_ITEM
where f.ISDELETE = '0' and d.ISDELETE = '0' where f.ISDELETE = '0' and d.ISDELETE = '0'
<if test="CUSTOM_ID != null and CUSTOM_ID != ''"><!-- 关键词检索 --> <if test="CUSTOM_ID != null and CUSTOM_ID != ''"><!-- 关键词检索 -->
and f.CUSTOM_ID = #{CUSTOM_ID} and f.CUSTOM_ID = #{CUSTOM_ID}
</if> </if>
<if test="CORPINFO_ID != null and CORPINFO_ID != ''"><!-- 关键词检索 -->
and f.CORPINFO_ID = #{CORPINFO_ID}
</if>
GROUP BY f.CHECK_ITEM GROUP BY f.CHECK_ITEM
ORDER BY d.DICTIONARY_SORT ASC ORDER BY d.DICTIONARY_SORT ASC
</select> </select>

16
src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomMapper.xml
View File

@ -324,7 +324,7 @@
f.NAME, f.NAME,
t.NAME TYPENAME, t.NAME TYPENAME,
p.NAME PERIODNAME, p.NAME PERIODNAME,
f.USER_ID f.USER_ID,
u.NAME USER_NAME, u.NAME USER_NAME,
f.START_DATE, f.START_DATE,
f.END_DATE, f.END_DATE,
@ -338,19 +338,13 @@
left join OA_DEPARTMENT d on d.DEPARTMENT_ID=f.DEPARTMENT_ID left join OA_DEPARTMENT d on d.DEPARTMENT_ID=f.DEPARTMENT_ID
left join sys_user u on u.USER_ID = f.USER_ID left join sys_user u on u.USER_ID = f.USER_ID
left join bus_hiddendangercheckstandard_custom_item bhci on bhci.CUSTOM_ID = f.CUSTOM_ID and bhci.ISDELETE = '0' left join bus_hiddendangercheckstandard_custom_item bhci on bhci.CUSTOM_ID = f.CUSTOM_ID and bhci.ISDELETE = '0'
where where f.ISDELETE = 0
f.ISDELETE = 0
and bhci.ISDELETE = 0
and f.COMMON_STATUS = 1
and f.CORPINFO_ID = #{CORPINFO_ID} and f.CORPINFO_ID = #{CORPINFO_ID}
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 --> <if test="KEYWORDS != null and KEYWORDS != ''"><!-- 关键词检索 -->
and and bhci.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
(
bhci.CHECK_CONTENT LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
)
</if> </if>
GROUP BY f.CUSTOM_ID GROUP BY f.CUSTOM_ID
ORDER BY f.COMMON_ITEM_SORT ASC ORDER BY f.OPERATTIME DESC
</select> </select>
<!-- 清单检查分页 --> <!-- 清单检查分页 -->