From f20611265f7d34fd4fbcdfdaff6cb9cccd0b25fc Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 21 Jun 2024 11:53:21 +0800
Subject: [PATCH] 湖北水库：施工：项目查询过滤无效修复、根据角色查询用户
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.xml | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.xml
index 4b34a62..35b6722 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.xml
@@ -34,17 +34,17 @@
AND SDR.status = #{dangerReport.status}
</if>
</select>
+
<select id="selectRecordPage" resultMap="vo">
- SELECT R.*,
- arb."name" AS reservoirName,
- U.REAL_NAME AS toUserName,
- U2.REAL_NAME AS reportUser FROM SM_DANGER_REPORT R
- LEFT JOIN BLADE_USER U ON U.ID = R.TO_USER
- LEFT JOIN BLADE_USER U2 ON U2.ID = R.CREATE_USER
- LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = R.RESERVOIR_ID
+ SELECT
+ R.ID,
+ R.create_time,
+ R.ENCDATA,
+ R.SM4IV,
+ R.KEYINDEXS FROM SM_DANGER_REPORT R
WHERE R.IS_DELETED = 0
<if test="dangerReportVO.reservoirName != null and dangerReportVO.reservoirName !=''">
- AND arb."name" LIKE CONCAT('%',#{dangerReportVO.reservoirName},'%')
+ AND r.reservoir_name LIKE CONCAT('%',#{dangerReportVO.reservoirName},'%')
</if>
<if test="dangerReportVO.toUser != null and dangerReportVO.toUser !=''">
AND r.to_user = #{dangerReportVO.toUser}
@@ -52,5 +52,15 @@
<if test="dangerReportVO.status != null and dangerReportVO.status !=''">
AND r.status = #{dangerReportVO.status}
</if>
+ <if test="dangerReportVO.createUser != null and dangerReportVO.createUser !=''">
+ AND (r.create_user = #{dangerReportVO.createUser} OR r.to_user = #{dangerReportVO.createUser})
+ </if>
+ ORDER BY R.UPDATE_TIME DESC
+ </select>
+
+ <select id="getStatistics" resultType="cn.gistack.sm.jcsb.vo.StatisticsVO">
+ SELECT * FROM
+ (SELECT COUNT(1)AS patrolCount FROM SM_PATROL_TASK WHERE PROJECT_ID =#{resGuid} AND state = 3 AND IS_DELETED = 0)p,
+ (SELECT COUNT(1)AS dangerCount FROM SM_DANGER_REPORT WHERE RESERVOIR_ID = #{resGuid} AND IS_DELETED = 0)SDR
</select>
</mapper>
--
Gitblit v1.9.3