From e5c29d6ac2b210a9385723598d79a42ae5a9679e Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 23 四月 2025 15:20:13 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeIssueReportMapper.xml | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeIssueReportMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeIssueReportMapper.xml index 7c433e3..79c4fe8 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeIssueReportMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeIssueReportMapper.xml @@ -175,6 +175,7 @@ SELECT COUNT(*) AS recordCount FROM se_issue_report rpt LEFT JOIN se_client cli ON cli.id = rpt.client_id + LEFT JOIN se_report_reply rpy ON rpy.report_id = rpt.id <where> AND rpt.state != 3 @@ -201,7 +202,7 @@ </select> <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鍐滄埛闂涓婃姤--> - <select id="getIssueReports" resultType="com.dy.pipIrrGlobal.voSe.VoIssueReport" > + <select id="getIssueReports" resultType="com.dy.pipIrrGlobal.voSe.VoIssueReport_temp" > SELECT rpt.id AS issueReportId, cli.name AS clientName, @@ -211,6 +212,7 @@ rpt.images, rpt.audios, rpt.videos, + rpy.reply_time AS replyTime, rpt.state AS stateId, CASE WHEN rpt.state = 1 THEN '鏈彈鐞�' @@ -218,6 +220,7 @@ END AS state FROM se_issue_report rpt LEFT JOIN se_client cli ON cli.id = rpt.client_id + LEFT JOIN se_report_reply rpy ON rpy.report_id = rpt.id <where> AND rpt.state != 3 @@ -249,6 +252,11 @@ </trim> </select> + <!--鏍规嵁涓婃姤ID鍙婂啘鎴稩D鑾峰彇鏈垹闄ょ殑涓婃姤锛屽垹闄や笂鎶ュ垽鏂娇鐢�--> + <select id="getReport" resultType="com.dy.pipIrrGlobal.pojoSe.SeIssueReport"> + SELECT * FROM se_issue_report WHERE state != 3 AND id = #{issueReportId} AND client_id = #{clientId} + </select> + <!--閫昏緫鍒犻櫎涓�涓啘鎴烽棶棰樹笂鎶�--> <update id="deleteIssueReport"> UPDATE se_issue_report SET state = 3 WHERE id = #{issueReportId} -- Gitblit v1.8.0