From 5e972eb9928c39b5abbdfd35e2a0aeff40876e7d Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 07 May 2024 17:23:16 +0800
Subject: [PATCH] 修改不成功问题
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.xml | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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 9fe1e61..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
@@ -24,7 +24,7 @@
</resultMap>
<select id="getAll" resultMap="vo">
- SELECT SDR.*,arb."name" reservoirName FROM SM_DANGER_REPORT SDR
+ SELECT SDR.*,arb."name" reservoirName FROM SM_DANGER_REPORT SDR
LEFT JOIN "SJZT_MD"."att_res_base" arb ON arb."guid" = SDR.RESERVOIR_ID
WHERE SDR.IS_DELETED = 0
<if test="dangerReport.toUser !=null and dangerReport.toUser !=''">
@@ -34,14 +34,17 @@
AND SDR.status = #{dangerReport.status}
</if>
</select>
+
<select id="selectRecordPage" resultMap="vo">
- SELECT R.*,arb."name" reservoirName,U.REAL_NAME toUserName,U2.REAL_NAME 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}
@@ -49,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